From 905db66355c82c8b7e2e8fe1c7300f52fcd37787 Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Fri, 14 Feb 2020 13:49:00 +0100
Subject: [PATCH] QmlDesigner: Add new icon font

 - Set unique family name to avoid clash
 - Add new icons

Task-number: QDS-1578
Change-Id: Ic526d2e015a6372d61241bcf1568cced119ab87a
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../imports/StudioTheme/Constants.qml         |  65 +++++++++---------
 .../imports/StudioTheme/icons.ttf             | Bin 7576 -> 8108 bytes
 2 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Constants.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Constants.qml
index 421dabf7577..e79b399ede4 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Constants.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Constants.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
@@ -52,36 +52,39 @@ QtObject {
     readonly property string anchorLeft: "\u002E"
     readonly property string anchorRight: "\u002F"
     readonly property string anchorTop: "\u0030"
-    readonly property string centerHorizontal: "\u0031"
-    readonly property string centerVertical: "\u0032"
-    readonly property string closeCross: "\u0033"
-    readonly property string distributeBottom: "\u0034"
-    readonly property string distributeCenterHorizontal: "\u0035"
-    readonly property string distributeCenterVertical: "\u0036"
-    readonly property string distributeLeft: "\u0037"
-    readonly property string distributeOriginBottomRight: "\u0038"
-    readonly property string distributeOriginCenter: "\u0039"
-    readonly property string distributeOriginNone: "\u003A"
-    readonly property string distributeOriginTopLeft: "\u003B"
-    readonly property string distributeRight: "\u003C"
-    readonly property string distributeSpacingHorizontal: "\u003D"
-    readonly property string distributeSpacingVertical: "\u003E"
-    readonly property string distributeTop: "\u003F"
-    readonly property string fontStyleBold: "\u0040"
-    readonly property string fontStyleItalic: "\u0041"
-    readonly property string fontStyleStrikethrough: "\u0042"
-    readonly property string fontStyleUnderline: "\u0043"
-    readonly property string testIcon: "\u0044"
-    readonly property string textAlignBottom: "\u0045"
-    readonly property string textAlignCenter: "\u0046"
-    readonly property string textAlignLeft: "\u0047"
-    readonly property string textAlignMiddle: "\u0048"
-    readonly property string textAlignRight: "\u0049"
-    readonly property string textAlignTop: "\u004A"
-    readonly property string tickIcon: "\u004B"
-    readonly property string triState: "\u004C"
-    readonly property string upDownIcon: "\u004D"
-    readonly property string upDownSquare2: "\u004E"
+    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 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 289326b3a52d49393a60b9b594a8de04ef9d586c..28840afacf6125fa88d39e1a92bcd44dead001d8 100644
GIT binary patch
delta 1319
zcmbPXy~e(tfsuiMftR6yftew|%`L>Y&pGN71B3ho1_lNh|6qNi$oj<d3=E7B3=9kj
z$+?LImLZ|h3=B*f3=E7;$z>%942n#Z3=GUU3=9k`>50V!|Nk>EGcd?^FfcH1q~}zo
zMef}EiGhLn4g-ToO-5>BigaOx1p@=a9R>ylvy6<?`b4f@|0gjpFp4lRFsNkYmQ?Va
zX0BskVBEpLz)+BrpPbm1)o8-Nz+Aw<z>t-jSW&=G$I!&Uzz8x#AulmEHLF+sB?E&*
z1Oo%pi-P>(lF0czj~E!F9T*r`+`yh=WMG*4`}&J`ew(ih+{`Z+7#J9C<w(^)XeOze
zNsP9PCX?+LV;KV{&tddtmS^yr{EShaQG7BBlj3A`CJn~G$pK8M%!WqBlMgbjn0$eW
zb8;rLwhQw;7B-d;mL)8=SpKmpvAVHlvCd<C!N$R6$Ckv_#I}g-7&`;I0lORf1oi{$
z_c%;Anm8_Ss&STZp5lDR#m1$?Wyip<`2uq;dp#qA{Qr~8Cz&=gNH8!6o0u6Z8i}zB
zim)jwDzUS&so64`s41zL%8Lsy#|VfqiV6PH<>mVKO;|@vQJkqqKwMnlpOt_(`$0Z&
zi3UM22|)&C20um~<`^b726hI125|-kMnxqPV?`qoRy3N~=dX}}fIQPX{(sj0P6!Av
zS_m*|{_PhKU@GKiQj?eORZ!@Wm)~s7-NahY#325^n)x8pO$J#8Wd;UDQ$-~<Q9%(g
zV?`q~TSje0QLuZ}Oa(#i7guMLXJlkn`@1`&tSp3aV{n<cM3lone~0L32PW4N^}k2d
z)tPLV4vLor|1$$A`TQ9q#dyjg$`&N4#$*GEA7+Mi{{xw0m{}S4HlGmaW~-NEm=2Cp
z1_mYuc7}scHZy}MqbZcl!XU{wAIfHB5MaCwWwS9zGAS@HGcdAnGB7YWFfc&bj0{E$
z$xt>E10TaiD4Urfi{T`c&B9>Bm<?i!uy8W4GAJ<a1aVk68Q2(%7~f2OCa%bA#9%O)
zOF}Qo$UsNIsVF}`Tfw;~KQA+nfuWG0gdv5Ym?55_fT4&XpP_&um7$2CgrSnblOdTQ
zpCOOI4NR6W=rNQqlrW?*Fcg-g6vr17<rkzDl~j5r=jXZQ=ao!OlCY~M-7p0PD+UDy
zLk1HDT?QjCHefJfFkoN+ndz2al%A?!q-UUDrBH~?QoWLrGzBXKLla#iT_Xb{Zv!g&
zhgZ_lhjjm74;+v?CnrlPF`7(nlT2b`G+;DjG}`<^l8aF#F)uH_B(WqjKhLQ&DJdsa
muedB-7$NAAnw*%k`K?qjBP&O0N@mIC7#Rab9z+2lRRaLh6f#l(

delta 792
zcmZ2uKf}77fsuiMftR6yftew|%`L>YmrIp}fkC#0fq_BBKUm)=vOe()0|R3O0|P@s
za&BUQrLwXr0|S!^0|TQ|a#@K2gCbKU0|Rpg0|Ns~dSY?G|Njik3=Fa*3=9k$={c2Y
zn$r$<F)%P+U|<l=$Vg30k+N{|Vqjpn!@$5`mXVQKpUCy=|0D(mMiB-E29=E5k_tY4
z=4}iNj5`<@7_xHmlM{;@DoPj_m~$8y7*cW*D+(B@8JZXv7%dnW7!>jnb5rv_`K@JO
z5Vv4pVA3wgFD}uPGEZP&kW67<VBrIMj*)?(Q95UTJipCX25#mT3=9kmH_z9%LTIM?
z)=7-EjE0l#7-JdzCeLB?p8T3oZZbEM!emV*Ek?h|Axx>04>GNpe1VB$axSyB4GRlP
z2ul~sI+jZ;-&mzs{a9zP?qGe#Cd6jM7Q|M@wv25LI~%(hdkFg~_8%N>9CJ8caXN6O
zaMp0n;M}tL4s$O1=9k<Jtefu&PGhU*WGDx_kb!}Tft_I@l+Dbb#_$}<W?|rDRD!Zu
z83Y*pplmh<PR3#eW(GzUP6h@B2L=Wxn~_0?AsNbMV&G$FgtD0#d>Cdz*(?k~jC>%r
z2n#0zD}w@~4v53T$-u@S#27!BO;VBBkil}YmZYARp{0(3Q&E0?wt{m}eqLrC14AZ5
zGDAK?9z!vM9zzL32}2qKLuPV*Uh(8jl6Li&k_rq~3<?Z}3>FN!42BE_47v<P3<eB_
z43-QGZuxm7Zuv#&sR~AV1`1XRU}N-3O41ap6bvnN4GnaS3=A!C+Xzz1z!1ie%232m
z%#g{D&oKFnl)5aY8z2q@E1zsHt;A?JIY~Nc^C@XA#?60a@)$Rl$muZhAW}qqD*)Gl
Bs3-sc