aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Gruendl <henning.gruendl@qt.io>2020-11-16 10:14:37 +0100
committerHenning Gründl <henning.gruendl@qt.io>2020-11-16 09:30:42 +0000
commitc7b5501c8428e96b71899f175eb96d9119ee6530 (patch)
tree090addaccdfb2708d0347fc6f526099ed2c9fc1a
parent0695738b67eb5c479ff97d57a3b3cd9ce8c235b5 (diff)
QmlDesigner: Update icon font
* Add flow action, flow transition and search Change-Id: I87fc48904b5f1a56aca34f2a66b2aef4657d86bc 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.qml87
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttfbin15660 -> 16112 bytes
-rw-r--r--src/plugins/qmldesigner/components/componentcore/theme.h3
3 files changed, 48 insertions, 42 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml
index bb7f96f787..28f39d89f3 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml
@@ -90,48 +90,51 @@ QtObject {
readonly property string distributeSpacingVertical: "\u0053"
readonly property string distributeTop: "\u0054"
readonly property string edit: "\u0055"
- readonly property string fontStyleBold: "\u0056"
- readonly property string fontStyleItalic: "\u0057"
- readonly property string fontStyleStrikethrough: "\u0058"
- readonly property string fontStyleUnderline: "\u0059"
- readonly property string gridView: "\u005A"
- readonly property string idAliasOff: "\u005B"
- readonly property string idAliasOn: "\u005C"
- readonly property string listView: "\u005D"
- readonly property string lockOff: "\u005E"
- readonly property string lockOn: "\u005F"
- readonly property string mergeCells: "\u0060"
- readonly property string minus: "\u0061"
- readonly property string pin: "\u0062"
- readonly property string plus: "\u0063"
- readonly property string redo: "\u0064"
- readonly property string rotation: "\u0065"
- readonly property string splitColumns: "\u0066"
- readonly property string splitRows: "\u0067"
- readonly property string startNode: "\u0068"
- readonly property string testIcon: "\u0069"
- readonly property string textAlignBottom: "\u006A"
- readonly property string textAlignCenter: "\u006B"
- readonly property string textAlignLeft: "\u006C"
- readonly property string textAlignMiddle: "\u006D"
- readonly property string textAlignRight: "\u006E"
- readonly property string textAlignTop: "\u006F"
- readonly property string textBulletList: "\u0070"
- readonly property string textFullJustification: "\u0071"
- readonly property string textNumberedList: "\u0072"
- readonly property string tickIcon: "\u0073"
- readonly property string triState: "\u0074"
- readonly property string undo: "\u0075"
- readonly property string unpin: "\u0076"
- readonly property string upDownIcon: "\u0077"
- readonly property string upDownSquare2: "\u0078"
- readonly property string visibilityOff: "\u0079"
- readonly property string visibilityOn: "\u007A"
- readonly property string wildcard: "\u007B"
- readonly property string zoomAll: "\u007C"
- readonly property string zoomIn: "\u007D"
- readonly property string zoomOut: "\u007E"
- readonly property string zoomSelection: "\u007F"
+ readonly property string flowAction: "\u0056"
+ readonly property string flowTransition: "\u0057"
+ readonly property string fontStyleBold: "\u0058"
+ readonly property string fontStyleItalic: "\u0059"
+ readonly property string fontStyleStrikethrough: "\u005A"
+ readonly property string fontStyleUnderline: "\u005B"
+ readonly property string gridView: "\u005C"
+ readonly property string idAliasOff: "\u005D"
+ readonly property string idAliasOn: "\u005E"
+ readonly property string listView: "\u005F"
+ readonly property string lockOff: "\u0060"
+ readonly property string lockOn: "\u0061"
+ readonly property string mergeCells: "\u0062"
+ readonly property string minus: "\u0063"
+ readonly property string pin: "\u0064"
+ readonly property string plus: "\u0065"
+ readonly property string redo: "\u0066"
+ readonly property string rotation: "\u0067"
+ readonly property string search: "\u0068"
+ readonly property string splitColumns: "\u0069"
+ readonly property string splitRows: "\u006A"
+ readonly property string startNode: "\u006B"
+ readonly property string testIcon: "\u006C"
+ readonly property string textAlignBottom: "\u006D"
+ readonly property string textAlignCenter: "\u006E"
+ readonly property string textAlignLeft: "\u006F"
+ readonly property string textAlignMiddle: "\u0070"
+ readonly property string textAlignRight: "\u0071"
+ readonly property string textAlignTop: "\u0072"
+ readonly property string textBulletList: "\u0073"
+ readonly property string textFullJustification: "\u0074"
+ readonly property string textNumberedList: "\u0075"
+ readonly property string tickIcon: "\u0076"
+ readonly property string triState: "\u0077"
+ readonly property string undo: "\u0078"
+ readonly property string unpin: "\u0079"
+ readonly property string upDownIcon: "\u007A"
+ readonly property string upDownSquare2: "\u007B"
+ readonly property string visibilityOff: "\u007C"
+ readonly property string visibilityOn: "\u007D"
+ readonly property string wildcard: "\u007E"
+ readonly property string zoomAll: "\u007F"
+ readonly property string zoomIn: "\u0080"
+ readonly property string zoomOut: "\u0081"
+ readonly property string zoomSelection: "\u0082"
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 0c4d237c0e..baa995bb5c 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 b7241fa890..659162d800 100644
--- a/src/plugins/qmldesigner/components/componentcore/theme.h
+++ b/src/plugins/qmldesigner/components/componentcore/theme.h
@@ -99,6 +99,8 @@ public:
distributeSpacingVertical,
distributeTop,
edit,
+ flowAction,
+ flowTransition,
fontStyleBold,
fontStyleItalic,
fontStyleStrikethrough,
@@ -115,6 +117,7 @@ public:
plus,
redo,
rotation,
+ search,
splitColumns,
splitRows,
startNode,