QmlDesigner: Extend icon font support

* Use ADS::IconProvider to make use of font icons
* Add support for IconProvider in FloatingWidgetTitlebar
* Add support for named font icon entities in QmlDesigner::Theme
* Add level of indirection to Constants.qml to be able to parse it
  from inside C++
* Add color and HighDPI support in stylehelper
* Update RichTextEditor
* Update icon font and related constants

Task-number: QDS-1913
Change-Id: I7212f4dfe480dbb340fd042f59c69b8f5ca7a8e4
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Constants.qml

@@ -26,98 +26,4 @@
 pragma Singleton
 import QtQuick 2.10
 
-QtObject {
+InternalConstants {}
-    readonly property int width: 1920
-    readonly property int height: 1080
-    readonly property FontLoader mySystemFont: FontLoader {
-        name: "Arial"
-    }
-    readonly property FontLoader controlIcons: FontLoader {
-        source: "icons.ttf"
-    }
-
-    readonly property string actionIcon: "\u0021"
-    readonly property string actionIconBinding: "\u0022"
-    readonly property string addColumnAfter: "\u0023"
-    readonly property string addColumnBefore: "\u0024"
-    readonly property string addFile: "\u0025"
-    readonly property string addRowAfter: "\u0026"
-    readonly property string addRowBefore: "\u0027"
-    readonly property string addTable: "\u0028"
-    readonly property string alignBottom: "\u0029"
-    readonly property string alignCenterHorizontal: "\u002A"
-    readonly property string alignCenterVertical: "\u002B"
-    readonly property string alignLeft: "\u002C"
-    readonly property string alignRight: "\u002D"
-    readonly property string alignTo: "\u002E"
-    readonly property string alignTop: "\u002F"
-    readonly property string anchorBaseline: "\u0030"
-    readonly property string anchorBottom: "\u0031"
-    readonly property string anchorFill: "\u0032"
-    readonly property string anchorLeft: "\u0033"
-    readonly property string anchorRight: "\u0034"
-    readonly property string anchorTop: "\u0035"
-    readonly property string annotationBubble: "\u0036"
-    readonly property string annotationDecal: "\u0037"
-    readonly property string centerHorizontal: "\u0038"
-    readonly property string centerVertical: "\u0039"
-    readonly property string closeCross: "\u003A"
-    readonly property string deleteColumn: "\u003B"
-    readonly property string deleteRow: "\u003C"
-    readonly property string deleteTable: "\u003D"
-    readonly property string distributeBottom: "\u003E"
-    readonly property string distributeCenterHorizontal: "\u003F"
-    readonly property string distributeCenterVertical: "\u0040"
-    readonly property string distributeLeft: "\u0041"
-    readonly property string distributeOriginBottomRight: "\u0042"
-    readonly property string distributeOriginCenter: "\u0043"
-    readonly property string distributeOriginNone: "\u0044"
-    readonly property string distributeOriginTopLeft: "\u0045"
-    readonly property string distributeRight: "\u0046"
-    readonly property string distributeSpacingHorizontal: "\u0047"
-    readonly property string distributeSpacingVertical: "\u0048"
-    readonly property string distributeTop: "\u0049"
-    readonly property string edit: "\u004A"
-    readonly property string fontStyleBold: "\u004B"
-    readonly property string fontStyleItalic: "\u004C"
-    readonly property string fontStyleStrikethrough: "\u004D"
-    readonly property string fontStyleUnderline: "\u004E"
-    readonly property string mergeCells: "\u004F"
-    readonly property string redo: "\u0050"
-    readonly property string splitColumns: "\u0051"
-    readonly property string splitRows: "\u0052"
-    readonly property string testIcon: "\u0053"
-    readonly property string textAlignBottom: "\u0054"
-    readonly property string textAlignCenter: "\u0055"
-    readonly property string textAlignLeft: "\u0056"
-    readonly property string textAlignMiddle: "\u0057"
-    readonly property string textAlignRight: "\u0058"
-    readonly property string textAlignTop: "\u0059"
-    readonly property string textBulletList: "\u005A"
-    readonly property string textFullJustification: "\u005B"
-    readonly property string textNumberedList: "\u005C"
-    readonly property string tickIcon: "\u005D"
-    readonly property string triState: "\u005E"
-    readonly property string undo: "\u005F"
-    readonly property string upDownIcon: "\u0060"
-    readonly property string upDownSquare2: "\u0061"
-
-    readonly property font iconFont: Qt.font({
-                                                 "family": controlIcons.name,
-                                                 "pixelSize": 12
-                                             })
-
-    readonly property font font: Qt.font({
-                                             "family": mySystemFont.name,
-                                             "pointSize": Qt.application.font.pixelSize
-                                         })
-
-    readonly property font largeFont: Qt.font({
-                                                  "family": mySystemFont.name,
-                                                  "pointSize": Qt.application.font.pixelSize * 1.6
-                                              })
-
-    readonly property color backgroundColor: "#c2c2c2"
-
-    readonly property bool showActionIndicatorBackground: false
-}

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml

@@ -0,0 +1,131 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+import QtQuick 2.10
+
+QtObject {
+    readonly property int width: 1920
+    readonly property int height: 1080
+    readonly property FontLoader mySystemFont: FontLoader {
+        name: "Arial"
+    }
+    readonly property FontLoader controlIcons: FontLoader {
+        source: "icons.ttf"
+    }
+
+    objectName: "internalConstantsObject"
+
+    readonly property string actionIcon: "\u0021"
+    readonly property string actionIconBinding: "\u0022"
+    readonly property string addColumnAfter: "\u0023"
+    readonly property string addColumnBefore: "\u0024"
+    readonly property string addFile: "\u0025"
+    readonly property string addRowAfter: "\u0026"
+    readonly property string addRowBefore: "\u0027"
+    readonly property string addTable: "\u0028"
+    readonly property string adsClose: "\u0029"
+    readonly property string adsDetach: "\u002A"
+    readonly property string adsDropDown: "\u002B"
+    readonly property string alignBottom: "\u002C"
+    readonly property string alignCenterHorizontal: "\u002D"
+    readonly property string alignCenterVertical: "\u002E"
+    readonly property string alignLeft: "\u002F"
+    readonly property string alignRight: "\u0030"
+    readonly property string alignTo: "\u0031"
+    readonly property string alignTop: "\u0032"
+    readonly property string anchorBaseline: "\u0033"
+    readonly property string anchorBottom: "\u0034"
+    readonly property string anchorFill: "\u0035"
+    readonly property string anchorLeft: "\u0036"
+    readonly property string anchorRight: "\u0037"
+    readonly property string anchorTop: "\u0038"
+    readonly property string annotationBubble: "\u0039"
+    readonly property string annotationDecal: "\u003A"
+    readonly property string centerHorizontal: "\u003B"
+    readonly property string centerVertical: "\u003C"
+    readonly property string closeCross: "\u003D"
+    readonly property string decisionNode: "\u003E"
+    readonly property string deleteColumn: "\u003F"
+    readonly property string deleteRow: "\u0040"
+    readonly property string deleteTable: "\u0041"
+    readonly property string detach: "\u0042"
+    readonly property string distributeBottom: "\u0043"
+    readonly property string distributeCenterHorizontal: "\u0044"
+    readonly property string distributeCenterVertical: "\u0045"
+    readonly property string distributeLeft: "\u0046"
+    readonly property string distributeOriginBottomRight: "\u0047"
+    readonly property string distributeOriginCenter: "\u0048"
+    readonly property string distributeOriginNone: "\u0049"
+    readonly property string distributeOriginTopLeft: "\u004A"
+    readonly property string distributeRight: "\u004B"
+    readonly property string distributeSpacingHorizontal: "\u004C"
+    readonly property string distributeSpacingVertical: "\u004D"
+    readonly property string distributeTop: "\u004E"
+    readonly property string edit: "\u004F"
+    readonly property string fontStyleBold: "\u0050"
+    readonly property string fontStyleItalic: "\u0051"
+    readonly property string fontStyleStrikethrough: "\u0052"
+    readonly property string fontStyleUnderline: "\u0053"
+    readonly property string mergeCells: "\u0054"
+    readonly property string redo: "\u0055"
+    readonly property string splitColumns: "\u0056"
+    readonly property string splitRows: "\u0057"
+    readonly property string startNode: "\u0058"
+    readonly property string testIcon: "\u0059"
+    readonly property string textAlignBottom: "\u005A"
+    readonly property string textAlignCenter: "\u005B"
+    readonly property string textAlignLeft: "\u005C"
+    readonly property string textAlignMiddle: "\u005D"
+    readonly property string textAlignRight: "\u005E"
+    readonly property string textAlignTop: "\u005F"
+    readonly property string textBulletList: "\u0060"
+    readonly property string textFullJustification: "\u0061"
+    readonly property string textNumberedList: "\u0062"
+    readonly property string tickIcon: "\u0063"
+    readonly property string triState: "\u0064"
+    readonly property string undo: "\u0065"
+    readonly property string upDownIcon: "\u0066"
+    readonly property string upDownSquare2: "\u0067"
+    readonly property string wildcard: "\u0068"
+
+    readonly property font iconFont: Qt.font({
+                                                 "family": controlIcons.name,
+                                                 "pixelSize": 12
+                                             })
+
+    readonly property font font: Qt.font({
+                                             "family": mySystemFont.name,
+                                             "pointSize": Qt.application.font.pixelSize
+                                         })
+
+    readonly property font largeFont: Qt.font({
+                                                  "family": mySystemFont.name,
+                                                  "pointSize": Qt.application.font.pixelSize * 1.6
+                                              })
+
+    readonly property color backgroundColor: "#c2c2c2"
+
+    readonly property bool showActionIndicatorBackground: false
+}

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/qmldir

@@ -1,2 +1,4 @@
 singleton Values 1.0 Values.qml
 singleton Constants 1.0 Constants.qml
+InternalConstants 1.0 InternalConstants.qml
+

src/libs/advanceddockingsystem/ads_globals.h

@@ -107,10 +107,11 @@ enum eDragState {
  * The different icons used in the UI
  */
 enum eIcon {
-    TabCloseIcon,       //!< TabCloseIcon
+    TabCloseIcon,            //!< TabCloseIcon
-    DockAreaMenuIcon,   //!< DockAreaMenuIcon
+    DockAreaMenuIcon,        //!< DockAreaMenuIcon
-    DockAreaUndockIcon, //!< DockAreaUndockIcon
+    DockAreaUndockIcon,      //!< DockAreaUndockIcon
-    DockAreaCloseIcon,  //!< DockAreaCloseIcon
+    DockAreaCloseIcon,       //!< DockAreaCloseIcon
+    FloatingWidgetCloseIcon, //!< FloatingWidgetCloseIcon
 
     IconCount, //!< just a delimiter for range checks
 };

src/libs/advanceddockingsystem/dockareatitlebar.cpp

@@ -132,6 +132,7 @@ namespace ADS
 
     void DockAreaTitleBarPrivate::createButtons()
     {
+        const QSize iconSize(14, 14);
         QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
         // Tabs menu button
         m_tabsMenuButton = new TitleBarButton(testConfigFlag(DockManager::DockAreaHasTabsMenuButton));
@@ -149,6 +150,7 @@ namespace ADS
         m_tabsMenuButton->setMenu(tabsMenu);
         internal::setToolTip(m_tabsMenuButton, QObject::tr("List All Tabs"));
         m_tabsMenuButton->setSizePolicy(sizePolicy);
+        m_tabsMenuButton->setIconSize(iconSize);
         m_layout->addWidget(m_tabsMenuButton, 0);
         QObject::connect(m_tabsMenuButton->menu(),
                          &QMenu::triggered,
@@ -164,6 +166,7 @@ namespace ADS
                                 QStyle::SP_TitleBarNormalButton,
                                 ADS::DockAreaUndockIcon);
         m_undockButton->setSizePolicy(sizePolicy);
+        m_undockButton->setIconSize(iconSize);
         m_layout->addWidget(m_undockButton, 0);
         QObject::connect(m_undockButton,
                          &QToolButton::clicked,
@@ -183,7 +186,7 @@ namespace ADS
             internal::setToolTip(m_closeButton, QObject::tr("Close Group"));
         }
         m_closeButton->setSizePolicy(sizePolicy);
-        m_closeButton->setIconSize(QSize(16, 16));
+        m_closeButton->setIconSize(iconSize);
         m_layout->addWidget(m_closeButton, 0);
         QObject::connect(m_closeButton,
                          &QToolButton::clicked,

src/libs/advanceddockingsystem/dockwidgettab.cpp

@@ -168,12 +168,18 @@ namespace ADS
         m_titleLabel->setText(m_dockWidget->windowTitle());
         m_titleLabel->setObjectName("dockWidgetTabLabel");
         m_titleLabel->setAlignment(Qt::AlignCenter);
-        QObject::connect(m_titleLabel, &ElidingLabel::elidedChanged, q, &DockWidgetTab::elidedChanged);
+        QObject::connect(m_titleLabel,
+                         &ElidingLabel::elidedChanged,
+                         q,
+                         &DockWidgetTab::elidedChanged);
 
         m_closeButton = createCloseButton();
         m_closeButton->setObjectName("tabCloseButton");
-        internal::setButtonIcon(m_closeButton, QStyle::SP_TitleBarCloseButton, TabCloseIcon);
+        internal::setButtonIcon(m_closeButton,
+                                QStyle::SP_TitleBarCloseButton,
+                                TabCloseIcon);
         m_closeButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+        m_closeButton->setIconSize(QSize(14, 14));
         q->onDockWidgetFeaturesChanged();
         internal::setToolTip(m_closeButton, QObject::tr("Close Tab"));
         QObject::connect(m_closeButton,
@@ -189,11 +195,11 @@ namespace ADS
         boxLayout->setContentsMargins(2 * spacing, 0, 0, 0);
         boxLayout->setSpacing(0);
         q->setLayout(boxLayout);
-        boxLayout->addWidget(m_titleLabel, 1);
+        boxLayout->addWidget(m_titleLabel, 1, Qt::AlignVCenter);
         boxLayout->addSpacing(spacing);
-        boxLayout->addWidget(m_closeButton);
+        boxLayout->addWidget(m_closeButton, 0, Qt::AlignVCenter);
         boxLayout->addSpacing(qRound(spacing * 4.0 / 3.0));
-        boxLayout->setAlignment(Qt::AlignCenter);
+        boxLayout->setAlignment(Qt::AlignCenter | Qt::AlignVCenter);
 
         m_titleLabel->setVisible(true);
     }

src/libs/advanceddockingsystem/iconprovider.cpp

@@ -51,7 +51,7 @@ namespace ADS {
          */
         IconProviderPrivate(IconProvider *parent);
     };
-    // struct LedArrayPanelPrivate
+    // struct IconProviderPrivate
 
     IconProviderPrivate::IconProviderPrivate(IconProvider *parent)
         : q(parent)

src/libs/advanceddockingsystem/linux/floatingwidgettitlebar.cpp

@@ -41,7 +41,7 @@
 namespace ADS {
 
 using TabLabelType = ElidingLabel;
-using tCloseButton = QPushButton;
+using CloseButtonType = QPushButton;
 
 /**
  * @brief Private data class of public interface CFloatingWidgetTitleBar
@@ -52,7 +52,7 @@ public:
     FloatingWidgetTitleBar *q; ///< public interface class
     QLabel *m_iconLabel = nullptr;
     TabLabelType *m_titleLabel = nullptr;
-    tCloseButton *m_closeButton = nullptr;
+    CloseButtonType *m_closeButton = nullptr;
     FloatingDockContainer *m_floatingWidget = nullptr;
     eDragState m_dragState = DraggingInactive;
 
@@ -74,22 +74,20 @@ void FloatingWidgetTitleBarPrivate::createLayout()
     m_titleLabel->setObjectName("floatingTitleLabel");
     m_titleLabel->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
 
-    m_closeButton = new tCloseButton();
+    m_closeButton = new CloseButtonType();
     m_closeButton->setObjectName("floatingTitleCloseButton");
     m_closeButton->setFlat(true);
-
+    internal::setButtonIcon(m_closeButton,
-    // The standard icons do does not look good on high DPI screens
+                            QStyle::SP_TitleBarCloseButton,
-    QIcon closeIcon;
+                            ADS::FloatingWidgetCloseIcon);
-    QPixmap normalPixmap = q->style()->standardPixmap(QStyle::SP_TitleBarCloseButton,
-                                                      nullptr,
-                                                      m_closeButton);
-    closeIcon.addPixmap(normalPixmap, QIcon::Normal);
-    closeIcon.addPixmap(internal::createTransparentPixmap(normalPixmap, 0.25), QIcon::Disabled);
-    m_closeButton->setIcon(q->style()->standardIcon(QStyle::SP_TitleBarCloseButton));
     m_closeButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    m_closeButton->setIconSize(QSize(14, 14));
     m_closeButton->setVisible(true);
     m_closeButton->setFocusPolicy(Qt::NoFocus);
-    q->connect(m_closeButton, &QPushButton::clicked, q, &FloatingWidgetTitleBar::closeRequested);
+    QObject::connect(m_closeButton,
+                     &QPushButton::clicked,
+                     q,
+                     &FloatingWidgetTitleBar::closeRequested);
 
     QFontMetrics fontMetrics(m_titleLabel->font());
     int spacing = qRound(fontMetrics.height() / 4.0);

src/libs/utils/stylehelper.cpp

@@ -28,6 +28,8 @@
 #include "theme/theme.h"
 #include "hostosinfo.h"
 
+#include <utils/qtcassert.h>
+
 #include <QPixmapCache>
 #include <QPainter>
 #include <QApplication>
@@ -543,26 +545,35 @@ QLinearGradient StyleHelper::statusBarGradient(const QRect &statusBarRect)
     return grad;
 }
 
-QPixmap StyleHelper::getIconFromIconFont(const QString &fontName, const QString &iconSymbol, int fontSize, int iconSize)
+QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QString &iconSymbol, int fontSize, int iconSize, QColor color)
 {
     QFontDatabase a;
 
-    Q_ASSERT(a.hasFamily(fontName));
+    QTC_ASSERT(a.hasFamily(fontName), {});
 
     if (a.hasFamily(fontName)) {
-        QPixmap icon(iconSize, iconSize);
-        icon.fill(Qt::transparent);
-        QPainter painter(&icon);
-        QFont font(fontName);
-        font.setPixelSize(fontSize);
-        QColor penColor = QApplication::palette("QWidget").color(QPalette::Normal, QPalette::ButtonText);
 
-        painter.save();
+        QIcon icon;
-        painter.setPen(penColor);
+        QSize size(iconSize, iconSize);
-        painter.setFont(font);
-        painter.drawText(QRectF(0, 0, iconSize, iconSize), iconSymbol);
 
-        painter.restore();
+        const int maxDpr = qRound(qApp->devicePixelRatio());
+        for (int dpr = 1; dpr <= maxDpr; dpr++) {
+            QPixmap pixmap(size * dpr);
+            pixmap.setDevicePixelRatio(dpr);
+            pixmap.fill(Qt::transparent);
+
+            QFont font(fontName);
+            font.setPixelSize(fontSize * dpr);
+
+            QPainter painter(&pixmap);
+            painter.save();
+            painter.setPen(color);
+            painter.setFont(font);
+            painter.drawText(QRectF(QPoint(0, 0), size), iconSymbol);
+            painter.restore();
+
+            icon.addPixmap(pixmap);
+        }
 
         return icon;
     }
@@ -570,6 +581,12 @@ QPixmap StyleHelper::getIconFromIconFont(const QString &fontName, const QString
     return {};
 }
 
+QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QString &iconSymbol, int fontSize, int iconSize)
+{
+    QColor penColor = QApplication::palette("QWidget").color(QPalette::Normal, QPalette::ButtonText);
+    return getIconFromIconFont(fontName, iconSymbol, fontSize, iconSize, penColor);
+}
+
 QString StyleHelper::dpiSpecificImageFile(const QString &fileName)
 {
     // See QIcon::addFile()

src/libs/utils/stylehelper.h

@@ -93,7 +93,8 @@ public:
     static void tintImage(QImage &img, const QColor &tintColor);
     static QLinearGradient statusBarGradient(const QRect &statusBarRect);
 
-    static QPixmap getIconFromIconFont(const QString &fontName, const QString &iconSymbol, int fontSize, int iconSize);
+    static QIcon getIconFromIconFont(const QString &fontName, const QString &iconSymbol, int fontSize, int iconSize, QColor color);
+    static QIcon getIconFromIconFont(const QString &fontName, const QString &iconSymbol, int fontSize, int iconSize);
 
     static QString dpiSpecificImageFile(const QString &fileName);
     static QString imageFileWithResolution(const QString &fileName, int dpr);

src/plugins/qmldesigner/components/componentcore/theme.cpp

@@ -28,19 +28,46 @@
 
 #include <qmldesignerplugin.h>
 
+#include <coreplugin/icore.h>
+
 #include <utils/stylehelper.h>
 
 #include <QApplication>
 #include <QRegExp>
 #include <QScreen>
 #include <QPointer>
+#include <QQmlEngine>
+#include <QQmlComponent>
+#include <QQmlProperty>
 #include <qqml.h>
 
+static Q_LOGGING_CATEGORY(themeLog, "qtc.qmldesigner.theme", QtWarningMsg)
+
 namespace QmlDesigner {
 
 Theme::Theme(Utils::Theme *originTheme, QObject *parent)
     : Utils::Theme(originTheme, parent)
+    , m_constants(nullptr)
 {
+    QString constantsPath = Core::ICore::resourcePath() +
+            QStringLiteral("/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml");
+
+    QQmlEngine* engine = new QQmlEngine(this);
+    QQmlComponent component(engine, QUrl::fromLocalFile(constantsPath));
+
+    if (component.status() == QQmlComponent::Ready) {
+        m_constants = component.create();
+    }
+    else if (component.status() == QQmlComponent::Error ) {
+        qCWarning(themeLog) << "Couldn't load" << constantsPath
+                            << "due to the following error(s):";
+        for (QQmlError error : component.errors())
+            qCWarning(themeLog) << error.toString();
+    }
+    else {
+        qCWarning(themeLog) << "Couldn't load" << constantsPath
+                            << "the status of the QQmlComponent is" << component.status();
+    }
 }
 
 QColor Theme::evaluateColorAtThemeInstance(const QString &themeColorName)
@@ -129,6 +156,25 @@ QPixmap Theme::getPixmap(const QString &id)
     return QmlDesignerIconProvider::getPixmap(id);
 }
 
+QString Theme::getIconUnicode(Theme::Icon i)
+{
+    if (!instance()->m_constants)
+        return QString();
+
+    const QMetaObject *m = instance()->metaObject();
+    const char *enumName = "Icon";
+    int enumIndex = m->indexOfEnumerator(enumName);
+
+    if (enumIndex == -1) {
+        qCWarning(themeLog) << "Couldn't find enum" << enumName;
+        return QString();
+    }
+
+    QMetaEnum e = m->enumerator(enumIndex);
+
+    return instance()->m_constants->property(e.valueToKey(i)).toString();
+}
+
 QColor Theme::qmlDesignerBackgroundColorDarker() const
 {
     return getColor(QmlDesigner_BackgroundColorDarker);

src/plugins/qmldesigner/components/componentcore/theme.h

@@ -41,12 +41,91 @@ namespace QmlDesigner {
 class QMLDESIGNERCORE_EXPORT Theme : public Utils::Theme
 {
     Q_OBJECT
+
+    Q_ENUMS(Icon)
+
 public:
+    enum Icon {
+        actionIcon,
+        actionIconBinding,
+        addColumnAfter,
+        addColumnBefore,
+        addFile,
+        addRowAfter,
+        addRowBefore,
+        addTable,
+        adsClose,
+        adsDetach,
+        adsDropDown,
+        alignBottom,
+        alignCenterHorizontal,
+        alignCenterVertical,
+        alignLeft,
+        alignRight,
+        alignTo,
+        alignTop,
+        anchorBaseline,
+        anchorBottom,
+        anchorFill,
+        anchorLeft,
+        anchorRight,
+        anchorTop,
+        annotationBubble,
+        annotationDecal,
+        centerHorizontal,
+        centerVertical,
+        closeCross,
+        decisionNode,
+        deleteColumn,
+        deleteRow,
+        deleteTable,
+        detach,
+        distributeBottom,
+        distributeCenterHorizontal,
+        distributeCenterVertical,
+        distributeLeft,
+        distributeOriginBottomRight,
+        distributeOriginCenter,
+        distributeOriginNone,
+        distributeOriginTopLeft,
+        distributeRight,
+        distributeSpacingHorizontal,
+        distributeSpacingVertical,
+        distributeTop,
+        edit,
+        fontStyleBold,
+        fontStyleItalic,
+        fontStyleStrikethrough,
+        fontStyleUnderline,
+        mergeCells,
+        redo,
+        splitColumns,
+        splitRows,
+        startNode,
+        testIcon,
+        textAlignBottom,
+        textAlignCenter,
+        textAlignLeft,
+        textAlignMiddle,
+        textAlignRight,
+        textAlignTop,
+        textBulletList,
+        textFullJustification,
+        textNumberedList,
+        tickIcon,
+        triState,
+        undo,
+        upDownIcon,
+        upDownSquare2,
+        wildcard
+    };
+
     static Theme *instance();
     static QString replaceCssColors(const QString &input);
     static void setupTheme(QQmlEngine *engine);
     static QColor getColor(Color role);
     static QPixmap getPixmap(const QString &id);
+    static QString getIconUnicode(Theme::Icon i);
 
     Q_INVOKABLE QColor qmlDesignerBackgroundColorDarker() const;
     Q_INVOKABLE QColor qmlDesignerBackgroundColorDarkAlternate() const;
@@ -58,9 +137,12 @@ public:
     Q_INVOKABLE int smallFontPixelSize() const;
     Q_INVOKABLE int captionFontPixelSize() const;
     Q_INVOKABLE bool highPixelDensity() const;
+
 private:
     Theme(Utils::Theme *originTheme, QObject *parent);
     QColor evaluateColorAtThemeInstance(const QString &themeColorName);
+
+    QObject *m_constants;
 };
 
 } // namespace QmlDesigner

src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp

@@ -160,11 +160,11 @@ void RichTextEditor::setTabChangesFocus(bool change)
     ui->textEdit->setTabChangesFocus(change);
 }
 
-QPixmap RichTextEditor::getIcon(const QString &iconName)
+QIcon RichTextEditor::getIcon(Theme::Icon icon)
 {
     const QString fontName = "qtds_propertyIconFont.ttf";
 
-    return Utils::StyleHelper::getIconFromIconFont(fontName, iconName, 36, 36);
+    return Utils::StyleHelper::getIconFromIconFont(fontName, Theme::getIconUnicode(icon), 36, 36);
 }
 
 QString RichTextEditor::richText() const
@@ -276,13 +276,13 @@ void RichTextEditor::tableChanged(const QTextCursor &cursor)
 
 void RichTextEditor::setupEditActions()
 {
-    const QIcon undoIcon(getIcon("\u005F"));
+    const QIcon undoIcon(getIcon(Theme::Icon::undo));
     QAction *actionUndo = ui->toolBar->addAction(undoIcon, tr("&Undo"), ui->textEdit, &QTextEdit::undo);
     actionUndo->setShortcut(QKeySequence::Undo);
     connect(ui->textEdit->document(), &QTextDocument::undoAvailable,
             actionUndo, &QAction::setEnabled);
 
-    const QIcon redoIcon(getIcon("\u0050"));
+    const QIcon redoIcon(getIcon(Theme::Icon::redo));
     QAction *actionRedo = ui->toolBar->addAction(redoIcon, tr("&Redo"), ui->textEdit, &QTextEdit::redo);
     actionRedo->setShortcut(QKeySequence::Redo);
     connect(ui->textEdit->document(), &QTextDocument::redoAvailable,
@@ -296,7 +296,7 @@ void RichTextEditor::setupEditActions()
 
 void RichTextEditor::setupTextActions()
 {
-    const QIcon boldIcon(getIcon("\u004B"));
+    const QIcon boldIcon(getIcon(Theme::Icon::fontStyleBold));
     m_actionTextBold = ui->toolBar->addAction(boldIcon, tr("&Bold"),
                                                      [this](bool checked) {
         QTextCharFormat fmt;
@@ -309,7 +309,7 @@ void RichTextEditor::setupTextActions()
     m_actionTextBold->setFont(bold);
     m_actionTextBold->setCheckable(true);
 
-    const QIcon italicIcon(getIcon("\u004C"));
+    const QIcon italicIcon(getIcon(Theme::Icon::fontStyleItalic));
     m_actionTextItalic = ui->toolBar->addAction(italicIcon, tr("&Italic"),
                                                        [this](bool checked) {
         QTextCharFormat fmt;
@@ -322,7 +322,7 @@ void RichTextEditor::setupTextActions()
     m_actionTextItalic->setFont(italic);
     m_actionTextItalic->setCheckable(true);
 
-    const QIcon underlineIcon(getIcon("\u004E"));
+    const QIcon underlineIcon(getIcon(Theme::Icon::fontStyleUnderline));
     m_actionTextUnderline = ui->toolBar->addAction(underlineIcon, tr("&Underline"),
                                                           [this](bool checked) {
         QTextCharFormat fmt;
@@ -340,7 +340,7 @@ void RichTextEditor::setupTextActions()
 
 void RichTextEditor::setupHyperlinkActions()
 {
-    const QIcon bulletIcon(getIcon("\u0022"));
+    const QIcon bulletIcon(getIcon(Theme::Icon::actionIconBinding));
     m_actionHyperlink = ui->toolBar->addAction(bulletIcon, tr("Hyperlink Settings"), [this]() {
         QTextCursor cursor = ui->textEdit->textCursor();
         QTextCharFormat linkFormat = cursor.charFormat();
@@ -362,25 +362,25 @@ void RichTextEditor::setupHyperlinkActions()
 
 void RichTextEditor::setupAlignActions()
 {
-    const QIcon leftIcon(getIcon("\u0056"));
+    const QIcon leftIcon(getIcon(Theme::Icon::textAlignLeft));
     m_actionAlignLeft = ui->toolBar->addAction(leftIcon, tr("&Left"), [this]() { ui->textEdit->setAlignment(Qt::AlignLeft | Qt::AlignAbsolute); });
     m_actionAlignLeft->setShortcut(Qt::CTRL + Qt::Key_L);
     m_actionAlignLeft->setCheckable(true);
     m_actionAlignLeft->setPriority(QAction::LowPriority);
 
-    const QIcon centerIcon(getIcon("\u0055"));
+    const QIcon centerIcon(getIcon(Theme::Icon::textAlignCenter));
     m_actionAlignCenter = ui->toolBar->addAction(centerIcon, tr("C&enter"), [this]() { ui->textEdit->setAlignment(Qt::AlignHCenter); });
     m_actionAlignCenter->setShortcut(Qt::CTRL + Qt::Key_E);
     m_actionAlignCenter->setCheckable(true);
     m_actionAlignCenter->setPriority(QAction::LowPriority);
 
-    const QIcon rightIcon(getIcon("\u0058"));
+    const QIcon rightIcon(getIcon(Theme::Icon::textAlignRight));
     m_actionAlignRight = ui->toolBar->addAction(rightIcon, tr("&Right"), [this]() { ui->textEdit->setAlignment(Qt::AlignRight | Qt::AlignAbsolute); });
     m_actionAlignRight->setShortcut(Qt::CTRL + Qt::Key_R);
     m_actionAlignRight->setCheckable(true);
     m_actionAlignRight->setPriority(QAction::LowPriority);
 
-    const QIcon fillIcon(getIcon("\u005B"));
+    const QIcon fillIcon(getIcon(Theme::Icon::textFullJustification));
     m_actionAlignJustify = ui->toolBar->addAction(fillIcon, tr("&Justify"), [this]() { ui->textEdit->setAlignment(Qt::AlignJustify); });
     m_actionAlignJustify->setShortcut(Qt::CTRL + Qt::Key_J);
     m_actionAlignJustify->setCheckable(true);
@@ -407,7 +407,7 @@ void RichTextEditor::setupAlignActions()
 
 void RichTextEditor::setupListActions()
 {
-    const QIcon bulletIcon(getIcon("\u005A"));
+    const QIcon bulletIcon(getIcon(Theme::Icon::textBulletList));
     m_actionBulletList = ui->toolBar->addAction(bulletIcon, tr("Bullet List"), [this](bool checked) {
         if (checked) {
             m_actionNumberedList->setChecked(false);
@@ -419,7 +419,7 @@ void RichTextEditor::setupListActions()
     });
     m_actionBulletList->setCheckable(true);
 
-    const QIcon numberedIcon(getIcon("\u005C"));
+    const QIcon numberedIcon(getIcon(Theme::Icon::textNumberedList));
     m_actionNumberedList = ui->toolBar->addAction(numberedIcon, tr("Numbered List"), [this](bool checked) {
         if (checked) {
             m_actionBulletList->setChecked(false);
@@ -493,7 +493,7 @@ void RichTextEditor::setupFontActions()
 
 void RichTextEditor::setupTableActions()
 {
-    const QIcon tableIcon(getIcon("\u0028"));
+    const QIcon tableIcon(getIcon(Theme::Icon::addTable));
     m_actionTableSettings = ui->toolBar->addAction(tableIcon, tr("&Table Settings"), [this](bool checked) {
         ui->tableBar->setVisible(checked);
     });
@@ -503,7 +503,7 @@ void RichTextEditor::setupTableActions()
 
 //table bar:
 
-    const QIcon createTableIcon(getIcon("\u0028"));
+    const QIcon createTableIcon(getIcon(Theme::Icon::addTable));
     m_actionCreateTable = ui->tableBar->addAction(createTableIcon, tr("Create Table"), [this]() {
         QTextCursor cursor = ui->textEdit->textCursor();
         cursorEditBlock(cursor, [&] () {
@@ -512,7 +512,7 @@ void RichTextEditor::setupTableActions()
     });
     m_actionCreateTable->setCheckable(false);
 
-    const QIcon removeTableIcon(getIcon("\u003D"));
+    const QIcon removeTableIcon(getIcon(Theme::Icon::deleteTable));
     m_actionRemoveTable = ui->tableBar->addAction(removeTableIcon, tr("Remove Table"), [this]() {
         QTextCursor cursor = ui->textEdit->textCursor();
         if (QTextTable *currentTable = ui->textEdit->textCursor().currentTable()) {
@@ -525,7 +525,7 @@ void RichTextEditor::setupTableActions()
 
     ui->tableBar->addSeparator();
 
-    const QIcon addRowIcon(getIcon("\u0026")); //addRowAfter
+    const QIcon addRowIcon(getIcon(Theme::Icon::addRowAfter)); //addRowAfter
     m_actionAddRow = ui->tableBar->addAction(addRowIcon, tr("Add Row"), [this]() {
         QTextCursor cursor = ui->textEdit->textCursor();
         if (QTextTable *currentTable = ui->textEdit->textCursor().currentTable()) {
@@ -536,7 +536,7 @@ void RichTextEditor::setupTableActions()
     });
     m_actionAddRow->setCheckable(false);
 
-    const QIcon addColumnIcon(getIcon("\u0023")); //addColumnAfter
+    const QIcon addColumnIcon(getIcon(Theme::Icon::addColumnAfter)); //addColumnAfter
     m_actionAddColumn = ui->tableBar->addAction(addColumnIcon, tr("Add Column"), [this]() {
         QTextCursor cursor = ui->textEdit->textCursor();
         if (QTextTable *currentTable = ui->textEdit->textCursor().currentTable()) {
@@ -547,7 +547,7 @@ void RichTextEditor::setupTableActions()
     });
     m_actionAddColumn->setCheckable(false);
 
-    const QIcon removeRowIcon(getIcon("\u003C"));
+    const QIcon removeRowIcon(getIcon(Theme::Icon::deleteRow));
     m_actionRemoveRow = ui->tableBar->addAction(removeRowIcon, tr("Remove Row"), [this]() {
         QTextCursor cursor = ui->textEdit->textCursor();
         if (QTextTable *currentTable = cursor.currentTable()) {
@@ -571,7 +571,7 @@ void RichTextEditor::setupTableActions()
     });
     m_actionRemoveRow->setCheckable(false);
 
-    const QIcon removeColumnIcon(getIcon("\u003B"));
+    const QIcon removeColumnIcon(getIcon(Theme::Icon::deleteColumn));
     m_actionRemoveColumn = ui->tableBar->addAction(removeColumnIcon, tr("Remove Column"), [this]() {
         QTextCursor cursor = ui->textEdit->textCursor();
         if (QTextTable *currentTable = cursor.currentTable()) {
@@ -595,7 +595,7 @@ void RichTextEditor::setupTableActions()
 
     ui->tableBar->addSeparator();
 
-    const QIcon mergeCellsIcon(getIcon("\u004F"));
+    const QIcon mergeCellsIcon(getIcon(Theme::Icon::mergeCells));
     m_actionMergeCells = ui->tableBar->addAction(mergeCellsIcon, tr("Merge Cells"), [this]() {
         QTextCursor cursor = ui->textEdit->textCursor();
         if (QTextTable *currentTable = cursor.currentTable()) {
@@ -608,7 +608,7 @@ void RichTextEditor::setupTableActions()
     });
     m_actionMergeCells->setCheckable(false);
 
-    const QIcon splitRowIcon(getIcon("\u0052"));
+    const QIcon splitRowIcon(getIcon(Theme::Icon::splitRows));
     m_actionSplitRow = ui->tableBar->addAction(splitRowIcon, tr("Split Row"), [this]() {
         QTextCursor cursor = ui->textEdit->textCursor();
         if (QTextTable *currentTable = cursor.currentTable()) {
@@ -621,7 +621,7 @@ void RichTextEditor::setupTableActions()
     });
     m_actionSplitRow->setCheckable(false);
 
-    const QIcon splitColumnIcon(getIcon("\u0051"));
+    const QIcon splitColumnIcon(getIcon(Theme::Icon::splitColumns));
     m_actionSplitColumn = ui->tableBar->addAction(splitRowIcon, tr("Split Column"), [this]() {
         QTextCursor cursor = ui->textEdit->textCursor();
         if (QTextTable *currentTable = cursor.currentTable()) {

src/plugins/qmldesigner/components/richtexteditor/richtexteditor.h

@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include <theme.h>
+
 #include <QWidget>
 #include <QToolBar>
 #include <QList>
@@ -66,7 +68,7 @@ private slots:
     void cursorPositionChanged();
 
 private:
-    QPixmap getIcon(const QString &iconName);
+    QIcon getIcon(Theme::Icon icon);
     void mergeFormatOnWordOrSelection(const QTextCharFormat &format);
 
     void fontChanged(const QFont &f);

src/plugins/qmldesigner/designmodewidget.cpp

@@ -60,6 +60,7 @@
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
+#include <utils/stylehelper.h>
 
 #include <QSettings>
 #include <QToolBar>
@@ -70,6 +71,7 @@
 
 #include <advanceddockingsystem/dockareawidget.h>
 #include <advanceddockingsystem/docksplitter.h>
+#include <advanceddockingsystem/iconprovider.h>
 
 using Core::MiniSplitter;
 using Core::IEditor;
@@ -243,6 +245,26 @@ void DesignModeWidget::setup()
     QString sheet = QString::fromUtf8(Utils::FileReader::fetchQrc(":/qmldesigner/dockwidgets.css"));
     m_dockManager->setStyleSheet(Theme::replaceCssColors(sheet));
 
+    // Setup icons
+    QColor buttonColor(Theme::getColor(Theme::QmlDesigner_TabLight)); // TODO Use correct color roles
+    QColor tabColor(Theme::getColor(Theme::QmlDesigner_TabDark));
+
+    const QString closeUnicode = Theme::getIconUnicode(Theme::Icon::adsClose);
+    const QString menuUnicode = Theme::getIconUnicode(Theme::Icon::adsDropDown);
+    const QString undockUnicode = Theme::getIconUnicode(Theme::Icon::adsDetach);
+
+    const QString fontName = "qtds_propertyIconFont.ttf";
+    const QIcon tabsCloseIcon = Utils::StyleHelper::getIconFromIconFont(fontName, closeUnicode, 28, 28, tabColor);
+    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);
+
+    m_dockManager->iconProvider().registerCustomIcon(ADS::TabCloseIcon, tabsCloseIcon);
+    m_dockManager->iconProvider().registerCustomIcon(ADS::DockAreaMenuIcon, menuIcon);
+    m_dockManager->iconProvider().registerCustomIcon(ADS::DockAreaUndockIcon, undockIcon);
+    m_dockManager->iconProvider().registerCustomIcon(ADS::DockAreaCloseIcon, closeIcon);
+    m_dockManager->iconProvider().registerCustomIcon(ADS::FloatingWidgetCloseIcon, closeIcon);
+
     // Setup Actions and Menus
     Core::ActionContainer *mwindow = Core::ActionManager::actionContainer(Core::Constants::M_WINDOW);
     // Window > Views

src/plugins/qmldesigner/qmldesignerplugin.cpp

@@ -216,6 +216,11 @@ bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString *e
     if (DesignerSettings::getValue(DesignerSettingsKey::STANDALONE_MODE).toBool())
         GenerateResource::generateMenuEntry();
 
+    QString fontPath = Core::ICore::resourcePath() +
+            QStringLiteral("/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf");
+    if (QFontDatabase::addApplicationFont(fontPath) < 0)
+        qCWarning(qmldesignerLog) << "Could not add font " << fontPath << "to font database";
+
     return true;
 }