From c7b5501c8428e96b71899f175eb96d9119ee6530 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Mon, 16 Nov 2020 10:14:37 +0100 Subject: [PATCH] QmlDesigner: Update icon font * Add flow action, flow transition and search Change-Id: I87fc48904b5f1a56aca34f2a66b2aef4657d86bc Reviewed-by: Brook Cronin Reviewed-by: Thomas Hartmann --- .../imports/StudioTheme/InternalConstants.qml | 87 +++++++++--------- .../imports/StudioTheme/icons.ttf | Bin 15660 -> 16112 bytes .../components/componentcore/theme.h | 3 + 3 files changed, 48 insertions(+), 42 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml index bb7f96f787c..28f39d89f31 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml @@ -90,48 +90,51 @@ QtObject { readonly property string distributeSpacingVertical: "\u0053" readonly property string distributeTop: "\u0054" readonly property string edit: "\u0055" - readonly property string fontStyleBold: "\u0056" - readonly property string fontStyleItalic: "\u0057" - readonly property string fontStyleStrikethrough: "\u0058" - readonly property string fontStyleUnderline: "\u0059" - readonly property string gridView: "\u005A" - readonly property string idAliasOff: "\u005B" - readonly property string idAliasOn: "\u005C" - readonly property string listView: "\u005D" - readonly property string lockOff: "\u005E" - readonly property string lockOn: "\u005F" - readonly property string mergeCells: "\u0060" - readonly property string minus: "\u0061" - readonly property string pin: "\u0062" - readonly property string plus: "\u0063" - readonly property string redo: "\u0064" - readonly property string rotation: "\u0065" - readonly property string splitColumns: "\u0066" - readonly property string splitRows: "\u0067" - readonly property string startNode: "\u0068" - readonly property string testIcon: "\u0069" - readonly property string textAlignBottom: "\u006A" - readonly property string textAlignCenter: "\u006B" - readonly property string textAlignLeft: "\u006C" - readonly property string textAlignMiddle: "\u006D" - readonly property string textAlignRight: "\u006E" - readonly property string textAlignTop: "\u006F" - readonly property string textBulletList: "\u0070" - readonly property string textFullJustification: "\u0071" - readonly property string textNumberedList: "\u0072" - readonly property string tickIcon: "\u0073" - readonly property string triState: "\u0074" - readonly property string undo: "\u0075" - readonly property string unpin: "\u0076" - readonly property string upDownIcon: "\u0077" - readonly property string upDownSquare2: "\u0078" - readonly property string visibilityOff: "\u0079" - readonly property string visibilityOn: "\u007A" - readonly property string wildcard: "\u007B" - readonly property string zoomAll: "\u007C" - readonly property string zoomIn: "\u007D" - readonly property string zoomOut: "\u007E" - readonly property string zoomSelection: "\u007F" + readonly property string flowAction: "\u0056" + readonly property string flowTransition: "\u0057" + readonly property string fontStyleBold: "\u0058" + readonly property string fontStyleItalic: "\u0059" + readonly property string fontStyleStrikethrough: "\u005A" + readonly property string fontStyleUnderline: "\u005B" + readonly property string gridView: "\u005C" + readonly property string idAliasOff: "\u005D" + readonly property string idAliasOn: "\u005E" + readonly property string listView: "\u005F" + readonly property string lockOff: "\u0060" + readonly property string lockOn: "\u0061" + readonly property string mergeCells: "\u0062" + readonly property string minus: "\u0063" + readonly property string pin: "\u0064" + readonly property string plus: "\u0065" + readonly property string redo: "\u0066" + readonly property string rotation: "\u0067" + readonly property string search: "\u0068" + readonly property string splitColumns: "\u0069" + readonly property string splitRows: "\u006A" + readonly property string startNode: "\u006B" + readonly property string testIcon: "\u006C" + readonly property string textAlignBottom: "\u006D" + readonly property string textAlignCenter: "\u006E" + readonly property string textAlignLeft: "\u006F" + readonly property string textAlignMiddle: "\u0070" + readonly property string textAlignRight: "\u0071" + readonly property string textAlignTop: "\u0072" + readonly property string textBulletList: "\u0073" + readonly property string textFullJustification: "\u0074" + readonly property string textNumberedList: "\u0075" + readonly property string tickIcon: "\u0076" + readonly property string triState: "\u0077" + readonly property string undo: "\u0078" + readonly property string unpin: "\u0079" + readonly property string upDownIcon: "\u007A" + readonly property string upDownSquare2: "\u007B" + readonly property string visibilityOff: "\u007C" + readonly property string visibilityOn: "\u007D" + readonly property string wildcard: "\u007E" + readonly property string zoomAll: "\u007F" + readonly property string zoomIn: "\u0080" + readonly property string zoomOut: "\u0081" + readonly property string zoomSelection: "\u0082" 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 0c4d237c0e2df47eed767b977dea24d02a37dd59..baa995bb5c53ea7799f84cbec5c7e332d32bd56e 100644 GIT binary patch delta 1040 zcmZ2e^`W+&fsuiMftR6yftew|%`L=t;-dSV3=DQx7#J92{Dbw4B3o0X7#J8M7#J85 zl5-Oaw%l$z%D}+X!@$7klw4M#z@W%f$-uyTfq{X6B|WjY;QxOHW(EekGYkw29O*fg zX(m%uXEHFbEMQ>Jzmbuem?Gz?vWJ0z;SK`>gIPvKYJDQtum6)67#Kwu7#LJCa!V=% zr*S@KU|`(Az`$@RCqFq+XNAQQ1_ox3gU;k8RunL-XIR9*z-Yn1z@U(qn44O#uksTE zgGmJg1JkvF{NfUi=l_l}Fqj80FtAsHJ;%tvuso#KHJ;z*D+4$43kC)ThTGRa?1Ruu zANEaRv}H`4Y{wWY+Qh8z--02ES%u*w0|Qtu1GCiR4UCPu>;~#;&I}$#NTY5 z!m?1jo{@p=e<<@qW@ZLq1_o9|Qxh|LMmt6|bv1oPJw{tbMMlQE|1@>f{T$ty)Rk@g z)O8rIGcm8y((x15S8JN=Xsx0z?x&;vPYdK*76!imLCm+9*%`zclo(7I92poGxnPRKw=O<1TvT=#K!6a?2A|G6MsHi5(-zu_Am-%1UZXB65tzMs`f5 zCVGrYY>eWJ`izW>5}{MpO$jv$D|ZZ^G9`UOhF@QrZTf}_8~!~LW3(0%`*(!VX5Ey~ z&?(`L<)Ox5j6oMRq}!(T`DJWKPye%7oY6*143wA{7}yx}Hs4To=T|plRDvW71{MZM z#$G6!l|g{I~8V5-QNI{A_55jMs|#w5n%&CASg zGt2R%<>Z$;CYNO9=jj!fr3-<$Aw`LK#hDR6N{2FHYZ!J06F{re+DL4 Ry1x189}g%^AacToeE=NA3&j8c delta 572 zcmexRyQZq1fsuiMftR6yftew|%`L=t;)K$x3=Fmc3=9l1{=xc2k*%o`3=E7B3=9kj z$+?LITW+@GdcOmiDDdFe;62;&oD4B9Lr6tC}3E_u!wytYVD|ufj*)>uHOpgaJipCX25#mT3=9kmx6kc<0->39 zKbgd6%a}CTjxkoWo>}3)1w$0G3d2bT2C!ZRX6eZr7#k;>GAT?BXEK}I&!oXvzj+5! zA7dB~1CJO_0?!1VW4s)^Uc9S#Kk(V`weZd1d&MuoAH=_a|CWG|fP#RXz!ZT;f(C+Z zf>(sJgxZ8I3Fiq<5?&?zM5IAvj>ryC8_{)Q3}R7Y^Tck6>o72EUcj` zs$Tr+ri=;@hcK`(NHTUo*{lo#jK`pCHU>#1?#Y)-bk(yMwlFX=FtTtmurL@ghC$h^ z3<``(plmhKYpA8W|WFO#W{cF!`KW)8s&N1;(VwMdn8~ c+gRLYo@{CJY_pc_62{5r?Zmj@p|<-80DKOR)&Kwi diff --git a/src/plugins/qmldesigner/components/componentcore/theme.h b/src/plugins/qmldesigner/components/componentcore/theme.h index b7241fa8905..659162d8005 100644 --- a/src/plugins/qmldesigner/components/componentcore/theme.h +++ b/src/plugins/qmldesigner/components/componentcore/theme.h @@ -99,6 +99,8 @@ public: distributeSpacingVertical, distributeTop, edit, + flowAction, + flowTransition, fontStyleBold, fontStyleItalic, fontStyleStrikethrough, @@ -115,6 +117,7 @@ public: plus, redo, rotation, + search, splitColumns, splitRows, startNode,