QDS Components: Replace "item" with "component" in UI text

Task-number: QDS-3778
Change-Id: I67cfaad948fe9a43b2312cdb5e248d0849b7c6d9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.ui

@@ -22,7 +22,7 @@
         <item>
          <widget class="QLabel" name="targetIdLabel">
           <property name="text">
-           <string>Selected item</string>
+           <string>Selected component</string>
           </property>
          </widget>
         </item>

src/plugins/qmldesigner/components/componentcore/componentcore_constants.h

@@ -156,7 +156,7 @@ const char addToGroupItemDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMe
 const char removeGroupItemDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu",
                                                             "Remove GroupItem");
 
-const char addItemToStackedContainerDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Add Item");
+const char addItemToStackedContainerDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Add Component");
 const char addTabBarToStackedContainerDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Add Tab Bar");
 const char increaseIndexToStackedContainerDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Increase Index");
 const char decreaseIndexToStackedContainerDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Decrease Index");
@@ -171,22 +171,22 @@ const char layoutFillHeightDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContext
 const char flowAssignEffectDisplayName[] = "Assign FlowEffect ";
 const char flowAssignCustomEffectDisplayName[] = "Assign Custom FlowEffect ";
 
-const char raiseToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Raise selected item.");
+const char raiseToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Raise selected component.");
-const char lowerToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Lower selected item.");
+const char lowerToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Lower selected component.");
 
 const char resetSizeToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Reset size and use implicit size.");
 const char resetPositionTooltip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Reset position and use implicit position.");
 
-const char anchorsFillToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Fill selected item to parent.");
+const char anchorsFillToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Fill selected component to parent.");
-const char anchorsResetToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Reset anchors for selected item.");
+const char anchorsResetToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Reset anchors for selected component.");
 
-const char layoutColumnLayoutToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Layout selected items in column layout.");
+const char layoutColumnLayoutToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Layout selected components in column layout.");
-const char layoutRowLayoutToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Layout selected items in row layout.");
+const char layoutRowLayoutToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Layout selected components in row layout.");
-const char layoutGridLayoutToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Layout selected items in grid layout.");
+const char layoutGridLayoutToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Layout selected components in grid layout.");
 
 const char increaseIndexOfStackedContainerToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Increase index of stacked container.");
 const char decreaseIndexOfStackedContainerToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Decrease index of stacked container.");
-const char addItemToStackedContainerToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Add item to stacked container.");
+const char addItemToStackedContainerToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Add component to stacked container.");
 const char addFlowActionToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Add flow action.");
 
 const char editListModelDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu",

src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp

@@ -633,7 +633,7 @@ void addSignalHandlerOrGotoImplementation(const SelectionContext &selectionState
 
     if (!qmlObjectNode.isValid()) {
         QString title = QCoreApplication::translate("ModelNodeOperations", "Go to Implementation");
-        QString description = QCoreApplication::translate("ModelNodeOperations", "Invalid item.");
+        QString description = QCoreApplication::translate("ModelNodeOperations", "Invalid component.");
         Core::AsynchronousMessageBox::warning(title, description);
         return;
     }

src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp

@@ -87,13 +87,13 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
     m_noSnappingAction->setIcon(Icons::NO_SNAPPING.icon());
     registerActionAsCommand(m_noSnappingAction, Constants::FORMEDITOR_NO_SNAPPING, QKeySequence(Qt::Key_T));
 
-    m_snappingAndAnchoringAction = layoutActionGroup->addAction(tr("Snap to parent or sibling items and generate anchors."));
+    m_snappingAndAnchoringAction = layoutActionGroup->addAction(tr("Snap to parent or sibling components and generate anchors."));
     m_snappingAndAnchoringAction->setCheckable(true);
     m_snappingAndAnchoringAction->setChecked(true);
     m_snappingAndAnchoringAction->setIcon(Icons::NO_SNAPPING_AND_ANCHORING.icon());
     registerActionAsCommand(m_snappingAndAnchoringAction, Constants::FORMEDITOR_NO_SNAPPING_AND_ANCHORING, QKeySequence(Qt::Key_W));
 
-    m_snappingAction = layoutActionGroup->addAction(tr("Snap to parent or sibling items but do not generate anchors."));
+    m_snappingAction = layoutActionGroup->addAction(tr("Snap to parent or sibling components but do not generate anchors."));
     m_snappingAction->setCheckable(true);
     m_snappingAction->setChecked(true);
     m_snappingAction->setIcon(Icons::SNAPPING.icon());
@@ -108,7 +108,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
     upperActions.append(separatorAction);
 
     m_showBoundingRectAction = new QAction(Utils::Icons::BOUNDING_RECT.icon(),
-                                           tr("Show bounding rectangles and stripes for empty items."),
+                                           tr("Show bounding rectangles and stripes for empty components."),
                                            this);
     m_showBoundingRectAction->setCheckable(true);
     m_showBoundingRectAction->setChecked(false);
@@ -123,14 +123,14 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
     upperActions.append(separatorAction);
 
     m_rootWidthAction = new LineEditAction(tr("Override Width"), this);
-    m_rootWidthAction->setToolTip(tr("Override width of root item."));
+    m_rootWidthAction->setToolTip(tr("Override width of root component."));
     connect(m_rootWidthAction.data(), &LineEditAction::textChanged,
             this, &FormEditorWidget::changeRootItemWidth);
     addAction(m_rootWidthAction.data());
     upperActions.append(m_rootWidthAction.data());
 
     m_rootHeightAction = new LineEditAction(tr("Override Height"), this);
-    m_rootHeightAction->setToolTip(tr("Override height of root item."));
+    m_rootHeightAction->setToolTip(tr("Override height of root component."));
     connect(m_rootHeightAction.data(), &LineEditAction::textChanged,
             this, &FormEditorWidget::changeRootItemHeight);
     addAction(m_rootHeightAction.data());

src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp

@@ -91,7 +91,7 @@ bool fitsToTargetProperty(const NodeAbstractProperty &targetProperty,
 
 static inline QString msgUnknownItem(const QString &t)
 {
-    return NavigatorTreeModel::tr("Unknown item: %1").arg(t);
+    return NavigatorTreeModel::tr("Unknown component: %1").arg(t);
 }
 
 static void removePosition(const ModelNode &node)
@@ -250,20 +250,20 @@ QVariant NavigatorTreeModel::data(const QModelIndex &index, int role) const
         if (role == Qt::CheckStateRole)
             return currentQmlObjectNode.isAliasExported() ? Qt::Checked : Qt::Unchecked;
         else if (role == Qt::ToolTipRole && !modelNodeForIndex(index).isRootNode())
-            return tr("Toggles whether this item is exported as an "
+            return tr("Toggles whether this component is exported as an "
-                      "alias property of the root item.");
+                      "alias property of the root component.");
     } else if (index.column() == ColumnType::Visibility) { // visible
         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 item in the form editor.\n"
+            return tr("Toggles the visibility of this component in the form editor.\n"
-                      "This is independent of the visibility property in QML.");
+                      "This is independent of the visibility property.");
     } else if (index.column() == ColumnType::Lock) { // lock
         if (role == Qt::CheckStateRole)
             return modelNode.locked() ? Qt::Checked : Qt::Unchecked;
         else if (role == Qt::ToolTipRole && !modelNodeForIndex(index).isRootNode())
-            return tr("Toggles whether this item is locked.\n"
+            return tr("Toggles whether this component is locked.\n"
-                      "Locked items cannot be modified or selected.");
+                      "Locked components cannot be modified or selected.");
     }
 
     return QVariant();

src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp

@@ -126,7 +126,7 @@ QList<QToolButton *> NavigatorWidget::createToolBarWidgets()
     filter->setPopupMode(QToolButton::InstantPopup);
     filter->setProperty("noArrow", true);
     auto filterMenu = new QMenu(filter);
-    auto filterAction = new QAction(tr("Show only visible items."), nullptr);
+    auto filterAction = new QAction(tr("Show Only Visible Components"), nullptr);
     filterAction->setCheckable(true);
 
     bool filterFlag = DesignerSettings::getValue(DesignerSettingsKey::NAVIGATOR_SHOW_ONLY_VISIBLE_ITEMS).toBool();
@@ -135,7 +135,7 @@ QList<QToolButton *> NavigatorWidget::createToolBarWidgets()
     connect(filterAction, &QAction::toggled, this, &NavigatorWidget::filterToggled);
     filterMenu->addAction(filterAction);
 
-    auto reverseAction = new QAction(tr("Reverse item order."), nullptr);
+    auto reverseAction = new QAction(tr("Reverse Component Order"), nullptr);
     reverseAction->setCheckable(true);
 
     bool reverseFlag = DesignerSettings::getValue(DesignerSettingsKey::NAVIGATOR_REVERSE_ITEM_ORDER).toBool();

src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp

@@ -163,9 +163,9 @@ void PropertyEditorView::changeValue(const QString &name)
             value->setValue(m_selectedNode.id());
             m_locked = false;
             if (!QmlDesigner::ModelNode::isValidId(newId))
-                Core::AsynchronousMessageBox::warning(tr("Invalid Id"),  tr("%1 is an invalid id.").arg(newId));
+                Core::AsynchronousMessageBox::warning(tr("Invalid ID"),  tr("%1 is an invalid ID.").arg(newId));
             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));
         }
         return;
     }
@@ -323,7 +323,7 @@ void PropertyEditorView::exportPopertyAsAlias(const QString &name)
         PropertyName propertyName = aliasName.toUtf8();
         if (rootModelNode().hasProperty(propertyName)) {
             Core::AsynchronousMessageBox::warning(tr("Cannot Export Property as Alias"),
-                                                  tr("Property %1 does already exist for root item.").arg(aliasName));
+                                                  tr("Property %1 does already exist for root component.").arg(aliasName));
             return;
         }
         rootModelNode().bindingProperty(propertyName).setDynamicTypeNameAndExpression("alias", id + "." + name);

src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp

@@ -109,7 +109,7 @@ void StatesEditorView::removeState(int nodeId)
 
                 if (!lockedTargets.empty()) {
                     Utils::sort(lockedTargets);
-                    QString detailedText = QString("<b>" + tr("Locked items:") + "</b><br>");
+                    QString detailedText = QString("<b>" + tr("Locked components:") + "</b><br>");
 
                     for (const auto &id : qAsConst(lockedTargets))
                         detailedText.append("- " + id + "<br>");
@@ -120,7 +120,7 @@ void StatesEditorView::removeState(int nodeId)
                     msgBox.setTextFormat(Qt::RichText);
                     msgBox.setIcon(QMessageBox::Question);
                     msgBox.setWindowTitle(tr("Remove State"));
-                    msgBox.setText(QString(tr("Removing this state will modify locked items.") + "<br><br>%1")
+                    msgBox.setText(QString(tr("Removing this state will modify locked components.") + "<br><br>%1")
                                            .arg(detailedText));
                     msgBox.setInformativeText(tr("Continue by removing the state?"));
                     msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);

src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp

@@ -366,7 +366,7 @@ void MetaInfoReader::syncItemLibraryEntries()
     try {
         m_metaInfo.itemLibraryInfo()->addEntries(m_bufferedEntries, m_overwriteDuplicates);
     } catch (const InvalidMetaInfoException &) {
-        addError(tr("Invalid or duplicate item library entry %1").arg(m_currentEntry.name()), currentSourceLocation());
+        addError(tr("Invalid or duplicate library entry %1").arg(m_currentEntry.name()), currentSourceLocation());
     }
     m_bufferedEntries.clear();
 }

src/plugins/qmldesigner/settingspage.ui

@@ -32,7 +32,7 @@
         <item row="0" column="0">
          <widget class="QLabel" name="snapMarginLabel">
           <property name="text">
-           <string>Parent item padding:</string>
+           <string>Parent component padding:</string>
           </property>
          </widget>
         </item>
@@ -46,7 +46,7 @@
         <item row="1" column="0">
          <widget class="QLabel" name="itemSpacingLabel">
           <property name="text">
-           <string>Sibling item spacing:</string>
+           <string>Sibling component spacing:</string>
           </property>
          </widget>
         </item>
@@ -105,7 +105,7 @@
      <item>
       <widget class="QGroupBox" name="groupBox_4">
        <property name="title">
-        <string>Root Item Init Size</string>
+        <string>Root Component Init Size</string>
        </property>
        <layout class="QGridLayout" name="gridLayout_7">
         <item row="0" column="0">
@@ -247,7 +247,7 @@
          </widget>
         </item>
         <item>
-         <widget class="Utils::PathChooser" name="fallbackPuppetPathLineEdit">
+         <widget class="Utils::PathChooser" name="fallbackPuppetPathLineEdit" native="true">
           <property name="enabled">
            <bool>true</bool>
           </property>
@@ -288,7 +288,7 @@
          </widget>
         </item>
         <item>
-         <widget class="Utils::PathChooser" name="puppetBuildPathLineEdit">
+         <widget class="Utils::PathChooser" name="puppetBuildPathLineEdit" native="true">
           <property name="enabled">
            <bool>true</bool>
           </property>
@@ -348,7 +348,7 @@
            <string>Also warns in the code editor about QML features that are not properly supported by the Qt Quick Designer.</string>
           </property>
           <property name="text">
-           <string>Warn about unsupported features of Qt Quick Designer in the code editor</string>
+           <string>Warn about unsupported features of .ui.qml files in code editor</string>
           </property>
          </widget>
         </item>
@@ -358,7 +358,7 @@
            <string>Warns about QML features that are not properly supported by the Qt Quick Designer.</string>
           </property>
           <property name="text">
-           <string>Warn about unsupported features in the Qt Quick Designer</string>
+           <string>Warn about unsupported features in .ui.qml files</string>
           </property>
          </widget>
         </item>

src/plugins/qmljseditor/qmljscomponentnamedialog.cpp

@@ -169,7 +169,7 @@ QString ComponentNameDialog::isValid() const
         return tr("Invalid path");
 
     if (QDir(ui->pathEdit->path()).exists(compName + u".qml"))
-        return tr("Component exists already");
+        return tr("Component already exists");
 
     return QString();
 }