summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMahmoud Badri <mahmoud.badri@qt.io>2022-10-21 08:46:46 +0000
committerMahmoud Badri <mahmoud.badri@qt.io>2022-10-21 09:40:44 +0000
commit2ccc4a03ed6e52911321fc139dfd9fb3f8f65594 (patch)
treef89742f7825d3e1c653b328528eaee357ce7a05a
parent70f532c43f74d0dfdd12222cd95f412e06128a6f (diff)
downloadqt-creator-2ccc4a03ed6e52911321fc139dfd9fb3f8f65594.tar.gz
Revert "QmlDesigner: Add "imported" icon to the icons font"
This reverts commit b0fa74756504e83b690ca737c6a67de1de8e32ba. Reason for revert: imported icon not needed anymore. also removed icons are needed. Change-Id: I2d3423a585358abd760f55bba1215d6d2878fdc1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml242
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttfbin23968 -> 24432 bytes
-rw-r--r--src/plugins/qmldesigner/components/componentcore/theme.h4
3 files changed, 125 insertions, 121 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml
index 484386ec94..368a7e9b76 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml
@@ -71,126 +71,128 @@ QtObject {
readonly property string centerHorizontal: "\u0042"
readonly property string centerVertical: "\u0043"
readonly property string closeCross: "\u0044"
- readonly property string colorPopupClose: "\u0045"
- readonly property string columnsAndRows: "\u0046"
- readonly property string copyStyle: "\u0047"
- readonly property string cornerA: "\u0048"
- readonly property string cornerB: "\u0049"
- readonly property string cornersAll: "\u004A"
- readonly property string curveDesigner: "\u004B"
- readonly property string curveEditor: "\u004C"
- readonly property string customMaterialEditor: "\u004D"
- readonly property string decisionNode: "\u004E"
- readonly property string deleteColumn: "\u004F"
- readonly property string deleteMaterial: "\u0050"
- readonly property string deleteRow: "\u0051"
- readonly property string deleteTable: "\u0052"
- readonly property string detach: "\u0053"
- readonly property string distributeBottom: "\u0054"
- readonly property string distributeCenterHorizontal: "\u0055"
- readonly property string distributeCenterVertical: "\u0056"
- readonly property string distributeLeft: "\u0057"
- readonly property string distributeOriginBottomRight: "\u0058"
- readonly property string distributeOriginCenter: "\u0059"
- readonly property string distributeOriginNone: "\u005A"
- readonly property string distributeOriginTopLeft: "\u005B"
- readonly property string distributeRight: "\u005C"
- readonly property string distributeSpacingHorizontal: "\u005D"
- readonly property string distributeSpacingVertical: "\u005E"
- readonly property string distributeTop: "\u005F"
- readonly property string download: "\u0060"
- readonly property string downloadUnavailable: "\u0061"
- readonly property string downloadUpdate: "\u0062"
- readonly property string downloaded: "\u0063"
- readonly property string edit: "\u0064"
- readonly property string eyeDropper: "\u0065"
- readonly property string favorite: "\u0066"
- readonly property string flowAction: "\u0067"
- readonly property string flowTransition: "\u0068"
- readonly property string fontStyleBold: "\u0069"
- readonly property string fontStyleItalic: "\u006A"
- readonly property string fontStyleStrikethrough: "\u006B"
- readonly property string fontStyleUnderline: "\u006C"
- readonly property string gradient: "\u006D"
- readonly property string gridView: "\u006E"
- readonly property string idAliasOff: "\u006F"
- readonly property string idAliasOn: "\u0070"
- readonly property string imported: "\u0071"
- readonly property string infinity: "\u0072"
- readonly property string keyframe: "\u0073"
- readonly property string linkTriangle: "\u0074"
- readonly property string linked: "\u0075"
- readonly property string listView: "\u0076"
- readonly property string lockOff: "\u0077"
- readonly property string lockOn: "\u0078"
- readonly property string materialPreviewEnvironment: "\u0079"
- readonly property string materialPreviewModel: "\u007A"
- readonly property string mergeCells: "\u007B"
- readonly property string minus: "\u007C"
- readonly property string mirror: "\u007D"
- readonly property string newMaterial: "\u007E"
- readonly property string openMaterialBrowser: "\u007F"
- readonly property string orientation: "\u0080"
- readonly property string paddingEdge: "\u0081"
- readonly property string paddingFrame: "\u0082"
- readonly property string pasteStyle: "\u0083"
- readonly property string pause: "\u0084"
- readonly property string pin: "\u0085"
- readonly property string play: "\u0086"
- readonly property string plus: "\u0087"
- readonly property string promote: "\u0088"
- readonly property string readOnly: "\u0089"
- readonly property string redo: "\u008A"
- readonly property string rotationFill: "\u008B"
- readonly property string rotationOutline: "\u008C"
- readonly property string search: "\u008D"
- readonly property string sectionToggle: "\u008E"
- readonly property string splitColumns: "\u008F"
- readonly property string splitRows: "\u0090"
- readonly property string startNode: "\u0091"
- readonly property string testIcon: "\u0092"
- readonly property string textAlignBottom: "\u0093"
- readonly property string textAlignCenter: "\u0094"
- readonly property string textAlignJustified: "\u0095"
- readonly property string textAlignLeft: "\u0096"
- readonly property string textAlignMiddle: "\u0097"
- readonly property string textAlignRight: "\u0098"
- readonly property string textAlignTop: "\u0099"
- readonly property string textBulletList: "\u009A"
- readonly property string textFullJustification: "\u009B"
- readonly property string textNumberedList: "\u009D"
- readonly property string tickIcon: "\u009E"
- readonly property string translationCreateFiles: "\u009F"
- readonly property string translationCreateReport: "\u00A0"
- readonly property string translationExport: "\u00A1"
- readonly property string translationImport: "\u00A2"
- readonly property string translationSelectLanguages: "\u00A3"
- readonly property string translationTest: "\u00A4"
- readonly property string transparent: "\u00A5"
- readonly property string triState: "\u00A6"
- readonly property string triangleArcA: "\u00A7"
- readonly property string triangleArcB: "\u00A8"
- readonly property string triangleCornerA: "\u00A9"
- readonly property string triangleCornerB: "\u00AA"
- readonly property string unLinked: "\u00AB"
- readonly property string undo: "\u00AC"
- readonly property string unpin: "\u00AE"
- readonly property string upDownIcon: "\u00AF"
- readonly property string upDownSquare2: "\u00B0"
- readonly property string visibilityOff: "\u00B1"
- readonly property string visibilityOn: "\u00B2"
- readonly property string wildcard: "\u00B3"
- readonly property string wizardsAutomotive: "\u00B4"
- readonly property string wizardsDesktop: "\u00B5"
- readonly property string wizardsGeneric: "\u00B6"
- readonly property string wizardsMcuEmpty: "\u00B7"
- readonly property string wizardsMcuGraph: "\u00B8"
- readonly property string wizardsMobile: "\u00B9"
- readonly property string wizardsUnknown: "\u00BA"
- readonly property string zoomAll: "\u00BB"
- readonly property string zoomIn: "\u00BC"
- readonly property string zoomOut: "\u00BD"
- readonly property string zoomSelection: "\u00BE"
+ readonly property string closeLink: "\u0045"
+ readonly property string colorPopupClose: "\u0046"
+ readonly property string columnsAndRows: "\u0047"
+ readonly property string copyLink: "\u0048"
+ readonly property string copyStyle: "\u0049"
+ readonly property string cornerA: "\u004A"
+ readonly property string cornerB: "\u004B"
+ readonly property string cornersAll: "\u004C"
+ readonly property string curveDesigner: "\u004D"
+ readonly property string curveEditor: "\u004E"
+ readonly property string customMaterialEditor: "\u004F"
+ readonly property string decisionNode: "\u0050"
+ readonly property string deleteColumn: "\u0051"
+ readonly property string deleteMaterial: "\u0052"
+ readonly property string deleteRow: "\u0053"
+ readonly property string deleteTable: "\u0054"
+ readonly property string detach: "\u0055"
+ readonly property string distributeBottom: "\u0056"
+ readonly property string distributeCenterHorizontal: "\u0057"
+ readonly property string distributeCenterVertical: "\u0058"
+ readonly property string distributeLeft: "\u0059"
+ readonly property string distributeOriginBottomRight: "\u005A"
+ readonly property string distributeOriginCenter: "\u005B"
+ readonly property string distributeOriginNone: "\u005C"
+ readonly property string distributeOriginTopLeft: "\u005D"
+ readonly property string distributeRight: "\u005E"
+ readonly property string distributeSpacingHorizontal: "\u005F"
+ readonly property string distributeSpacingVertical: "\u0060"
+ readonly property string distributeTop: "\u0061"
+ readonly property string download: "\u0062"
+ readonly property string downloadUnavailable: "\u0063"
+ readonly property string downloadUpdate: "\u0064"
+ readonly property string downloaded: "\u0065"
+ readonly property string edit: "\u0066"
+ readonly property string eyeDropper: "\u0067"
+ readonly property string favorite: "\u0068"
+ readonly property string flowAction: "\u0069"
+ readonly property string flowTransition: "\u006A"
+ readonly property string fontStyleBold: "\u006B"
+ readonly property string fontStyleItalic: "\u006C"
+ readonly property string fontStyleStrikethrough: "\u006D"
+ readonly property string fontStyleUnderline: "\u006E"
+ readonly property string gradient: "\u006F"
+ readonly property string gridView: "\u0070"
+ readonly property string idAliasOff: "\u0071"
+ readonly property string idAliasOn: "\u0072"
+ readonly property string infinity: "\u0073"
+ readonly property string keyframe: "\u0074"
+ readonly property string linkTriangle: "\u0075"
+ readonly property string linked: "\u0076"
+ readonly property string listView: "\u0077"
+ readonly property string lockOff: "\u0078"
+ readonly property string lockOn: "\u0079"
+ readonly property string materialPreviewEnvironment: "\u007A"
+ readonly property string materialPreviewModel: "\u007B"
+ readonly property string mergeCells: "\u007C"
+ readonly property string minus: "\u007D"
+ readonly property string mirror: "\u007E"
+ readonly property string newMaterial: "\u007F"
+ readonly property string openLink: "\u0080"
+ readonly property string openMaterialBrowser: "\u0081"
+ readonly property string orientation: "\u0082"
+ readonly property string paddingEdge: "\u0083"
+ readonly property string paddingFrame: "\u0084"
+ readonly property string pasteStyle: "\u0085"
+ readonly property string pause: "\u0086"
+ readonly property string pin: "\u0087"
+ readonly property string play: "\u0088"
+ readonly property string plus: "\u0089"
+ readonly property string promote: "\u008A"
+ readonly property string readOnly: "\u008B"
+ readonly property string redo: "\u008C"
+ readonly property string rotationFill: "\u008D"
+ readonly property string rotationOutline: "\u008E"
+ readonly property string search: "\u008F"
+ readonly property string sectionToggle: "\u0090"
+ readonly property string splitColumns: "\u0091"
+ readonly property string splitRows: "\u0092"
+ readonly property string startNode: "\u0093"
+ readonly property string testIcon: "\u0094"
+ readonly property string textAlignBottom: "\u0095"
+ readonly property string textAlignCenter: "\u0096"
+ readonly property string textAlignJustified: "\u0097"
+ readonly property string textAlignLeft: "\u0098"
+ readonly property string textAlignMiddle: "\u0099"
+ readonly property string textAlignRight: "\u009A"
+ readonly property string textAlignTop: "\u009B"
+ readonly property string textBulletList: "\u009D"
+ readonly property string textFullJustification: "\u009E"
+ readonly property string textNumberedList: "\u009F"
+ readonly property string tickIcon: "\u00A0"
+ readonly property string translationCreateFiles: "\u00A1"
+ readonly property string translationCreateReport: "\u00A2"
+ readonly property string translationExport: "\u00A3"
+ readonly property string translationImport: "\u00A4"
+ readonly property string translationSelectLanguages: "\u00A5"
+ readonly property string translationTest: "\u00A6"
+ readonly property string transparent: "\u00A7"
+ readonly property string triState: "\u00A8"
+ readonly property string triangleArcA: "\u00A9"
+ readonly property string triangleArcB: "\u00AA"
+ readonly property string triangleCornerA: "\u00AB"
+ readonly property string triangleCornerB: "\u00AC"
+ readonly property string unLinked: "\u00AE"
+ readonly property string undo: "\u00AF"
+ readonly property string unpin: "\u00B0"
+ readonly property string upDownIcon: "\u00B1"
+ readonly property string upDownSquare2: "\u00B2"
+ readonly property string visibilityOff: "\u00B3"
+ readonly property string visibilityOn: "\u00B4"
+ readonly property string wildcard: "\u00B5"
+ readonly property string wizardsAutomotive: "\u00B6"
+ readonly property string wizardsDesktop: "\u00B7"
+ readonly property string wizardsGeneric: "\u00B8"
+ readonly property string wizardsMcuEmpty: "\u00B9"
+ readonly property string wizardsMcuGraph: "\u00BA"
+ readonly property string wizardsMobile: "\u00BB"
+ readonly property string wizardsUnknown: "\u00BC"
+ readonly property string zoomAll: "\u00BD"
+ readonly property string zoomIn: "\u00BE"
+ readonly property string zoomOut: "\u00BF"
+ readonly property string zoomSelection: "\u00C0"
readonly property font iconFont: Qt.font({
"family": controlIcons.name,
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
index e3b40281c8..acd8df6ce3 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
Binary files differ
diff --git a/src/plugins/qmldesigner/components/componentcore/theme.h b/src/plugins/qmldesigner/components/componentcore/theme.h
index 3b4846122d..56bebd51c1 100644
--- a/src/plugins/qmldesigner/components/componentcore/theme.h
+++ b/src/plugins/qmldesigner/components/componentcore/theme.h
@@ -79,8 +79,10 @@ public:
centerHorizontal,
centerVertical,
closeCross,
+ closeLink,
colorPopupClose,
columnsAndRows,
+ copyLink,
copyStyle,
cornerA,
cornerB,
@@ -123,7 +125,6 @@ public:
gridView,
idAliasOff,
idAliasOn,
- imported,
infinity,
keyframe,
linkTriangle,
@@ -137,6 +138,7 @@ public:
minus,
mirror,
newMaterial,
+ openLink,
openMaterialBrowser,
orientation,
paddingEdge,