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>
This commit is contained in:
Henning Gruendl
2020-08-21 10:12:58 +02:00
committed by Thomas Hartmann
parent f642c02eb6
commit 5a8d4c6fc1
5 changed files with 38 additions and 32 deletions

View File

@@ -188,8 +188,7 @@ Rectangle {
onClicked: extFuncLogic.show() onClicked: extFuncLogic.show()
} }
StudioControls.AbstractButton { StudioControls.AbstractButton {
buttonIcon: "+" buttonIcon: StudioTheme.Constants.plus
iconFont: StudioTheme.Constants.font
enabled: !myRepeater.dirty && !(editableListView.backendValue.isInModel && !editableListView.backendValue.isIdList) enabled: !myRepeater.dirty && !(editableListView.backendValue.isInModel && !editableListView.backendValue.isIdList)
onClicked: { onClicked: {
var idx = myRepeater.localModel.push("") - 1 var idx = myRepeater.localModel.push("") - 1
@@ -200,8 +199,7 @@ Rectangle {
} }
} }
StudioControls.AbstractButton { StudioControls.AbstractButton {
buttonIcon: "-" buttonIcon: StudioTheme.Constants.minus
iconFont: StudioTheme.Constants.font
enabled: myRepeater.model.length && !(editableListView.backendValue.isInModel && !editableListView.backendValue.isIdList) enabled: myRepeater.model.length && !(editableListView.backendValue.isInModel && !editableListView.backendValue.isIdList)
onClicked: { onClicked: {
var lastItem = myColumn.currentIndex === myRepeater.localModel.length - 1 var lastItem = myColumn.currentIndex === myRepeater.localModel.length - 1

View File

@@ -94,33 +94,37 @@ QtObject {
readonly property string fontStyleItalic: "\u0057" readonly property string fontStyleItalic: "\u0057"
readonly property string fontStyleStrikethrough: "\u0058" readonly property string fontStyleStrikethrough: "\u0058"
readonly property string fontStyleUnderline: "\u0059" readonly property string fontStyleUnderline: "\u0059"
readonly property string idAliasOff: "\u005A" readonly property string gridView: "\u005A"
readonly property string idAliasOn: "\u005B" readonly property string idAliasOff: "\u005B"
readonly property string mergeCells: "\u005C" readonly property string idAliasOn: "\u005C"
readonly property string redo: "\u005D" readonly property string listView: "\u005D"
readonly property string splitColumns: "\u005E" readonly property string mergeCells: "\u005E"
readonly property string splitRows: "\u005F" readonly property string minus: "\u005F"
readonly property string startNode: "\u0060" readonly property string plus: "\u0060"
readonly property string testIcon: "\u0061" readonly property string redo: "\u0061"
readonly property string textAlignBottom: "\u0062" readonly property string splitColumns: "\u0062"
readonly property string textAlignCenter: "\u0063" readonly property string splitRows: "\u0063"
readonly property string textAlignLeft: "\u0064" readonly property string startNode: "\u0064"
readonly property string textAlignMiddle: "\u0065" readonly property string testIcon: "\u0065"
readonly property string textAlignRight: "\u0066" readonly property string textAlignBottom: "\u0066"
readonly property string textAlignTop: "\u0067" readonly property string textAlignCenter: "\u0067"
readonly property string textBulletList: "\u0068" readonly property string textAlignLeft: "\u0068"
readonly property string textFullJustification: "\u0069" readonly property string textAlignMiddle: "\u0069"
readonly property string textNumberedList: "\u006A" readonly property string textAlignRight: "\u006A"
readonly property string tickIcon: "\u006B" readonly property string textAlignTop: "\u006B"
readonly property string triState: "\u006C" readonly property string textBulletList: "\u006C"
readonly property string undo: "\u006D" readonly property string textFullJustification: "\u006D"
readonly property string upDownIcon: "\u006E" readonly property string textNumberedList: "\u006E"
readonly property string upDownSquare2: "\u006F" readonly property string tickIcon: "\u006F"
readonly property string wildcard: "\u0070" readonly property string triState: "\u0070"
readonly property string zoomAll: "\u0071" readonly property string undo: "\u0071"
readonly property string zoomIn: "\u0072" readonly property string upDownIcon: "\u0072"
readonly property string zoomOut: "\u0073" readonly property string upDownSquare2: "\u0073"
readonly property string zoomSelection: "\u0074" 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({ readonly property font iconFont: Qt.font({
"family": controlIcons.name, "family": controlIcons.name,

View File

@@ -103,9 +103,13 @@ public:
fontStyleItalic, fontStyleItalic,
fontStyleStrikethrough, fontStyleStrikethrough,
fontStyleUnderline, fontStyleUnderline,
gridView,
idAliasOff, idAliasOff,
idAliasOn, idAliasOn,
listView,
mergeCells, mergeCells,
minus,
plus,
redo, redo,
splitColumns, splitColumns,
splitRows, splitRows,

View File

@@ -246,9 +246,9 @@ void DesignModeWidget::setup()
const QString undockUnicode = Theme::getIconUnicode(Theme::Icon::adsDetach); const QString undockUnicode = Theme::getIconUnicode(Theme::Icon::adsDetach);
const QString fontName = "qtds_propertyIconFont.ttf"; 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 menuIcon = Utils::StyleHelper::getIconFromIconFont(fontName, menuUnicode, 28, 28, buttonColor);
const QIcon undockIcon = Utils::StyleHelper::getIconFromIconFont(fontName, undockUnicode, 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, auto closeIconNormal = Utils::StyleHelper::IconFontHelper(closeUnicode,
tabColor, tabColor,