feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Include the ID in the invalid ID message

Browse Source 
Change-Id: Ieacf36991cbe5e5f96cdc8dc26413cbbaec25608
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Mahmoud Badri
2021-09-15 12:28:48 +03:00
parent 7c5a830111
commit eb870fb5c4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
View File

@@ -165,7 +165,7 @@ void PropertyEditorView::changeValue(const QString &name)
m_locked = false; m_locked = false;
QString errMsg = QmlDesigner::ModelNode::getIdValidityErrorMessage(newId); QString errMsg = QmlDesigner::ModelNode::getIdValidityErrorMessage(newId);
if (!errMsg.isEmpty()) if (!errMsg.isEmpty())
Core::AsynchronousMessageBox::warning(tr("Invalid ID"), errMsg.arg(newId)); Core::AsynchronousMessageBox::warning(tr("Invalid ID"), errMsg);
else else
Core::AsynchronousMessageBox::warning(tr("Invalid ID"), tr("%1 already exists.").arg(newId)); Core::AsynchronousMessageBox::warning(tr("Invalid ID"), tr("%1 already exists.").arg(newId));
} }

12
src/plugins/qmldesigner/designercore/model/modelnode.cpp
View File

@@ -218,21 +218,21 @@ QString ModelNode::getIdValidityErrorMessage(const QString &id)
return {}; // valid return {}; // valid
if (id.at(0).isUpper()) if (id.at(0).isUpper())
return QObject::tr("ID cannot start with an uppercase character."); return QObject::tr("ID cannot start with an uppercase character (%1).").arg(id);
if (id.at(0).isDigit()) if (id.at(0).isDigit())
return QObject::tr("ID cannot start with a number."); return QObject::tr("ID cannot start with a number (%1).").arg(id);
if (id.contains(' ')) if (id.contains(' '))
return QObject::tr("ID cannot include whitespace."); return QObject::tr("ID cannot include whitespace (%1).").arg(id);
if (idIsQmlKeyWord(id)) if (idIsQmlKeyWord(id))
return QObject::tr("%1 is a reserved QML keyword."); return QObject::tr("%1 is a reserved QML keyword.").arg(id);
if (isIdToAvoid(id)) if (isIdToAvoid(id))
return QObject::tr("%1 is a reserved property keyword."); return QObject::tr("%1 is a reserved property keyword.").arg(id);
return QObject::tr("ID includes invalid characters."); return QObject::tr("ID includes invalid characters (%1).").arg(id);
} }
bool ModelNode::hasId() const bool ModelNode::hasId() const