From 5a8d4c6fc10c96cfeae42c088aef930dfe494166 Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Fri, 21 Aug 2020 10:12:58 +0200
Subject: [PATCH] QmlDesigner: Update icon font

* Update icon font
* Use newly added icons in EditableListView

Change-Id: Ia21c2120c54c41cd00dca07622ced98a0bf7f7f0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../HelperWidgets/EditableListView.qml        |   6 +-
 .../imports/StudioTheme/InternalConstants.qml |  58 ++++++++++--------
 .../imports/StudioTheme/icons.ttf             | Bin 13620 -> 14124 bytes
 .../components/componentcore/theme.h          |   4 ++
 src/plugins/qmldesigner/designmodewidget.cpp  |   2 +-
 5 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml
index 7fc3c9f3f2f..a2a73d4edf7 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml
@@ -188,8 +188,7 @@ Rectangle {
                 onClicked: extFuncLogic.show()
             }
             StudioControls.AbstractButton {
-                buttonIcon: "+"
-                iconFont: StudioTheme.Constants.font
+                buttonIcon: StudioTheme.Constants.plus
                 enabled: !myRepeater.dirty && !(editableListView.backendValue.isInModel && !editableListView.backendValue.isIdList)
                 onClicked: {
                     var idx = myRepeater.localModel.push("") - 1
@@ -200,8 +199,7 @@ Rectangle {
                 }
             }
             StudioControls.AbstractButton {
-                buttonIcon: "-"
-                iconFont: StudioTheme.Constants.font
+                buttonIcon: StudioTheme.Constants.minus
                 enabled: myRepeater.model.length && !(editableListView.backendValue.isInModel && !editableListView.backendValue.isIdList)
                 onClicked: {
                     var lastItem = myColumn.currentIndex === myRepeater.localModel.length - 1
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml
index 3d17883c544..808da702d51 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml
@@ -94,33 +94,37 @@ QtObject {
     readonly property string fontStyleItalic: "\u0057"
     readonly property string fontStyleStrikethrough: "\u0058"
     readonly property string fontStyleUnderline: "\u0059"
-    readonly property string idAliasOff: "\u005A"
-    readonly property string idAliasOn: "\u005B"
-    readonly property string mergeCells: "\u005C"
-    readonly property string redo: "\u005D"
-    readonly property string splitColumns: "\u005E"
-    readonly property string splitRows: "\u005F"
-    readonly property string startNode: "\u0060"
-    readonly property string testIcon: "\u0061"
-    readonly property string textAlignBottom: "\u0062"
-    readonly property string textAlignCenter: "\u0063"
-    readonly property string textAlignLeft: "\u0064"
-    readonly property string textAlignMiddle: "\u0065"
-    readonly property string textAlignRight: "\u0066"
-    readonly property string textAlignTop: "\u0067"
-    readonly property string textBulletList: "\u0068"
-    readonly property string textFullJustification: "\u0069"
-    readonly property string textNumberedList: "\u006A"
-    readonly property string tickIcon: "\u006B"
-    readonly property string triState: "\u006C"
-    readonly property string undo: "\u006D"
-    readonly property string upDownIcon: "\u006E"
-    readonly property string upDownSquare2: "\u006F"
-    readonly property string wildcard: "\u0070"
-    readonly property string zoomAll: "\u0071"
-    readonly property string zoomIn: "\u0072"
-    readonly property string zoomOut: "\u0073"
-    readonly property string zoomSelection: "\u0074"
+    readonly property string gridView: "\u005A"
+    readonly property string idAliasOff: "\u005B"
+    readonly property string idAliasOn: "\u005C"
+    readonly property string listView: "\u005D"
+    readonly property string mergeCells: "\u005E"
+    readonly property string minus: "\u005F"
+    readonly property string plus: "\u0060"
+    readonly property string redo: "\u0061"
+    readonly property string splitColumns: "\u0062"
+    readonly property string splitRows: "\u0063"
+    readonly property string startNode: "\u0064"
+    readonly property string testIcon: "\u0065"
+    readonly property string textAlignBottom: "\u0066"
+    readonly property string textAlignCenter: "\u0067"
+    readonly property string textAlignLeft: "\u0068"
+    readonly property string textAlignMiddle: "\u0069"
+    readonly property string textAlignRight: "\u006A"
+    readonly property string textAlignTop: "\u006B"
+    readonly property string textBulletList: "\u006C"
+    readonly property string textFullJustification: "\u006D"
+    readonly property string textNumberedList: "\u006E"
+    readonly property string tickIcon: "\u006F"
+    readonly property string triState: "\u0070"
+    readonly property string undo: "\u0071"
+    readonly property string upDownIcon: "\u0072"
+    readonly property string upDownSquare2: "\u0073"
+    readonly property string wildcard: "\u0074"
+    readonly property string zoomAll: "\u0075"
+    readonly property string zoomIn: "\u0076"
+    readonly property string zoomOut: "\u0077"
+    readonly property string zoomSelection: "\u0078"
 
     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 46a677784ac73630e3e5156da147872031d01bda..e5483927478ad75e6fc62a213f1d8f42b210acf9 100644
GIT binary patch
delta 1419
zcmdmzwI;8gfsuiMftR6yftew|%`L=t!ru9s3=HN13=9l1{=xc2k*z6f85kHN7#J85
zl5-Oae#mMtGB7YzFfcGWC6|>bFeoxrGB7ajVPIfjNlz>;`2U}QnSsHagMop8BR!`w
zZJmhjX$A(C3I+y^8yTsIDYD5=Vi*`0?l3Sgm}O+7)+ciP`ag+*fl-8kfk7oBx1>T)
zoWq-efpG@|1H-<Y{N%)4%||^L7?=+*Ffi=MO{^$jSjw=7fq~J2fq_9GFEKauaQ)A>
z3=Fyf3=B+{3-XIgHvddq$G~8q!oa}x5bQZd28P+PZ6D(KZN4&aGrwS9U|_hN8qf!!
znF9JIG1{_5GZZp#Om<?76s=%Z_;0}w#jL_`l7RuNpMh!n<PD7KjIEPzFedWaF!V66
zGgva{F}N@|PPSu;WvrMyhpC$-JR&k`vLSQJWCv!p$y=Fa>cg0}FkN7J!JNk2!n}m}
z81oYrHWn|I43;XEeXJ&|6|8&M7}zA(9N040F0m`H7qBm5|G`niv5DgaryQpb=PJ%~
zoS(SFxU9JHxOQ;e;O65t;tt|2;-1ERfro)dj3<F-0?#pC4qh+bRlJ}0xcDsiiul&>
zJ>mPrFTkJ1zeRvaK_Eh4nZO^x2*D*n4niqHHA35jE(yI8b`YK=d{0D5BxiF5iz!Pz
zBSY)|oy@*W4GeM&42)tT?3^HiO-Y@TkxfZm&BUCOQO(56NSu?=%!t{YjqTqFMtyd6
zc2V|!7ylh*6Juj%XLR^?oSjdYozarff?b%Yl3j%D--&<c*@fBJ*ckQy9cE)=7iMR)
z2TAg=|2xiT$qov6W(M*9)yxk!KjFv~$!1}&`CrMrl<6%4I|Dz1ID<R`1A~c~k(daZ
zk_wbY=QF7k&Mz#S|93^<{DOk{jAbaiyCAVbuuS2<I*_`80x-$IusJ}MlTm_=!Seqy
z=G9E+pcbky7&6!~FbGXvt0G>{sHmi7VrHypBql1x#*C9=<rw3LikM#fGmzEPlx4gi
ztHr1#hm*r(0M_{!iDYWjw9?d+mDT)rMi9oj17$Ewj*y#N@51nec@1MB12+SMD%?#X
zY|P1jH9&SU-ICSRdZKBqscEeVPPdN#i<wt2-DHqqU|=*7V;5mlRumLrQ&KY(gz6Rq
zg{-I`bAqfklcwyyTbfpy|89YdVpP+#(qzoh2D#>roTjE6qpGGgrzWEsNb=vU&ClhI
zaqF`&@cnmWzRt|Uz{<eQAjlxjpv7Ruz`$r~EUIj(E@~{QY|CUUsw`>_7GR!yQA<{U
z>9$|bQM;ZVyQ4jR%^4fgC%@H{)KjqQ^|!P0?~Uv6v$ON-v11fU-*90=di1{=I*jT$
zy?(vvwtpQ%r>vVC7B+d^l*v=Hjnz#V6(AXtfrUYmu?xy(We{LI24%A`NHTFxey6Rg
zp2e_*fti7kg_D7W!H6*o%4TIyU|a%avoRPkUf=Ab!^_BS#9+vv%V04%MAw4F$WYf}
za=-4i$tik@jM0<Z^wx1OhB1aSMleQhHqkd`;p9m#%1jB%Of8?BY^<oolapCo0^;cv
tm!<RNrWU2AI;ZC36oa^&xtV#TU=~L~PU+@8<5tGW0;ZDO@Iok{4*+~}Xk7pR

delta 916
zcmZ3Jw<W8dfsuiMftR6yftew|%`L=tf_u(W1_o0J1_lNh|6qNi$ktR|1_s6m1_p+N
z<lMx9`G?OgV_;w^U|?W$N-ir=U{GYLWME+4!oa}5lAc&x@c%ypGXsOE00RR9M|w_W
z+C;-vF9rsd3<d^uos87P6q&c1KxW@zU|=xI$VjbE<ofl05(5LH2m=FyN=9x;g`hmU
zAp-;B4h9B>Z8`bLi4&4%J!4>C2JtuKCRP+MEM-{4z`$t1z`&r8mzbN{X>PxrfkAr;
z0|V2Ag8bqV)t#I97#Q?Y7#P^rfIY{^z>u@PT_v91<|_j?^9u$B28P>O<~b0W$vkHg
zqb+MVLm>mtWGBW*(Gq5b{}v2U%qk2g85qF&8JMLfZ(vks%$<CLF_E>0ft^8bvKvz@
zW69(tOx=?mnQJBoFbhrI%PdoG#WaIy3)2~9FXjy94(3(NCzxNc=&|^)#IY=5m0*ow
zUBLQ;^$(j0n-AMIb{6&!_Ad5290?rLIL>e~aT;*;ac<(g#`%j&jw^_34%Z&8PuybM
zX53-iRoq*+pK$-;ap5W9*~asO*MYZ+cMI<u-d}tYe0h9(___EK_}2-r2qZ`dtP%7O
z%n@u6+$VTT@SBi_&?2E{!b-x^HdnBive+;&<o=(}oWnGaft7)qfkB>;QJ;~K)tr%^
zk+EKY>8_x_UuCAZf`63-1exvz2r%6h5d5nwC<u|*tjJj*!py|bGr31jce1J6jmc-_
zCvASMaEM!xhk@_EJM(pBAqF7^IR+I54F(+sBL*`D8wLjk7X~i|zsY;F6%16BO^r>B
z*_9Dk)L7lrSkzS6)L2wm5h^aO4C1q!8jDVL(3Vr!r^hc};N;Zm=-8?!&#xyhugA|Q
z3FdzVb0_oY$Vo*h@aromC@ARj`#U+c=*i22l*w;$a$=Yqplhsd!YBucMFtiINyc_4
zo0UO;@i3Il#vsYWF?p4)u6hQ;76xVpMix#676v26U?`iFL4k20l+DIq#CT=%KV4o%
zR&xej2J^{6`WDRQy5^Jp^sh};HBev-pX_F^Zu1`lW0uJ_rm|doxv53zsm`f6Ih&hJ
bTNxD@|Nm!Tf~BjQpZ@VcQXwogn&$ujg|pbX

diff --git a/src/plugins/qmldesigner/components/componentcore/theme.h b/src/plugins/qmldesigner/components/componentcore/theme.h
index 880a1d05caa..f6a1df97cc1 100644
--- a/src/plugins/qmldesigner/components/componentcore/theme.h
+++ b/src/plugins/qmldesigner/components/componentcore/theme.h
@@ -103,9 +103,13 @@ public:
         fontStyleItalic,
         fontStyleStrikethrough,
         fontStyleUnderline,
+        gridView,
         idAliasOff,
         idAliasOn,
+        listView,
         mergeCells,
+        minus,
+        plus,
         redo,
         splitColumns,
         splitRows,
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp
index d17bf5a10c8..bd7d09af316 100644
--- a/src/plugins/qmldesigner/designmodewidget.cpp
+++ b/src/plugins/qmldesigner/designmodewidget.cpp
@@ -246,9 +246,9 @@ void DesignModeWidget::setup()
     const QString undockUnicode = Theme::getIconUnicode(Theme::Icon::adsDetach);
 
     const QString fontName = "qtds_propertyIconFont.ttf";
+    const QIcon closeIcon = Utils::StyleHelper::getIconFromIconFont(fontName, closeUnicode, 28, 28, buttonColor);
     const QIcon menuIcon = Utils::StyleHelper::getIconFromIconFont(fontName, menuUnicode, 28, 28, buttonColor);
     const QIcon undockIcon = Utils::StyleHelper::getIconFromIconFont(fontName, undockUnicode, 28, 28, buttonColor);
-    const QIcon closeIcon = Utils::StyleHelper::getIconFromIconFont(fontName, closeUnicode, 28, 28, buttonColor);
 
     auto closeIconNormal = Utils::StyleHelper::IconFontHelper(closeUnicode,
                                                               tabColor,