aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Gruendl <henning.gruendl@qt.io>2020-10-21 12:12:45 +0200
committerThomas Hartmann <thomas.hartmann@qt.io>2020-10-22 06:46:57 +0000
commit73a26c003949a6bcbc30c7eb61b9f2942d5282e6 (patch)
tree4832616fafda4a7f8f3bbf5f1f1b17dab0ebddc1
parentee735e308eed9706ce126e291950cdbf2a39d841 (diff)
QmlDesigner: Update icon font
* Add pin and unpin icons Change-Id: I42773d3f86f68d9bc638fa27500fb0b1b4e5d35d Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml56
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttfbin15012 -> 15516 bytes
-rw-r--r--src/plugins/qmldesigner/components/componentcore/theme.h2
3 files changed, 31 insertions, 27 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml
index 928b8c4df7..d3fd86ca10 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml
@@ -102,33 +102,35 @@ QtObject {
readonly property string lockOn: "\u005F"
readonly property string mergeCells: "\u0060"
readonly property string minus: "\u0061"
- readonly property string plus: "\u0062"
- readonly property string redo: "\u0063"
- readonly property string splitColumns: "\u0064"
- readonly property string splitRows: "\u0065"
- readonly property string startNode: "\u0066"
- readonly property string testIcon: "\u0067"
- readonly property string textAlignBottom: "\u0068"
- readonly property string textAlignCenter: "\u0069"
- readonly property string textAlignLeft: "\u006A"
- readonly property string textAlignMiddle: "\u006B"
- readonly property string textAlignRight: "\u006C"
- readonly property string textAlignTop: "\u006D"
- readonly property string textBulletList: "\u006E"
- readonly property string textFullJustification: "\u006F"
- readonly property string textNumberedList: "\u0070"
- readonly property string tickIcon: "\u0071"
- readonly property string triState: "\u0072"
- readonly property string undo: "\u0073"
- readonly property string upDownIcon: "\u0074"
- readonly property string upDownSquare2: "\u0075"
- readonly property string visibilityOff: "\u0076"
- readonly property string visibilityOn: "\u0077"
- readonly property string wildcard: "\u0078"
- readonly property string zoomAll: "\u0079"
- readonly property string zoomIn: "\u007A"
- readonly property string zoomOut: "\u007B"
- readonly property string zoomSelection: "\u007C"
+ readonly property string pin: "\u0062"
+ readonly property string plus: "\u0063"
+ readonly property string redo: "\u0064"
+ readonly property string splitColumns: "\u0065"
+ readonly property string splitRows: "\u0066"
+ readonly property string startNode: "\u0067"
+ readonly property string testIcon: "\u0068"
+ readonly property string textAlignBottom: "\u0069"
+ readonly property string textAlignCenter: "\u006A"
+ readonly property string textAlignLeft: "\u006B"
+ readonly property string textAlignMiddle: "\u006C"
+ readonly property string textAlignRight: "\u006D"
+ readonly property string textAlignTop: "\u006E"
+ readonly property string textBulletList: "\u006F"
+ readonly property string textFullJustification: "\u0070"
+ readonly property string textNumberedList: "\u0071"
+ readonly property string tickIcon: "\u0072"
+ readonly property string triState: "\u0073"
+ readonly property string undo: "\u0074"
+ readonly property string unpin: "\u0075"
+ readonly property string upDownIcon: "\u0076"
+ readonly property string upDownSquare2: "\u0077"
+ readonly property string visibilityOff: "\u0078"
+ readonly property string visibilityOn: "\u0079"
+ readonly property string wildcard: "\u007A"
+ readonly property string zoomAll: "\u007B"
+ readonly property string zoomIn: "\u007C"
+ readonly property string zoomOut: "\u007D"
+ readonly property string zoomSelection: "\u007E"
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 b8addaf835..a82278be11 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
Binary files differ
diff --git a/src/plugins/qmldesigner/components/componentcore/theme.h b/src/plugins/qmldesigner/components/componentcore/theme.h
index 513965b18f..2e3ab229d2 100644
--- a/src/plugins/qmldesigner/components/componentcore/theme.h
+++ b/src/plugins/qmldesigner/components/componentcore/theme.h
@@ -111,6 +111,7 @@ public:
lockOn,
mergeCells,
minus,
+ pin,
plus,
redo,
splitColumns,
@@ -129,6 +130,7 @@ public:
tickIcon,
triState,
undo,
+ unpin,
upDownIcon,
upDownSquare2,
visibilityOff,