Commit 2d806994 authored by Leena Miettinen's avatar Leena Miettinen

Qt Quick Designer: fix UI text capitalization and punctuation

Fix Qt Quick Designer product name. Fix a typo in a test message.

Change-Id: I668af65da835017ebc876810a8d2c7d638290c77
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
parent 9230c3b9
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<item> <item>
<widget class="QLabel" name="addTabLabel"> <widget class="QLabel" name="addTabLabel">
<property name="text"> <property name="text">
<string>Add Tab</string> <string>Add tab:</string>
</property> </property>
</widget> </widget>
</item> </item>
......
...@@ -151,7 +151,7 @@ void TabViewDesignerAction::addNewTab() ...@@ -151,7 +151,7 @@ void TabViewDesignerAction::addNewTab()
QString newFilePath = directoryPath +QLatin1String("/") + tabName + QLatin1String(".qml"); QString newFilePath = directoryPath +QLatin1String("/") + tabName + QLatin1String(".qml");
if (QFileInfo(newFilePath).exists()) { 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 { } else {
bool fileCreated = createFile(newFilePath); bool fileCreated = createFile(newFilePath);
......
...@@ -333,9 +333,9 @@ void NavigatorTreeModel::handleChangedItem(QStandardItem *item) ...@@ -333,9 +333,9 @@ void NavigatorTreeModel::handleChangedItem(QStandardItem *item)
} else { } else {
if (!node.isValidId(item->text())) 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 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); bool blockSingals = blockItemChangedSignal(true);
item->setText(node.id()); item->setText(node.id());
blockItemChangedSignal(blockSingals); blockItemChangedSignal(blockSingals);
......
...@@ -166,9 +166,9 @@ void PropertyEditorView::changeValue(const QString &name) ...@@ -166,9 +166,9 @@ void PropertyEditorView::changeValue(const QString &name)
value->setValue(m_selectedNode.id()); value->setValue(m_selectedNode.id());
m_locked = false; m_locked = false;
if (!m_selectedNode.isValidId(newId)) 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 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; return;
} }
......
...@@ -410,8 +410,8 @@ void NodeInstanceServerProxy::processFinished(int /*exitCode*/, QProcess::ExitSt ...@@ -410,8 +410,8 @@ void NodeInstanceServerProxy::processFinished(int /*exitCode*/, QProcess::ExitSt
if (m_captureFileForTest.isOpen()) { if (m_captureFileForTest.isOpen()) {
m_captureFileForTest.close(); m_captureFileForTest.close();
m_captureFileForTest.remove(); m_captureFileForTest.remove();
QMessageBox::warning(0, tr("QML Puppet Crashed"), tr("Your are recording a Puppet stream and the puppet crashed. " QMessageBox::warning(0, tr("QML Puppet Crashed"), tr("You are recording a puppet stream and the puppet crashed. "
"It is recommended to reopen the QML Designer and start again.")); "It is recommended to reopen the Qt Quick Designer and start again."));
} }
......
...@@ -1111,7 +1111,7 @@ void tst_TestCore::testModelCreateSubNode() ...@@ -1111,7 +1111,7 @@ void tst_TestCore::testModelCreateSubNode()
try { try {
childNode.setId("invalid id"); 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) { } catch (Exception &exception) {
QCOMPARE(exception.type(), QString("InvalidIdException")); QCOMPARE(exception.type(), QString("InvalidIdException"));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment