From 68840861155aae82ca0cc6ed9b337ec371e7b588 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Wed, 26 May 2021 12:48:40 +0200 Subject: [PATCH] QmlDesigner: Update icon font * Add bevelAll, bevelCorner, copyStyle, cornerA, cornerB, cornersAll, eyeDropper, gradient, keyframe, linkTriangle, linked, mirror, paddingEdge, paddingFrame, pasteStyle, promote, transparent, unLinked * Rename aliasProperty to alias Change-Id: I2050c765fe242a68054b2c8c2ff9c3f778c06423 Reviewed-by: Thomas Hartmann --- .../imports/StudioTheme/InternalConstants.qml | 197 +++++++++--------- .../imports/StudioTheme/icons.ttf | Bin 16516 -> 18500 bytes .../components/componentcore/theme.h | 20 +- 3 files changed, 123 insertions(+), 94 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml index 19e319be32c..bdbc8d95fc7 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml @@ -48,99 +48,110 @@ QtObject { readonly property string adsDropDown: "\u002B" readonly property string alias: "\u002C" readonly property string aliasAnimated: "\u002D" - readonly property string aliasProperty: "\u002E" - readonly property string alignBottom: "\u002F" - readonly property string alignCenterHorizontal: "\u0030" - readonly property string alignCenterVertical: "\u0031" - readonly property string alignLeft: "\u0032" - readonly property string alignRight: "\u0033" - readonly property string alignTo: "\u0034" - readonly property string alignTop: "\u0035" - readonly property string anchorBaseline: "\u0036" - readonly property string anchorBottom: "\u0037" - readonly property string anchorFill: "\u0038" - readonly property string anchorLeft: "\u0039" - readonly property string anchorRight: "\u003A" - readonly property string anchorTop: "\u003B" - readonly property string animatedProperty: "\u003C" - readonly property string annotationBubble: "\u003D" - readonly property string annotationDecal: "\u003E" - readonly property string assign: "\u003F" - readonly property string centerHorizontal: "\u0040" - readonly property string centerVertical: "\u0041" - readonly property string closeCross: "\u0042" - readonly property string curveDesigner: "\u0043" - readonly property string curveEditor: "\u0044" - readonly property string decisionNode: "\u0045" - readonly property string deleteColumn: "\u0046" - readonly property string deleteRow: "\u0047" - readonly property string deleteTable: "\u0048" - readonly property string detach: "\u0049" - readonly property string distributeBottom: "\u004A" - readonly property string distributeCenterHorizontal: "\u004B" - readonly property string distributeCenterVertical: "\u004C" - readonly property string distributeLeft: "\u004D" - readonly property string distributeOriginBottomRight: "\u004E" - readonly property string distributeOriginCenter: "\u004F" - readonly property string distributeOriginNone: "\u0050" - readonly property string distributeOriginTopLeft: "\u0051" - readonly property string distributeRight: "\u0052" - readonly property string distributeSpacingHorizontal: "\u0053" - readonly property string distributeSpacingVertical: "\u0054" - readonly property string distributeTop: "\u0055" - readonly property string edit: "\u0056" - readonly property string flowAction: "\u0057" - readonly property string flowTransition: "\u0058" - readonly property string fontStyleBold: "\u0059" - readonly property string fontStyleItalic: "\u005A" - readonly property string fontStyleStrikethrough: "\u005B" - readonly property string fontStyleUnderline: "\u005C" - readonly property string gridView: "\u005D" - readonly property string idAliasOff: "\u005E" - readonly property string idAliasOn: "\u005F" - readonly property string keyframe: "\u0060" - readonly property string linkTriangle: "\u0061" - readonly property string linked: "\u0062" - readonly property string listView: "\u0063" - readonly property string lockOff: "\u0064" - readonly property string lockOn: "\u0065" - readonly property string mergeCells: "\u0066" - readonly property string minus: "\u0067" - readonly property string mirror: "\u0068" - readonly property string pin: "\u0069" - readonly property string plus: "\u006A" - readonly property string promote: "\u006B" - readonly property string redo: "\u006C" - readonly property string rotationFill: "\u006D" - readonly property string rotationOutline: "\u006E" - readonly property string search: "\u006F" - readonly property string splitColumns: "\u0070" - readonly property string splitRows: "\u0071" - readonly property string startNode: "\u0072" - readonly property string testIcon: "\u0073" - readonly property string textAlignBottom: "\u0074" - readonly property string textAlignCenter: "\u0075" - readonly property string textAlignLeft: "\u0076" - readonly property string textAlignMiddle: "\u0077" - readonly property string textAlignRight: "\u0078" - readonly property string textAlignTop: "\u0079" - readonly property string textBulletList: "\u007A" - readonly property string textFullJustification: "\u007B" - readonly property string textNumberedList: "\u007C" - readonly property string tickIcon: "\u007D" - readonly property string triState: "\u007E" - readonly property string unLinked: "\u007F" - readonly property string undo: "\u0080" - readonly property string unpin: "\u0081" - readonly property string upDownIcon: "\u0082" - readonly property string upDownSquare2: "\u0083" - readonly property string visibilityOff: "\u0084" - readonly property string visibilityOn: "\u0085" - readonly property string wildcard: "\u0086" - readonly property string zoomAll: "\u0087" - readonly property string zoomIn: "\u0088" - readonly property string zoomOut: "\u0089" - readonly property string zoomSelection: "\u008A" + readonly property string alignBottom: "\u002E" + readonly property string alignCenterHorizontal: "\u002F" + readonly property string alignCenterVertical: "\u0030" + readonly property string alignLeft: "\u0031" + readonly property string alignRight: "\u0032" + readonly property string alignTo: "\u0033" + readonly property string alignTop: "\u0034" + readonly property string anchorBaseline: "\u0035" + readonly property string anchorBottom: "\u0036" + readonly property string anchorFill: "\u0037" + readonly property string anchorLeft: "\u0038" + readonly property string anchorRight: "\u0039" + readonly property string anchorTop: "\u003A" + readonly property string animatedProperty: "\u003B" + readonly property string annotationBubble: "\u003C" + readonly property string annotationDecal: "\u003D" + readonly property string assign: "\u003E" + readonly property string bevelAll: "\u003F" + readonly property string bevelCorner: "\u0040" + readonly property string centerHorizontal: "\u0041" + readonly property string centerVertical: "\u0042" + readonly property string closeCross: "\u0043" + readonly property string copyStyle: "\u0044" + readonly property string cornerA: "\u0045" + readonly property string cornerB: "\u0046" + readonly property string cornersAll: "\u0047" + readonly property string curveDesigner: "\u0048" + readonly property string curveEditor: "\u0049" + readonly property string decisionNode: "\u004A" + readonly property string deleteColumn: "\u004B" + readonly property string deleteRow: "\u004C" + readonly property string deleteTable: "\u004D" + readonly property string detach: "\u004E" + readonly property string distributeBottom: "\u004F" + readonly property string distributeCenterHorizontal: "\u0050" + readonly property string distributeCenterVertical: "\u0051" + readonly property string distributeLeft: "\u0052" + readonly property string distributeOriginBottomRight: "\u0053" + readonly property string distributeOriginCenter: "\u0054" + readonly property string distributeOriginNone: "\u0055" + readonly property string distributeOriginTopLeft: "\u0056" + readonly property string distributeRight: "\u0057" + readonly property string distributeSpacingHorizontal: "\u0058" + readonly property string distributeSpacingVertical: "\u0059" + readonly property string distributeTop: "\u005A" + readonly property string edit: "\u005B" + readonly property string eyeDropper: "\u005C" + readonly property string flowAction: "\u005D" + readonly property string flowTransition: "\u005E" + readonly property string fontStyleBold: "\u005F" + readonly property string fontStyleItalic: "\u0060" + readonly property string fontStyleStrikethrough: "\u0061" + readonly property string fontStyleUnderline: "\u0062" + readonly property string gradient: "\u0063" + readonly property string gridView: "\u0064" + readonly property string idAliasOff: "\u0065" + readonly property string idAliasOn: "\u0066" + readonly property string keyframe: "\u0067" + readonly property string linkTriangle: "\u0068" + readonly property string linked: "\u0069" + readonly property string listView: "\u006A" + readonly property string lockOff: "\u006B" + readonly property string lockOn: "\u006C" + readonly property string mergeCells: "\u006D" + readonly property string minus: "\u006E" + readonly property string mirror: "\u006F" + readonly property string paddingEdge: "\u0070" + readonly property string paddingFrame: "\u0071" + readonly property string pasteStyle: "\u0072" + readonly property string pin: "\u0073" + readonly property string plus: "\u0074" + readonly property string promote: "\u0075" + readonly property string redo: "\u0076" + readonly property string rotationFill: "\u0077" + readonly property string rotationOutline: "\u0078" + readonly property string search: "\u0079" + readonly property string splitColumns: "\u007A" + readonly property string splitRows: "\u007B" + readonly property string startNode: "\u007C" + readonly property string testIcon: "\u007D" + readonly property string textAlignBottom: "\u007E" + readonly property string textAlignCenter: "\u007F" + readonly property string textAlignLeft: "\u0080" + readonly property string textAlignMiddle: "\u0081" + readonly property string textAlignRight: "\u0082" + readonly property string textAlignTop: "\u0083" + readonly property string textBulletList: "\u0084" + readonly property string textFullJustification: "\u0085" + readonly property string textNumberedList: "\u0086" + readonly property string tickIcon: "\u0087" + readonly property string transparent: "\u0088" + readonly property string triState: "\u0089" + readonly property string unLinked: "\u008A" + readonly property string undo: "\u008B" + readonly property string unpin: "\u008C" + readonly property string upDownIcon: "\u008D" + readonly property string upDownSquare2: "\u008E" + readonly property string visibilityOff: "\u008F" + readonly property string visibilityOn: "\u0090" + readonly property string wildcard: "\u0091" + readonly property string zoomAll: "\u0092" + readonly property string zoomIn: "\u0093" + readonly property string zoomOut: "\u0094" + readonly property string zoomSelection: "\u0095" 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 aef8a37d5697b9ef4d8d4d1255edcd1face7b21c..fb3e387077f36e002b92a8be15758df5d3b229df 100644 GIT binary patch delta 3007 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 DLK5Y+ delta 1007 zcmX>yfw85Lv7UjEfq{XSp@D&!A;8To#CJ-@&qM|WhYSV=1{wcgeWS>ZR0ReG#s~%m zhJ@tY#DXoi+s-mDFwJ3LV020@D^XxjWU6FfV1B^Bz`&B8SX}V`KLaxZgF^xX0|Q5T zPG#By*;70W3@is27!3Agq$Z}wt6e?Kz`$^afq}s+BO|pwk?Z^ai3|*kA`A=+DjB&Y z6=K|M7Z?~AcQ7z8Jj%&WPAurD^wB12F`r_7!@|X)!;-<$#xjHD4r>tWG}c>ea%^U7acpgDKiJ*ar?H>mkmH!f zafXwL(}FXN^9bh)E*>ret`M#Uu6DxF>Mm;Qq%Gz|+7pjpqR`AFm5< z3-1x$JG`IxEcj;d-Qic_&*E?5pTqw|KuEwvphjSgmB2MYE

yG{F+VNrEqgOoSSQ zt_dp%R|sDbQ4rZ9@<8N=sF`S<=nl~evW3#PX4%6nN$}+5*8#Oz)HcvFwV^=p}G=`)K1{MZM#yLF)n~lMU@#SVKTO~$T zO9ovAqshs37R;8qMw92;U1MaJTx_qzm^*oz{jJGu4rloU6LT^Xivx=C3sQ?pDmVK( ssxnTV=w!b6uhV+Q$-7-@CcC)K*v#V=$T&IIecNP34+(B~GWT=?0P3RmWdHyG diff --git a/src/plugins/qmldesigner/components/componentcore/theme.h b/src/plugins/qmldesigner/components/componentcore/theme.h index e2d26720add..3d7ed9cd327 100644 --- a/src/plugins/qmldesigner/components/componentcore/theme.h +++ b/src/plugins/qmldesigner/components/componentcore/theme.h @@ -54,8 +54,8 @@ public: adsClose, adsDetach, adsDropDown, + alias, aliasAnimated, - aliasProperty, alignBottom, alignCenterHorizontal, alignCenterVertical, @@ -73,9 +73,15 @@ public: annotationBubble, annotationDecal, assign, + bevelAll, + bevelCorner, centerHorizontal, centerVertical, closeCross, + copyStyle, + cornerA, + cornerB, + cornersAll, curveDesigner, curveEditor, decisionNode, @@ -96,22 +102,32 @@ public: distributeSpacingVertical, distributeTop, edit, + eyeDropper, flowAction, flowTransition, fontStyleBold, fontStyleItalic, fontStyleStrikethrough, fontStyleUnderline, + gradient, gridView, idAliasOff, idAliasOn, + keyframe, + linkTriangle, + linked, listView, lockOff, lockOn, mergeCells, minus, + mirror, + paddingEdge, + paddingFrame, + pasteStyle, pin, plus, + promote, redo, rotationFill, rotationOutline, @@ -130,7 +146,9 @@ public: textFullJustification, textNumberedList, tickIcon, + transparent, triState, + unLinked, undo, unpin, upDownIcon,