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>

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 7fc3c9f3f2..a2a73d4edf 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 3d17883c54..808da702d5 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 46a677784a..e548392747 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
diff --git a/src/plugins/qmldesigner/components/componentcore/theme.h b/src/plugins/qmldesigner/components/componentcore/theme.h
index 880a1d05ca..f6a1df97cc 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 d17bf5a10c..bd7d09af31 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,