diff options
| author | Henning Gruendl <henning.gruendl@qt.io> | 2020-08-21 10:12:58 +0200 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2020-08-27 10:06:04 +0000 |
| commit | 5a8d4c6fc10c96cfeae42c088aef930dfe494166 (patch) | |
| tree | 0489e0512a83d91458a2d2f76e569cf2d2d49559 /src | |
| parent | f642c02eb651b8146c57f735e03e4db29078abca (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qmldesigner/components/componentcore/theme.h | 4 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/designmodewidget.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
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, |