From 9ad735861368cde74fc04f0601521a2f7e20fb16 Mon Sep 17 00:00:00 2001 From: Brook Cronin Date: Tue, 31 Mar 2020 16:08:09 +0200 Subject: [PATCH] add new icon font, update mapping in constants Change-Id: Idbaa82a22ac317fc9089f76fc5de506e3f4bba5c Reviewed-by: Thomas Hartmann --- .../imports/StudioTheme/Constants.qml | 112 ++++++++++-------- .../imports/StudioTheme/icons.ttf | Bin 8108 -> 10568 bytes 2 files changed, 64 insertions(+), 48 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Constants.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Constants.qml index e79b399ede4..200d67c5688 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Constants.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Constants.qml @@ -37,54 +37,70 @@ QtObject { } readonly property string actionIcon: "\u0021" - readonly property string actionIconBinding: "\u0022" - readonly property string addFile: "\u0023" - readonly property string alignBottom: "\u0024" - readonly property string alignCenterHorizontal: "\u0025" - readonly property string alignCenterVertical: "\u0026" - readonly property string alignLeft: "\u0027" - readonly property string alignRight: "\u0028" - readonly property string alignTo: "\u0029" - readonly property string alignTop: "\u002A" - readonly property string anchorBaseline: "\u002B" - readonly property string anchorBottom: "\u002C" - readonly property string anchorFill: "\u002D" - readonly property string anchorLeft: "\u002E" - readonly property string anchorRight: "\u002F" - readonly property string anchorTop: "\u0030" - readonly property string annotationBubble: "\u0031" - readonly property string annotationDecal: "\u0032" - readonly property string centerHorizontal: "\u0033" - readonly property string centerVertical: "\u0034" - readonly property string closeCross: "\u0035" - readonly property string distributeBottom: "\u0036" - readonly property string distributeCenterHorizontal: "\u0037" - readonly property string distributeCenterVertical: "\u0038" - readonly property string distributeLeft: "\u0039" - readonly property string distributeOriginBottomRight: "\u003A" - readonly property string distributeOriginCenter: "\u003B" - readonly property string distributeOriginNone: "\u003C" - readonly property string distributeOriginTopLeft: "\u003D" - readonly property string distributeRight: "\u003E" - readonly property string distributeSpacingHorizontal: "\u003F" - readonly property string distributeSpacingVertical: "\u0040" - readonly property string distributeTop: "\u0041" - readonly property string edit: "\u0042" - readonly property string fontStyleBold: "\u0043" - readonly property string fontStyleItalic: "\u0044" - readonly property string fontStyleStrikethrough: "\u0045" - readonly property string fontStyleUnderline: "\u0046" - readonly property string testIcon: "\u0047" - readonly property string textAlignBottom: "\u0048" - readonly property string textAlignCenter: "\u0049" - readonly property string textAlignLeft: "\u004A" - readonly property string textAlignMiddle: "\u004B" - readonly property string textAlignRight: "\u004C" - readonly property string textAlignTop: "\u004D" - readonly property string tickIcon: "\u004E" - readonly property string triState: "\u004F" - readonly property string upDownIcon: "\u0050" - readonly property string upDownSquare2: "\u0051" + readonly property string actionIconBinding: "\u0022" + readonly property string addColumnAfter: "\u0023" + readonly property string addColumnBefore: "\u0024" + readonly property string addFile: "\u0025" + readonly property string addRowAfter: "\u0026" + readonly property string addRowBefore: "\u0027" + readonly property string addTable: "\u0028" + readonly property string alignBottom: "\u0029" + readonly property string alignCenterHorizontal: "\u002A" + readonly property string alignCenterVertical: "\u002B" + readonly property string alignLeft: "\u002C" + readonly property string alignRight: "\u002D" + readonly property string alignTo: "\u002E" + readonly property string alignTop: "\u002F" + readonly property string anchorBaseline: "\u0030" + readonly property string anchorBottom: "\u0031" + readonly property string anchorFill: "\u0032" + readonly property string anchorLeft: "\u0033" + readonly property string anchorRight: "\u0034" + readonly property string anchorTop: "\u0035" + readonly property string annotationBubble: "\u0036" + readonly property string annotationDecal: "\u0037" + readonly property string centerHorizontal: "\u0038" + readonly property string centerVertical: "\u0039" + readonly property string closeCross: "\u003A" + readonly property string deleteColumn: "\u003B" + readonly property string deleteRow: "\u003C" + readonly property string deleteTable: "\u003D" + readonly property string distributeBottom: "\u003E" + readonly property string distributeCenterHorizontal: "\u003F" + readonly property string distributeCenterVertical: "\u0040" + readonly property string distributeLeft: "\u0041" + readonly property string distributeOriginBottomRight: "\u0042" + readonly property string distributeOriginCenter: "\u0043" + readonly property string distributeOriginNone: "\u0044" + readonly property string distributeOriginTopLeft: "\u0045" + readonly property string distributeRight: "\u0046" + readonly property string distributeSpacingHorizontal: "\u0047" + readonly property string distributeSpacingVertical: "\u0048" + readonly property string distributeTop: "\u0049" + readonly property string edit: "\u004A" + readonly property string fontStyleBold: "\u004B" + readonly property string fontStyleItalic: "\u004C" + readonly property string fontStyleStrikethrough: "\u004D" + readonly property string fontStyleUnderline: "\u004E" + readonly property string mergeCells: "\u004F" + readonly property string redo: "\u0050" + readonly property string splitColumns: "\u0051" + readonly property string splitRows: "\u0052" + readonly property string testIcon: "\u0053" + readonly property string textAlignBottom: "\u0054" + readonly property string textAlignCenter: "\u0055" + readonly property string textAlignLeft: "\u0056" + readonly property string textAlignMiddle: "\u0057" + readonly property string textAlignRight: "\u0058" + readonly property string textAlignTop: "\u0059" + readonly property string textBulletList: "\u005A" + readonly property string textFullJustification: "\u005B" + readonly property string textNumberedList: "\u005C" + readonly property string tickIcon: "\u005D" + readonly property string triState: "\u005E" + readonly property string undo: "\u005F" + readonly property string upDownIcon: "\u0060" + readonly property string upDownSquare2: "\u0061" 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 28840afacf6125fa88d39e1a92bcd44dead001d8..d65b065195211fbf5da4488b6063bf24c82e3ef8 100644 GIT binary patch delta 3264 zcmZ2ueY-z8F$fk9J;fq_BBKUm)=vNeT)fq^lCfq@|* zIXAID$^qk5x zsr2-h3=AwX3=A?SGEx&$q+iX8VPIgm!@$5`mXVQKpUCy=|0D(mMiB-E29=E5k_y4a z%-b0l7{`2_<51H-KqYx^KH z)7rjCjJC`!40)3s7^AHdnHBz9Fhnt{Fq{PW8l;9vky!y`7Xu^n3kF4y2*?Z&W?*5^ zW6)z@29tV|&oHX8g7|uqKQJmQ>M@vt#Tghl7}OZlz$6EQJA*odCj&o&JcIUR6()Vg z#K|E{83HDzX66=_R@OGQcJ>aAPR^4LGA*2(%Pdf@!5GK5g7FTM5R(;C1XBgmET$by zx0vOaZJ7O-C$Vs__^?c1xx(^?RfV;P^$_b1Ha)f!wn=Q;*lw}?V^?AiV_(32fc+bX z6o(Z@6h|G$4vrTb|2RE3D>x5u{^By>%Hitbdcdv6UBi8eM}en|=Mt|R?>63Byr1}V z_&oSh7#KF+VP48u&%vPge=74Xrp*k@4Ezi-42lfu47v=)43-QG!lsI%tcu3AOv;MN zvP_J|rh=v*7Nel3v8tk=sUoAXpf;nRu(GH%qba+nu`Q#rsz|XVS#QB|iN<%VZ3S5~yR@8MqmQ8RQulgcW5O1r-HN#RU}w zK@4L-V?jnyWl?2QWm98QV^MwPu0Lh^jBSj|{&lX=|2NZL&(BYfY4d8vzx_;wjQSFP z-!O?lvGCuwjGFrX{`!7?3=EU&S*O*r!UG3nA3v&%tfq>hnvAB3f{KEQtfIznJHa+G zNB`^m=grvmuZmgc&lSe4et!CXesF8w?A^Qf?;DV1AlLXaAnXD8N}NF&Ji2xQ@42A3=hw2qab6sM^$| z+QhJV0`FPYdUkkp@G^)pNHWMWC^D!rXfiOUva6emvm1j5b#rByuf#%E%mP%!SoE2=1XT?K4AmTTRmBB4>RA~p6}L06!9#(SftNv;L4-kuL4kq699*o3 zi)u33GHNoif_bd4pa7*;Hwg(3#x%zIe~tfUG5wK{_{a8dKFIf=h&U%ME+GNM=5QZF zA_9~Vz;VJrK*C)rrM06=Ei~`N>CWgQ$@;vj9i%Qfh zE2){7Su+}miLf!4n1LuIHZ+>K zPn2-cVsK%|Wnch@g|Z?jT#S*}^~S=W(9vcDOE9ymn;VNN3yUh7nwy!MnVP7pDJ!un zo0=ILiHfkZ@iU6cF^P+Tn954(%I0FmMy4ie+Ki^gMrNiaAeHK7#zr6o%w>wY`ihVM zX6#VV(^G&1@Kq2K9KJWDxi!V5H0lGT1)14c+1P|RS^34)+1dHTR2bQr8JRhGL5U;=K5F)%PPNHR1**-Q-V3~QilW(HG61t^<^L6Wfx%4TH{U_1t8 zvoT0AaWgP8FtTtmFfbT_i(U|$k-><;4=T>Yz{fBL%4TNBV%P#=E3j}furL@ghJiRN zoD8fC3XDsjY&HfX#_N;WBsEo%7>XG38S)vj85o@N3o45;(=$pGG?FzHj0}tnbQF?` z^7FGNf0PQCyhE~p-I&1;)CQWYFJ-}LY^ZCj3sMA@Js{OM*+E*7(PeUybcO<>F{25i zDWe&qIim%mC8HIiHKPrqEu$TyJ);AoBcs#gQ_`x@LWwCU&iOf|xp|IhC8Rw8p-kfsuiMftR6yftew|%`L>Y&pGN71B3ho1_lNh|6qNi$oj%942n#Z3=GUU3=9k`>50V!|Nk>EGcd?^FfcH1q~}zo zMef}EiGhLn4g-ToO-5>BigaOx1p@=a9R>ylvy6t-jSW&=G$I!&Uzz8x#AulmEHLF+sB?E&* z1Oo%pi-P>(lF0czj~E!F9T*r`+`yh=WMG*4`}&J`ew(ih+{`Z+7#J9CpRRK^zuN237_I#+^_$8-o$!o5_^z1{hCBua=lp`o zqRjM+5(SN9O$8$ZBLf`;r=tA)Yz60{{JhM($@dixup2U%Fz7NEOqRC6&Ot>-%`$)oTQ@4#+{gw;+DDjk%}GTW`DJrjFaUx>L)+YkebY_ csiMrl!1(_^0~0J6+{{+}35t9~(vhkG08D