diff options
author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2022-10-21 13:39:05 +0200 |
---|---|---|
committer | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2022-10-24 08:17:17 +0000 |
commit | 51c1accfa52e12ce7c2bb79adafe712d449d5696 (patch) | |
tree | 94007baade8c25dcbff59949c26ea7f8c1603695 | |
parent | 604f542b20c931c1e8822c15c339f1c5f1ec420f (diff) |
Qt Quick Designer: Fix references to changed view names in UI text
- Form Editor > 2D
- 3D Editor > 3D
- Text Editor > Code
Task-number: QTCREATORBUG-28334
Change-Id: I65f693b47b1c361dae3c270333ff036e4c473b9e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
6 files changed, 10 insertions, 10 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/emptyPane.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/emptyPane.qml index 585672db47d..e0fdb8ef7b3 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/emptyPane.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/emptyPane.qml @@ -19,7 +19,7 @@ Rectangle { anchors.fill: parent Controls.Label { - text: qsTr("Select a component in Form Editor, Navigator, or Text Editor to see its properties.") + text: qsTr("Select a component in the 2D, Navigator, or Code view to see its properties.") font.pixelSize: StudioTheme.Values.myFontSize * 1.5 color: StudioTheme.Values.themeTextColor wrapMode: Text.WordWrap diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp index 54195cf78c5..80dcdbd2014 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp @@ -321,7 +321,7 @@ Edit3DAction *Edit3DView::createSelectBackgrounColorAction() QString description = QCoreApplication::translate("SelectBackgroundColorAction", "Select Background Color"); QString tooltip = QCoreApplication::translate("SelectBackgroundColorAction", - "Select a color for the background of the 3D Editor."); + "Select a color for the background of the 3D view."); auto operation = [this](const SelectionContext &) { BackgroundColorSelection::showBackgroundColorSelectionWidget( @@ -348,7 +348,7 @@ Edit3DAction *Edit3DView::createGridColorSelectionAction() { QString description = QCoreApplication::translate("SelectGridColorAction", "Select Grid Color"); QString tooltip = QCoreApplication::translate("SelectGridColorAction", - "Select a color for the grid lines of the 3D Editor."); + "Select a color for the grid lines of the 3D view."); auto operation = [this](const SelectionContext &) { BackgroundColorSelection::showBackgroundColorSelectionWidget( @@ -376,7 +376,7 @@ Edit3DAction *Edit3DView::createResetColorAction() QString description = QCoreApplication::translate("ResetEdit3DColorsAction", "Reset Colors"); QString tooltip = QCoreApplication::translate("ResetEdit3DColorsAction", "Reset the background color and the color of the " - "grid lines of the 3D Editor to the default valus."); + "grid lines of the 3D view to the default values."); auto operation = [&](const SelectionContext &) { QList<QColor> bgColors = {QRgb(0x222222), QRgb(0x999999)}; @@ -406,7 +406,7 @@ Edit3DAction *Edit3DView::createSyncBackgroundColorAction() QString description = QCoreApplication::translate("SyncEdit3DColorAction", "Use Scene Environment Color"); QString tooltip = QCoreApplication::translate("SyncEdit3DColorAction", - "Sets the 3D Editor to use the Scene Environment " + "Sets the 3D view to use the Scene Environment " "color as background color."); return new Edit3DAction(QmlDesigner::Constants::EDIT3D_EDIT_SYNC_BACKGROUND_COLOR, diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index 03138609565..7309745f070 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -925,7 +925,7 @@ void FormEditorView::checkRootModelNode() if (!rootModelNode().metaInfo().isGraphicalItem() && !Qml3DNode::isValidVisualRoot(rootModelNode())) m_formEditorWidget->showErrorMessageBox( - {DocumentMessage(tr("%1 is not supported as the root element by Form Editor.") + {DocumentMessage(tr("%1 is not supported as the root element by the 2D view.") .arg(rootModelNode().simplifiedTypeName()))}); else m_formEditorWidget->hideErrorMessageBox(); diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index 449405fc0c8..1c68168d010 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -235,7 +235,7 @@ QVariant NavigatorTreeModel::data(const QModelIndex &index, int role) const if (role == Qt::CheckStateRole) return m_view->isNodeInvisible(modelNode) ? Qt::Unchecked : Qt::Checked; else if (role == Qt::ToolTipRole && !modelNodeForIndex(index).isRootNode()) - return tr("Toggles the visibility of this component in the form editor.\n" + return tr("Toggles the visibility of this component in the 2D view.\n" "This is independent of the visibility property."); } else if (index.column() == ColumnType::Lock) { // lock if (role == Qt::CheckStateRole) diff --git a/src/plugins/qmldesigner/settingspage.ui b/src/plugins/qmldesigner/settingspage.ui index 004f8a68eb6..2e7c9516554 100644 --- a/src/plugins/qmldesigner/settingspage.ui +++ b/src/plugins/qmldesigner/settingspage.ui @@ -102,7 +102,7 @@ <item row="2" column="1"> <widget class="QCheckBox" name="smoothRendering"> <property name="toolTip"> - <string>Enable Smooth Rendering in Form Editor</string> + <string>Enable smooth rendering in the 2D view.</string> </property> <property name="text"> <string/> @@ -112,7 +112,7 @@ <item row="2" column="0"> <widget class="QLabel" name="smoothRenderingLabel"> <property name="text"> - <string>Smooth Rendering:</string> + <string>Smooth rendering:</string> </property> </widget> </item> diff --git a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp index 452488e2ed6..ce1a996f380 100644 --- a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp +++ b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp @@ -54,7 +54,7 @@ QmlMultiLanguageAspect::QmlMultiLanguageAspect(ProjectExplorer::Target *target) { setVisible(isMultilanguagePresent()); setSettingsKey(Constants::USE_MULTILANGUAGE_KEY); - setLabel(tr("Use MultiLanguage in Form Editor."), BoolAspect::LabelPlacement::AtCheckBox); + setLabel(tr("Use MultiLanguage in 2D view"), BoolAspect::LabelPlacement::AtCheckBox); setToolTip(tr("Reads translations from MultiLanguage plugin.")); setDefaultValue(!databaseFilePath().isEmpty()); |