QmlDesigner: Add multi-viewport selected state icons

New icons: - multi_viewport_1_selected_medium - multi_viewport_2hl_selected_medium - multi_viewport_2vl_selected_medium - multi_viewport_2x2_selected_medium - multi_viewport_3plus1_selected_medium Change-Id: I061498bc283c6fbb9de149456f4700c23ba13330 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2025-05-12 14:52:20 +03:00
parent ccc095d378
commit f8f093944d
4 changed files with 226 additions and 191 deletions
--- a/share/qtcreator/qmldesigner/designericons.json
+++ b/share/qtcreator/qmldesigner/designericons.json
@@ -131,6 +131,46 @@
        "ModelSphereIcon": {
            "iconName": "sphere_small"
        },
+        "MultiViewPort1Icon": {
+            "Off": {
+                "iconName": "multi_viewport_1_medium"
+            },
+            "On": {
+                "iconName": "multi_viewport_1_selected_medium"
+            }
+        },
+        "MultiViewPort2hlIcon": {
+            "Off": {
+                "iconName": "multi_viewport_2hl_medium"
+            },
+            "On": {
+                "iconName": "multi_viewport_2hl_selected_medium"
+            }
+        },
+        "MultiViewPort2vlIcon": {
+            "Off": {
+                "iconName": "multi_viewport_2vl_medium"
+            },
+            "On": {
+                "iconName": "multi_viewport_2vl_selected_medium"
+            }
+        },
+        "MultiViewPort2x2Icon": {
+            "Off": {
+                "iconName": "multi_viewport_2x2_medium"
+            },
+            "On": {
+                "iconName": "multi_viewport_2x2_selected_medium"
+            }
+        },
+        "MultiViewPort3plus1Icon": {
+            "Off": {
+                "iconName": "multi_viewport_3plus1_medium"
+            },
+            "On": {
+                "iconName": "multi_viewport_3plus1_selected_medium"
+            }
+        },
        "ParentIcon": {
            "iconName": "selectParent_small"
        },
@@ -247,21 +287,6 @@
        "MoveToolIcon": {
            "iconName": "move_medium"
        },
-        "MultiViewPort1Icon": {
-            "iconName": "multi_viewport_1_medium"
-        },
-        "MultiViewPort2hlIcon": {
-            "iconName": "multi_viewport_2hl_medium"
-        },
-        "MultiViewPort2vlIcon": {
-            "iconName": "multi_viewport_2vl_medium"
-        },
-        "MultiViewPort2x2Icon": {
-            "iconName": "multi_viewport_2x2_medium"
-        },
-        "MultiViewPort3plus1Icon": {
-            "iconName": "multi_viewport_3plus1_medium"
-        },
        "ParticlesAnimationIcon": {
            "iconName": "particleAnimation_medium"
        },
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml
@@ -228,182 +228,187 @@ QtObject {
    readonly property string moveUpwards_medium: "\u00F7"
    readonly property string move_medium: "\u00F8"
    readonly property string multi_viewport_1_medium: "\u00F9"
-    readonly property string multi_viewport_2hl_medium: "\u00FA"
-    readonly property string multi_viewport_2vl_medium: "\u00FB"
-    readonly property string multi_viewport_2x2_medium: "\u00FC"
-    readonly property string multi_viewport_3plus1_medium: "\u00FD"
-    readonly property string newMaterial: "\u00FE"
-    readonly property string nextFile_large: "\u00FF"
-    readonly property string normalBar_small: "\u0100"
-    readonly property string number_medium: "\u0101"
-    readonly property string openLink: "\u0102"
-    readonly property string openMaterialBrowser: "\u0103"
-    readonly property string orientation: "\u0104"
-    readonly property string orthCam_medium: "\u0105"
-    readonly property string orthCam_small: "\u0106"
-    readonly property string paddingEdge: "\u0107"
-    readonly property string paddingFrame: "\u0108"
-    readonly property string particleAnimation_medium: "\u0109"
-    readonly property string pasteStyle: "\u010A"
-    readonly property string paste_small: "\u010B"
-    readonly property string pause: "\u010C"
-    readonly property string pause_medium: "\u010D"
-    readonly property string perspectiveCam_medium: "\u010E"
-    readonly property string perspectiveCam_small: "\u010F"
-    readonly property string pin: "\u0110"
-    readonly property string plane_medium: "\u0111"
-    readonly property string plane_small: "\u0112"
-    readonly property string play: "\u0113"
-    readonly property string playFill_medium: "\u0114"
-    readonly property string playOutline_medium: "\u0115"
-    readonly property string plus: "\u0116"
-    readonly property string pointLight_small: "\u0117"
-    readonly property string positioners_small: "\u0118"
-    readonly property string previewEnv_medium: "\u0119"
-    readonly property string previousFile_large: "\u011A"
-    readonly property string promote: "\u011B"
-    readonly property string properties_medium: "\u011C"
-    readonly property string readOnly: "\u011D"
-    readonly property string recent_medium: "\u011E"
-    readonly property string recordFill_medium: "\u011F"
-    readonly property string recordOutline_medium: "\u0120"
-    readonly property string redo: "\u0121"
-    readonly property string reload_medium: "\u0122"
-    readonly property string remove_medium: "\u0123"
-    readonly property string remove_small: "\u0124"
-    readonly property string rename_small: "\u0125"
-    readonly property string replace_small: "\u0126"
-    readonly property string resetView_small: "\u0127"
-    readonly property string restartParticles_medium: "\u0128"
-    readonly property string reverseOrder_medium: "\u0129"
-    readonly property string revert_medium: "\u012A"
-    readonly property string roatate_medium: "\u012B"
-    readonly property string rotationFill: "\u012C"
-    readonly property string rotationOutline: "\u012D"
-    readonly property string runProjFill_large: "\u012E"
-    readonly property string runProjOutline_large: "\u012F"
-    readonly property string s_anchors: "\u0130"
-    readonly property string s_annotations: "\u0131"
-    readonly property string s_arrange: "\u0132"
-    readonly property string s_boundingBox: "\u0133"
-    readonly property string s_component: "\u0134"
-    readonly property string s_connections: "\u0135"
-    readonly property string s_edit: "\u0136"
-    readonly property string s_enterComponent: "\u0137"
-    readonly property string s_eventList: "\u0138"
-    readonly property string s_group: "\u0139"
-    readonly property string s_layouts: "\u013A"
-    readonly property string s_merging: "\u013B"
-    readonly property string s_mouseArea: "\u013C"
-    readonly property string s_positioners: "\u013D"
-    readonly property string s_selection: "\u013E"
-    readonly property string s_snapping: "\u013F"
-    readonly property string s_timeline: "\u0140"
-    readonly property string s_visibility: "\u0141"
-    readonly property string saveAs_medium: "\u0142"
-    readonly property string saveLogs_medium: "\u0143"
-    readonly property string save_medium: "\u0144"
-    readonly property string scale_medium: "\u0145"
-    readonly property string search: "\u0146"
-    readonly property string search_small: "\u0147"
-    readonly property string sectionToggle: "\u0148"
-    readonly property string selectFill_medium: "\u0149"
-    readonly property string selectOutline_medium: "\u014A"
-    readonly property string selectParent_small: "\u014B"
-    readonly property string selection_small: "\u014C"
-    readonly property string settings_medium: "\u014D"
-    readonly property string share_large: "\u014E"
-    readonly property string signal_small: "\u014F"
-    readonly property string signin_medium: "\u0150"
-    readonly property string signout_medium: "\u0151"
-    readonly property string snapping_conf_medium: "\u0152"
-    readonly property string snapping_medium: "\u0153"
-    readonly property string snapping_small: "\u0154"
-    readonly property string sortascending_medium: "\u0155"
-    readonly property string sortdescending_medium: "\u0156"
-    readonly property string sphere_medium: "\u0157"
-    readonly property string sphere_small: "\u0158"
-    readonly property string splitColumns: "\u0159"
-    readonly property string splitRows: "\u015A"
-    readonly property string splitScreen_medium: "\u015B"
-    readonly property string spotLight_small: "\u015C"
-    readonly property string stackedContainer_small: "\u015D"
-    readonly property string startNode: "\u015E"
-    readonly property string step_medium: "\u015F"
-    readonly property string stop_medium: "\u0160"
-    readonly property string string_medium: "\u0161"
-    readonly property string tableView_medium: "\u0162"
-    readonly property string testIcon: "\u0163"
-    readonly property string textAlignBottom: "\u0164"
-    readonly property string textAlignCenter: "\u0165"
-    readonly property string textAlignJustified: "\u0166"
-    readonly property string textAlignLeft: "\u0167"
-    readonly property string textAlignMiddle: "\u0168"
-    readonly property string textAlignRight: "\u0169"
-    readonly property string textAlignTop: "\u016A"
-    readonly property string textBulletList: "\u016B"
-    readonly property string textFullJustification: "\u016C"
-    readonly property string textNumberedList: "\u016D"
-    readonly property string textures_medium: "\u016E"
-    readonly property string tickIcon: "\u016F"
-    readonly property string tickMark_small: "\u0170"
-    readonly property string timeline_small: "\u0171"
-    readonly property string toEndFrame_medium: "\u0172"
-    readonly property string toNextFrame_medium: "\u0173"
-    readonly property string toPrevFrame_medium: "\u0174"
-    readonly property string toStartFrame_medium: "\u0175"
-    readonly property string topToolbar_annotations: "\u0176"
-    readonly property string topToolbar_closeFile: "\u0177"
-    readonly property string topToolbar_designMode: "\u0178"
-    readonly property string topToolbar_enterComponent: "\u0179"
-    readonly property string topToolbar_home: "\u017A"
-    readonly property string topToolbar_makeComponent: "\u017B"
-    readonly property string topToolbar_navFile: "\u017C"
-    readonly property string topToolbar_runProject: "\u017D"
-    readonly property string translationCreateFiles: "\u017E"
-    readonly property string translationCreateReport: "\u017F"
-    readonly property string translationExport: "\u0180"
-    readonly property string translationImport: "\u0181"
-    readonly property string translationSelectLanguages: "\u0182"
-    readonly property string translationTest: "\u0183"
-    readonly property string transparent: "\u0184"
-    readonly property string trash_medium: "\u0185"
-    readonly property string triState: "\u0186"
-    readonly property string triangleArcA: "\u0187"
-    readonly property string triangleArcB: "\u0188"
-    readonly property string triangleCornerA: "\u0189"
-    readonly property string triangleCornerB: "\u018A"
-    readonly property string unLinked: "\u018B"
-    readonly property string undo: "\u018C"
-    readonly property string unify_medium: "\u018D"
-    readonly property string unpin: "\u018E"
-    readonly property string upDownIcon: "\u018F"
-    readonly property string upDownSquare2: "\u0190"
-    readonly property string updateAvailable_medium: "\u0191"
-    readonly property string updateContent_medium: "\u0192"
-    readonly property string upload_medium: "\u0193"
-    readonly property string userAssets_medium: "\u0194"
-    readonly property string user_medium: "\u0195"
-    readonly property string visibilityOff: "\u0196"
-    readonly property string visibilityOn: "\u0197"
-    readonly property string visible_medium: "\u0198"
-    readonly property string visible_small: "\u0199"
-    readonly property string warning2_medium: "\u019A"
-    readonly property string warning_medium: "\u019B"
-    readonly property string wildcard: "\u019C"
-    readonly property string wizardsAutomotive: "\u019D"
-    readonly property string wizardsDesktop: "\u019E"
-    readonly property string wizardsGeneric: "\u019F"
-    readonly property string wizardsMcuEmpty: "\u01A0"
-    readonly property string wizardsMcuGraph: "\u01A1"
-    readonly property string wizardsMobile: "\u01A2"
-    readonly property string wizardsUnknown: "\u01A3"
-    readonly property string zoomAll: "\u01A4"
-    readonly property string zoomIn: "\u01A5"
-    readonly property string zoomIn_medium: "\u01A6"
-    readonly property string zoomOut: "\u01A7"
-    readonly property string zoomOut_medium: "\u01A8"
-    readonly property string zoomSelection: "\u01A9"
+    readonly property string multi_viewport_1_selected_medium: "\u00FA"
+    readonly property string multi_viewport_2hl_medium: "\u00FB"
+    readonly property string multi_viewport_2hl_selected_medium: "\u00FC"
+    readonly property string multi_viewport_2vl_medium: "\u00FD"
+    readonly property string multi_viewport_2vl_selected_medium: "\u00FE"
+    readonly property string multi_viewport_2x2_medium: "\u00FF"
+    readonly property string multi_viewport_2x2_selected_medium: "\u0100"
+    readonly property string multi_viewport_3plus1_medium: "\u0101"
+    readonly property string multi_viewport_3plus1_selected_medium: "\u0102"
+    readonly property string newMaterial: "\u0103"
+    readonly property string nextFile_large: "\u0104"
+    readonly property string normalBar_small: "\u0105"
+    readonly property string number_medium: "\u0106"
+    readonly property string openLink: "\u0107"
+    readonly property string openMaterialBrowser: "\u0108"
+    readonly property string orientation: "\u0109"
+    readonly property string orthCam_medium: "\u010A"
+    readonly property string orthCam_small: "\u010B"
+    readonly property string paddingEdge: "\u010C"
+    readonly property string paddingFrame: "\u010D"
+    readonly property string particleAnimation_medium: "\u010E"
+    readonly property string pasteStyle: "\u010F"
+    readonly property string paste_small: "\u0110"
+    readonly property string pause: "\u0111"
+    readonly property string pause_medium: "\u0112"
+    readonly property string perspectiveCam_medium: "\u0113"
+    readonly property string perspectiveCam_small: "\u0114"
+    readonly property string pin: "\u0115"
+    readonly property string plane_medium: "\u0116"
+    readonly property string plane_small: "\u0117"
+    readonly property string play: "\u0118"
+    readonly property string playFill_medium: "\u0119"
+    readonly property string playOutline_medium: "\u011A"
+    readonly property string plus: "\u011B"
+    readonly property string pointLight_small: "\u011C"
+    readonly property string positioners_small: "\u011D"
+    readonly property string previewEnv_medium: "\u011E"
+    readonly property string previousFile_large: "\u011F"
+    readonly property string promote: "\u0120"
+    readonly property string properties_medium: "\u0121"
+    readonly property string readOnly: "\u0122"
+    readonly property string recent_medium: "\u0123"
+    readonly property string recordFill_medium: "\u0124"
+    readonly property string recordOutline_medium: "\u0125"
+    readonly property string redo: "\u0126"
+    readonly property string reload_medium: "\u0127"
+    readonly property string remove_medium: "\u0128"
+    readonly property string remove_small: "\u0129"
+    readonly property string rename_small: "\u012A"
+    readonly property string replace_small: "\u012B"
+    readonly property string resetView_small: "\u012C"
+    readonly property string restartParticles_medium: "\u012D"
+    readonly property string reverseOrder_medium: "\u012E"
+    readonly property string revert_medium: "\u012F"
+    readonly property string roatate_medium: "\u0130"
+    readonly property string rotationFill: "\u0131"
+    readonly property string rotationOutline: "\u0132"
+    readonly property string runProjFill_large: "\u0133"
+    readonly property string runProjOutline_large: "\u0134"
+    readonly property string s_anchors: "\u0135"
+    readonly property string s_annotations: "\u0136"
+    readonly property string s_arrange: "\u0137"
+    readonly property string s_boundingBox: "\u0138"
+    readonly property string s_component: "\u0139"
+    readonly property string s_connections: "\u013A"
+    readonly property string s_edit: "\u013B"
+    readonly property string s_enterComponent: "\u013C"
+    readonly property string s_eventList: "\u013D"
+    readonly property string s_group: "\u013E"
+    readonly property string s_layouts: "\u013F"
+    readonly property string s_merging: "\u0140"
+    readonly property string s_mouseArea: "\u0141"
+    readonly property string s_positioners: "\u0142"
+    readonly property string s_selection: "\u0143"
+    readonly property string s_snapping: "\u0144"
+    readonly property string s_timeline: "\u0145"
+    readonly property string s_visibility: "\u0146"
+    readonly property string saveAs_medium: "\u0147"
+    readonly property string saveLogs_medium: "\u0148"
+    readonly property string save_medium: "\u0149"
+    readonly property string scale_medium: "\u014A"
+    readonly property string search: "\u014B"
+    readonly property string search_small: "\u014C"
+    readonly property string sectionToggle: "\u014D"
+    readonly property string selectFill_medium: "\u014E"
+    readonly property string selectOutline_medium: "\u014F"
+    readonly property string selectParent_small: "\u0150"
+    readonly property string selection_small: "\u0151"
+    readonly property string settings_medium: "\u0152"
+    readonly property string share_large: "\u0153"
+    readonly property string signal_small: "\u0154"
+    readonly property string signin_medium: "\u0155"
+    readonly property string signout_medium: "\u0156"
+    readonly property string snapping_conf_medium: "\u0157"
+    readonly property string snapping_medium: "\u0158"
+    readonly property string snapping_small: "\u0159"
+    readonly property string sortascending_medium: "\u015A"
+    readonly property string sortdescending_medium: "\u015B"
+    readonly property string sphere_medium: "\u015C"
+    readonly property string sphere_small: "\u015D"
+    readonly property string splitColumns: "\u015E"
+    readonly property string splitRows: "\u015F"
+    readonly property string splitScreen_medium: "\u0160"
+    readonly property string spotLight_small: "\u0161"
+    readonly property string stackedContainer_small: "\u0162"
+    readonly property string startNode: "\u0163"
+    readonly property string step_medium: "\u0164"
+    readonly property string stop_medium: "\u0165"
+    readonly property string string_medium: "\u0166"
+    readonly property string tableView_medium: "\u0167"
+    readonly property string testIcon: "\u0168"
+    readonly property string textAlignBottom: "\u0169"
+    readonly property string textAlignCenter: "\u016A"
+    readonly property string textAlignJustified: "\u016B"
+    readonly property string textAlignLeft: "\u016C"
+    readonly property string textAlignMiddle: "\u016D"
+    readonly property string textAlignRight: "\u016E"
+    readonly property string textAlignTop: "\u016F"
+    readonly property string textBulletList: "\u0170"
+    readonly property string textFullJustification: "\u0171"
+    readonly property string textNumberedList: "\u0172"
+    readonly property string textures_medium: "\u0173"
+    readonly property string tickIcon: "\u0174"
+    readonly property string tickMark_small: "\u0175"
+    readonly property string timeline_small: "\u0176"
+    readonly property string toEndFrame_medium: "\u0177"
+    readonly property string toNextFrame_medium: "\u0178"
+    readonly property string toPrevFrame_medium: "\u0179"
+    readonly property string toStartFrame_medium: "\u017A"
+    readonly property string topToolbar_annotations: "\u017B"
+    readonly property string topToolbar_closeFile: "\u017C"
+    readonly property string topToolbar_designMode: "\u017D"
+    readonly property string topToolbar_enterComponent: "\u017E"
+    readonly property string topToolbar_home: "\u017F"
+    readonly property string topToolbar_makeComponent: "\u0180"
+    readonly property string topToolbar_navFile: "\u0181"
+    readonly property string topToolbar_runProject: "\u0182"
+    readonly property string translationCreateFiles: "\u0183"
+    readonly property string translationCreateReport: "\u0184"
+    readonly property string translationExport: "\u0185"
+    readonly property string translationImport: "\u0186"
+    readonly property string translationSelectLanguages: "\u0187"
+    readonly property string translationTest: "\u0188"
+    readonly property string transparent: "\u0189"
+    readonly property string trash_medium: "\u018A"
+    readonly property string triState: "\u018B"
+    readonly property string triangleArcA: "\u018C"
+    readonly property string triangleArcB: "\u018D"
+    readonly property string triangleCornerA: "\u018E"
+    readonly property string triangleCornerB: "\u018F"
+    readonly property string unLinked: "\u0190"
+    readonly property string undo: "\u0191"
+    readonly property string unify_medium: "\u0192"
+    readonly property string unpin: "\u0193"
+    readonly property string upDownIcon: "\u0194"
+    readonly property string upDownSquare2: "\u0195"
+    readonly property string updateAvailable_medium: "\u0196"
+    readonly property string updateContent_medium: "\u0197"
+    readonly property string upload_medium: "\u0198"
+    readonly property string userAssets_medium: "\u0199"
+    readonly property string user_medium: "\u019A"
+    readonly property string visibilityOff: "\u019B"
+    readonly property string visibilityOn: "\u019C"
+    readonly property string visible_medium: "\u019D"
+    readonly property string visible_small: "\u019E"
+    readonly property string warning2_medium: "\u019F"
+    readonly property string warning_medium: "\u01A0"
+    readonly property string wildcard: "\u01A1"
+    readonly property string wizardsAutomotive: "\u01A2"
+    readonly property string wizardsDesktop: "\u01A3"
+    readonly property string wizardsGeneric: "\u01A4"
+    readonly property string wizardsMcuEmpty: "\u01A5"
+    readonly property string wizardsMcuGraph: "\u01A6"
+    readonly property string wizardsMobile: "\u01A7"
+    readonly property string wizardsUnknown: "\u01A8"
+    readonly property string zoomAll: "\u01A9"
+    readonly property string zoomIn: "\u01AA"
+    readonly property string zoomIn_medium: "\u01AB"
+    readonly property string zoomOut: "\u01AC"
+    readonly property string zoomOut_medium: "\u01AD"
+    readonly property string zoomSelection: "\u01AE"

    readonly property font iconFont: Qt.font({
        family: controlIcons.name,
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
--- a/src/plugins/qmldesigner/components/componentcore/theme.h
+++ b/src/plugins/qmldesigner/components/componentcore/theme.h
@@ -236,10 +236,15 @@ public:
        moveUpwards_medium,
        move_medium,
        multi_viewport_1_medium,
+        multi_viewport_1_selected_medium,
        multi_viewport_2hl_medium,
+        multi_viewport_2hl_selected_medium,
        multi_viewport_2vl_medium,
+        multi_viewport_2vl_selected_medium,
        multi_viewport_2x2_medium,
+        multi_viewport_2x2_selected_medium,
        multi_viewport_3plus1_medium,
+        multi_viewport_3plus1_selected_medium,
        newMaterial,
        nextFile_large,
        normalBar_small,