diff --git a/src/plugins/qmldesigner/components/componentcore/addtabtotabviewdialog.ui b/src/plugins/qmldesigner/components/componentcore/addtabtotabviewdialog.ui index c827ddbcd7510e6c8403eb0375513f840408af72..dff9e50e55c54ab5c559a94b80410aa358b329c6 100644 --- a/src/plugins/qmldesigner/components/componentcore/addtabtotabviewdialog.ui +++ b/src/plugins/qmldesigner/components/componentcore/addtabtotabviewdialog.ui @@ -19,7 +19,7 @@ <item> <widget class="QLabel" name="addTabLabel"> <property name="text"> - <string>Add Tab</string> + <string>Add tab:</string> </property> </widget> </item> diff --git a/src/plugins/qmldesigner/components/componentcore/tabviewdesigneraction.cpp b/src/plugins/qmldesigner/components/componentcore/tabviewdesigneraction.cpp index 55cc1c432e760c103af0bc31907599a8d90587f0..9a04a2cec3ef3beb67a993cc0fa4e02c50337491 100644 --- a/src/plugins/qmldesigner/components/componentcore/tabviewdesigneraction.cpp +++ b/src/plugins/qmldesigner/components/componentcore/tabviewdesigneraction.cpp @@ -151,7 +151,7 @@ void TabViewDesignerAction::addNewTab() QString newFilePath = directoryPath +QLatin1String("/") + tabName + QLatin1String(".qml"); if (QFileInfo(newFilePath).exists()) { - QMessageBox::warning(Core::ICore::mainWindow(), tr("Name error"), tr("Component already exists!")); + QMessageBox::warning(Core::ICore::mainWindow(), tr("Name Error"), tr("Component already exists.")); } else { bool fileCreated = createFile(newFilePath); diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index 5ceb949caab31a0f8db344fd34ed2e12dc42d87b..9823207c8ede0987b92e83985541046c4cc12068 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -333,9 +333,9 @@ void NavigatorTreeModel::handleChangedItem(QStandardItem *item) } else { if (!node.isValidId(item->text())) - QMessageBox::warning(0, tr("Invalid Id"), tr("%1 is an invalid id").arg(item->text())); + QMessageBox::warning(0, tr("Invalid Id"), tr("%1 is an invalid id.").arg(item->text())); else - QMessageBox::warning(0, tr("Invalid Id"), tr("%1 already exists").arg(item->text())); + QMessageBox::warning(0, tr("Invalid Id"), tr("%1 already exists.").arg(item->text())); bool blockSingals = blockItemChangedSignal(true); item->setText(node.id()); blockItemChangedSignal(blockSingals); diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp index 594f5265e9e9209cf0a9e214f9128e7cb98f700a..6d9cc3873d6987e8e166323174f96864a099b3aa 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp @@ -166,9 +166,9 @@ void PropertyEditorView::changeValue(const QString &name) value->setValue(m_selectedNode.id()); m_locked = false; if (!m_selectedNode.isValidId(newId)) - QMessageBox::warning(0, tr("Invalid Id"), tr("%1 is an invalid id").arg(newId)); + QMessageBox::warning(0, tr("Invalid Id"), tr("%1 is an invalid id.").arg(newId)); else - QMessageBox::warning(0, tr("Invalid Id"), tr("%1 already exists").arg(newId)); + QMessageBox::warning(0, tr("Invalid Id"), tr("%1 already exists.").arg(newId)); } return; } diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp index d0f4c7115a5b0aea4a72666b0562700687dbc497..fa4ca766868f6960f6f35ee52171adfb0ef2c11a 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp @@ -410,8 +410,8 @@ void NodeInstanceServerProxy::processFinished(int /*exitCode*/, QProcess::ExitSt if (m_captureFileForTest.isOpen()) { m_captureFileForTest.close(); m_captureFileForTest.remove(); - QMessageBox::warning(0, tr("QML Puppet Crashed"), tr("Your are recording a Puppet stream and the puppet crashed. " - "It is recommended to reopen the QML Designer and start again.")); + QMessageBox::warning(0, tr("QML Puppet Crashed"), tr("You are recording a puppet stream and the puppet crashed. " + "It is recommended to reopen the Qt Quick Designer and start again.")); } diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp index b0d52e833d866a1c68ec95863584bc1995af0e39..d48ca4d0b007fff48c88311b39ef49c703422844 100644 --- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp +++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp @@ -1111,7 +1111,7 @@ void tst_TestCore::testModelCreateSubNode() try { childNode.setId("invalid id"); - QFAIL("Setting an invalid id does not throw an excxeption"); + QFAIL("Setting an invalid id does not throw an exception"); } catch (Exception &exception) { QCOMPARE(exception.type(), QString("InvalidIdException")); }