QmlDesigner: Add display name more feedback popup

Task-number: QDS-8870
Change-Id: Id8d1c98dec71e962b63a144c234642417e1df602
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

src/plugins/qmldesigner/components/edit3d/edit3dview.cpp

@@ -57,7 +57,13 @@ WidgetInfo Edit3DView::widgetInfo()
     if (!m_edit3DWidget)
         createEdit3DWidget();
 
-    return createWidgetInfo(m_edit3DWidget.data(), "Editor3D", WidgetInfo::CentralPane, 0, tr("3D"), DesignerWidgetFlags::IgnoreErrors);
+    return createWidgetInfo(m_edit3DWidget.data(),
+                            "Editor3D",
+                            WidgetInfo::CentralPane,
+                            0,
+                            tr("3D"),
+                            tr("3D view"),
+                            DesignerWidgetFlags::IgnoreErrors);
 }
 
 Edit3DWidget *Edit3DView::edit3DWidget() const

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

@@ -341,7 +341,13 @@ WidgetInfo FormEditorView::widgetInfo()
     if (!m_formEditorWidget)
         createFormEditorWidget();
 
-    return createWidgetInfo(m_formEditorWidget.data(), "FormEditor", WidgetInfo::CentralPane, 0, tr("2D"), DesignerWidgetFlags::IgnoreErrors);
+    return createWidgetInfo(m_formEditorWidget.data(),
+                            "FormEditor",
+                            WidgetInfo::CentralPane,
+                            0,
+                            tr("2D"),
+                            tr("2D view"),
+                            DesignerWidgetFlags::IgnoreErrors);
 }
 
 FormEditorWidget *FormEditorView::formEditorWidget()

src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp

@@ -45,7 +45,12 @@ WidgetInfo ItemLibraryView::widgetInfo()
     if (m_widget.isNull())
         m_widget = new ItemLibraryWidget{m_imageCache};
 
-    return createWidgetInfo(m_widget.data(), "Components", WidgetInfo::LeftPane, 0, tr("Components"));
+    return createWidgetInfo(m_widget.data(),
+                            "Components",
+                            WidgetInfo::LeftPane,
+                            0,
+                            tr("Components"),
+                            tr("Components view"));
 }
 
 void ItemLibraryView::modelAttached(Model *model)

src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp

@@ -212,7 +212,8 @@ WidgetInfo MaterialBrowserView::widgetInfo()
                             "MaterialBrowser",
                             WidgetInfo::LeftPane,
                             0,
-                            tr("Material Browser"));
+                            tr("Material Browser"),
+                            tr("Material Browser view"));
 }
 
 void MaterialBrowserView::modelAttached(Model *model)

src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp

@@ -908,7 +908,8 @@ WidgetInfo MaterialEditorView::widgetInfo()
                             "MaterialEditor",
                             WidgetInfo::RightPane,
                             0,
-                            tr("Material Editor"));
+                            tr("Material Editor"),
+                            tr("Material Editor view"));
 }
 
 void MaterialEditorView::selectedNodesChanged(const QList<ModelNode> &selectedNodeList,

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

@@ -117,7 +117,8 @@ WidgetInfo NavigatorView::widgetInfo()
                             QStringLiteral("Navigator"),
                             WidgetInfo::LeftPane,
                             0,
-                            tr("Navigator"));
+                            tr("Navigator"),
+                            tr("Navigator view"));
 }
 
 void NavigatorView::modelAttached(Model *model)

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

@@ -806,7 +806,12 @@ bool PropertyEditorView::hasWidget() const
 
 WidgetInfo PropertyEditorView::widgetInfo()
 {
-    return createWidgetInfo(m_stackedWidget, QStringLiteral("Properties"), WidgetInfo::RightPane, 0, tr("Properties"));
+    return createWidgetInfo(m_stackedWidget,
+                            QStringLiteral("Properties"),
+                            WidgetInfo::RightPane,
+                            0,
+                            tr("Properties"),
+                            tr("Property Editor view"));
 }
 
 void PropertyEditorView::currentStateChanged(const ModelNode &node)

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

@@ -55,7 +55,12 @@ WidgetInfo StatesEditorView::widgetInfo()
     if (!m_statesEditorWidget)
         m_statesEditorWidget = new StatesEditorWidget(this, m_statesEditorModel.data());
 
-    return createWidgetInfo(m_statesEditorWidget.data(), QLatin1String("StatesEditor"), WidgetInfo::BottomPane, 0, tr("States"));
+    return createWidgetInfo(m_statesEditorWidget.data(),
+                            QLatin1String("StatesEditor"),
+                            WidgetInfo::BottomPane,
+                            0,
+                            tr("States"),
+                            tr("States view"));
 }
 
 void StatesEditorView::rootNodeTypeChanged(const QString &/*type*/, int /*majorVersion*/, int /*minorVersion*/)

src/plugins/qmldesigner/components/texteditor/texteditorview.cpp

@@ -124,7 +124,13 @@ void TextEditorView::nodeReparented(const ModelNode &/*node*/, const NodeAbstrac
 
 WidgetInfo TextEditorView::widgetInfo()
 {
-    return createWidgetInfo(m_widget, "TextEditor", WidgetInfo::CentralPane, 0, tr("Code"), DesignerWidgetFlags::IgnoreErrors);
+    return createWidgetInfo(m_widget,
+                            "TextEditor",
+                            WidgetInfo::CentralPane,
+                            0,
+                            tr("Code"),
+                            tr("Code view"),
+                            DesignerWidgetFlags::IgnoreErrors);
 }
 
 void TextEditorView::qmlJSEditorContextHelp(const Core::IContext::HelpCallback &callback) const

src/plugins/qmldesigner/components/textureeditor/textureeditorview.cpp

@@ -670,7 +670,8 @@ WidgetInfo TextureEditorView::widgetInfo()
                             "TextureEditor",
                             WidgetInfo::RightPane,
                             0,
-                            tr("Texture Editor"));
+                            tr("Texture Editor"),
+                            tr("Texture Editor view"));
 }
 
 void TextureEditorView::selectedNodesChanged(const QList<ModelNode> &selectedNodeList,

src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp

@@ -648,7 +648,8 @@ WidgetInfo TimelineView::widgetInfo()
                             QStringLiteral("Timelines"),
                             WidgetInfo::BottomPane,
                             0,
-                            tr("Timeline"));
+                            tr("Timeline"),
+                            tr("Timeline view"));
 }
 
 bool TimelineView::hasQtQuickTimelineImport()

src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.cpp

@@ -311,7 +311,8 @@ WidgetInfo TransitionEditorView::widgetInfo()
                             "TransitionEditor",
                             WidgetInfo::BottomPane,
                             0,
-                            tr("Transitions"));
+                            tr("Transitions"),
+                            tr("Transitions view"));
 }
 
 void TransitionEditorView::openSettingsDialog()

src/plugins/qmldesigner/designercore/include/abstractview.h

@@ -60,6 +60,7 @@ public:
 
     QString uniqueId;
     QString tabName;
+    QString feedbackDisplayName;
     QWidget *widget = nullptr;
     int placementPriority;
     PlacementHint placementHint;
@@ -286,11 +287,14 @@ public:
 protected:
     void setModel(Model *model);
     void removeModel();
-    static WidgetInfo createWidgetInfo(QWidget *widget = nullptr,
+    static WidgetInfo createWidgetInfo(
-                                       const QString &uniqueId = QString(),
+        QWidget *widget = nullptr,
-                                       WidgetInfo::PlacementHint placementHint = WidgetInfo::NoPane,
+        const QString &uniqueId = QString(),
-                                       int placementPriority = 0,
+        WidgetInfo::PlacementHint placementHint = WidgetInfo::NoPane,
-                                       const QString &tabName = QString(), DesignerWidgetFlags widgetFlags = DesignerWidgetFlags::DisableOnError);
+        int placementPriority = 0,
+        const QString &tabName = QString(),
+        const QString &feedbackDisplayName = QString(),
+        DesignerWidgetFlags widgetFlags = DesignerWidgetFlags::DisableOnError);
 
 private: //functions
     QList<ModelNode> toModelNodeList(const QList<Internal::InternalNodePointer> &nodeList) const;

src/plugins/qmldesigner/designercore/model/abstractview.cpp

@@ -117,6 +117,7 @@ WidgetInfo AbstractView::createWidgetInfo(QWidget *widget,
                                           WidgetInfo::PlacementHint placementHint,
                                           int placementPriority,
                                           const QString &tabName,
+                                          const QString &feedbackDisplayName,
                                           DesignerWidgetFlags widgetFlags)
 {
     WidgetInfo widgetInfo;
@@ -126,6 +127,7 @@ WidgetInfo AbstractView::createWidgetInfo(QWidget *widget,
     widgetInfo.placementHint = placementHint;
     widgetInfo.placementPriority = placementPriority;
     widgetInfo.tabName = tabName;
+    widgetInfo.feedbackDisplayName = feedbackDisplayName;
     widgetInfo.widgetFlags = widgetFlags;
 
     return widgetInfo;

src/plugins/qmldesigner/qmldesignerplugin.cpp

@@ -587,6 +587,15 @@ void QmlDesignerPlugin::resetModelSelection()
     rewriterView()->setSelectedModelNodes(QList<ModelNode>());
 }
 
+QString QmlDesignerPlugin::identiferToDisplayString(const QString &identifier)
+{
+    for (AbstractView *view : viewManager().views())
+        if (view->widgetInfo().uniqueId.toLower() == identifier.toLower())
+            return view->widgetInfo().feedbackDisplayName;
+
+    return identifier;
+}
+
 RewriterView *QmlDesignerPlugin::rewriterView() const
 {
     return currentDesignDocument()->rewriterView();
@@ -732,7 +741,7 @@ void QmlDesignerPlugin::lauchFeedbackPopup(const QString &identifier)
     QTC_ASSERT(root, return );
 
     QObject *title = root->findChild<QObject *>("title");
-    QString name = QmlDesignerPlugin::tr("Enjoying %1?").arg(identifier);
+    QString name = QmlDesignerPlugin::tr("Enjoying %1?").arg(identiferToDisplayString(identifier));
     title->setProperty("text", name);
     root->setProperty("identifier", identifier);
 

src/plugins/qmldesigner/qmldesignerplugin.h

@@ -104,6 +104,8 @@ private: // functions
     void activateAutoSynchronization();
     void deactivateAutoSynchronization();
     void resetModelSelection();
+    QString identiferToDisplayString(const QString &identifier);
+
     RewriterView *rewriterView() const;
     Model *currentModel() const;
     QQuickWidget *m_feedbackWidget = nullptr;