QmlDesigner: Fix the hover state for the icon of "Toggle Group"

- The icon of "Toggle Group" is replaced by an iconFont.
- The icon of "Reset View" is replaced by the same iconFont.

Task-number: QDS-8970
Change-Id: Id1c15b1733a2366da3769d6be7b89d9cb01b7807
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

4 files changed, 14 insertions, 9 deletions

diff --git a/share/qtcreator/qmldesigner/designericons.json b/share/qtcreator/qmldesigner/designericons.json
index 99f7df0224..f695e63b56 100644
--- a/share/qtcreator/qmldesigner/designericons.json
+++ b/share/qtcreator/qmldesigner/designericons.json
@@ -137,7 +137,7 @@
         "iconName": "cube_small"
     },
     "ResetViewIcon": {
-        "iconName": "rotationOutline"
+        "iconName": "reload_medium"
     },
     "SelecionIcon": {
         "iconName": "selection_small"
@@ -164,6 +164,14 @@
     "TimelineIcon": {
         "iconName": "timeline_small"
     },
+    "ToggleGroupIcon": {
+        "Off": {
+            "iconName": "selectOutline_medium"
+        },
+        "On": {
+            "iconName": "selectFill_medium"
+        }
+    },
     "VisibilityIcon": {
         "Off": {
             "iconName": "visibilityOff"
diff --git a/src/plugins/qmldesigner/components/componentcore/designericons.h b/src/plugins/qmldesigner/components/componentcore/designericons.h
index f229cf388d..f460707b91 100644
--- a/src/plugins/qmldesigner/components/componentcore/designericons.h
+++ b/src/plugins/qmldesigner/components/componentcore/designericons.h
@@ -92,6 +92,7 @@ public:
         SimpleCheckIcon,
         SnappingIcon,
         TimelineIcon,
+        ToggleGroupIcon,
         VisibilityIcon
     };
     Q_ENUM(IconId)
diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
index 9df78ec1d5..7abfab5fe0 100644
--- a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
+++ b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
@@ -282,7 +282,7 @@ void Edit3DWidget::createContextMenu()
 
     QAction *defaultToggleGroupAction = view()->edit3DAction(View3DActionType::SelectionModeToggle)->action();
     m_toggleGroupAction = m_contextMenu->addAction(
-                defaultToggleGroupAction->icon(),
+                contextIcon(DesignerIcons::ToggleGroupIcon),
                 tr("Group Selection Mode"), [&]() {
         view()->edit3DAction(View3DActionType::SelectionModeToggle)->action()->trigger();
     });
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
index 6ff28ff296..1de9b308b0 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
@@ -284,13 +284,9 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
     m_toolBox->addRightSideAction(m_zoomSelectionAction.data());
     connect(m_zoomSelectionAction.data(), &QAction::triggered, frameSelection);
 
-    const QIcon resetIcon = Utils::StyleHelper::getIconFromIconFont(fontName,
-                                                                    Theme::getIconUnicode(
-                                                                        Theme::Icon::reload_medium),
-                                                                    iconSize,
-                                                                    iconSize,
-                                                                    iconColorNormal);
-    m_resetAction = new QAction(resetIcon, tr("Reset View"), this);
+    m_resetAction = new QAction(
+                DesignerActionManager::instance().contextIcon(DesignerIcons::ResetViewIcon),
+                tr("Reset View"), this);
     registerActionAsCommand(m_resetAction,
                             Constants::FORMEDITOR_REFRESH,
                             QKeySequence(Qt::Key_R),