diff --git a/ukui-qml-style-helper/kystylehelper.h b/ukui-qml-style-helper/kystylehelper.h index 45a39a6..6468dc0 100644 --- a/ukui-qml-style-helper/kystylehelper.h +++ b/ukui-qml-style-helper/kystylehelper.h @@ -36,24 +36,25 @@ class KyStyleHelper : public QQuickItem Q_PROPERTY(QPalette palette READ palette NOTIFY paletteChanged) Q_PROPERTY(QFont font READ font NOTIFY fontChanged) - Q_PROPERTY(QColor buttoncolorrole READ buttoncolor NOTIFY qcolorChanged) - Q_PROPERTY(QColor windowcolorrole READ windowcolor NOTIFY qcolorChanged) - Q_PROPERTY(QColor darkcolorrole READ darkcolor NOTIFY qcolorChanged) Q_PROPERTY(QColor windowtextcolorrole READ windowtextcolor NOTIFY qcolorChanged) - Q_PROPERTY(QColor basecolorrole READ basecolor NOTIFY qcolorChanged) - Q_PROPERTY(QColor textcolorrole READ textcolor NOTIFY qcolorChanged) - Q_PROPERTY(QColor buttontextcolorrole READ buttontextcolor NOTIFY qcolorChanged) - Q_PROPERTY(QColor highlightcolorrole READ highlightcolor NOTIFY qcolorChanged) - Q_PROPERTY(QColor highlightedtextcolorrole READ highlightedtextcolor NOTIFY qcolorChanged) - Q_PROPERTY(QColor tooltipbasecolorrole READ tooltipbasecolor NOTIFY qcolorChanged) - Q_PROPERTY(QColor tooltiptextcolorrole READ tooltiptextcolor NOTIFY qcolorChanged) + Q_PROPERTY(QColor buttoncolorrole READ buttoncolor NOTIFY qcolorChanged) Q_PROPERTY(QColor lightcolorrole READ lightcolor NOTIFY qcolorChanged) Q_PROPERTY(QColor midlightcolorrole READ midlightcolor NOTIFY qcolorChanged) + Q_PROPERTY(QColor darkcolorrole READ darkcolor NOTIFY qcolorChanged) Q_PROPERTY(QColor midcolorrole READ midcolor NOTIFY qcolorChanged) + Q_PROPERTY(QColor textcolorrole READ textcolor NOTIFY qcolorChanged) + Q_PROPERTY(QColor brighttextcolorrole READ brighttextcolor NOTIFY qcolorChanged) + Q_PROPERTY(QColor buttontextcolorrole READ buttontextcolor NOTIFY qcolorChanged) + Q_PROPERTY(QColor basecolorrole READ basecolor NOTIFY qcolorChanged) + Q_PROPERTY(QColor windowcolorrole READ windowcolor NOTIFY qcolorChanged) Q_PROPERTY(QColor shadowcolorrole READ shadowcolor NOTIFY qcolorChanged) - Q_PROPERTY(QColor alternatebasecolorrole READ alternatebasecolor NOTIFY qcolorChanged) + Q_PROPERTY(QColor highlightcolorrole READ highlightcolor NOTIFY qcolorChanged) + Q_PROPERTY(QColor highlightedtextcolorrole READ highlightedtextcolor NOTIFY qcolorChanged) Q_PROPERTY(QColor linkcolorrole READ linkcolor NOTIFY qcolorChanged) Q_PROPERTY(QColor linkvisitedcolorrole READ linkvisitedcolor NOTIFY qcolorChanged) + Q_PROPERTY(QColor alternatebasecolorrole READ alternatebasecolor NOTIFY qcolorChanged) + Q_PROPERTY(QColor tooltipbasecolorrole READ tooltipbasecolor NOTIFY qcolorChanged) + Q_PROPERTY(QColor tooltiptextcolorrole READ tooltiptextcolor NOTIFY qcolorChanged) Q_PROPERTY( QString buttonType READ buttonType WRITE setbuttonType NOTIFY buttonTypeChanged) @@ -80,38 +81,11 @@ public: } /* Get different type of color */ - QColor buttoncolor() { - return qApp->palette().button().color(); - } - QColor windowcolor() { - return qApp->palette().window().color(); - } - QColor darkcolor() { - return qApp->palette().dark().color(); - } QColor windowtextcolor() { return qApp->palette().windowText().color(); } - QColor basecolor() { - return qApp->palette().base().color(); - } - QColor textcolor() { - return qApp->palette().text().color(); - } - QColor buttontextcolor() { - return qApp->palette().buttonText().color(); - } - QColor highlightcolor() { - return qApp->palette().highlight().color(); - } - QColor highlightedtextcolor() { - return qApp->palette().highlightedText().color(); - } - QColor tooltipbasecolor() { - return qApp->palette().toolTipBase().color(); - } - QColor tooltiptextcolor() { - return qApp->palette().toolTipText().color(); + QColor buttoncolor() { + return qApp->palette().button().color(); } QColor lightcolor() { return qApp->palette().light().color(); @@ -119,14 +93,35 @@ public: QColor midlightcolor() { return qApp->palette().midlight().color(); } + QColor darkcolor() { + return qApp->palette().dark().color(); + } QColor midcolor() { return qApp->palette().mid().color(); } + QColor textcolor() { + return qApp->palette().text().color(); + } + QColor brighttextcolor() { + return qApp->palette().brightText().color(); + } + QColor buttontextcolor() { + return qApp->palette().buttonText().color(); + } + QColor basecolor() { + return qApp->palette().base().color(); + } + QColor windowcolor() { + return qApp->palette().window().color(); + } QColor shadowcolor() { return qApp->palette().shadow().color(); } - QColor alternatebasecolor() { - return qApp->palette().alternateBase().color(); + QColor highlightcolor() { + return qApp->palette().highlight().color(); + } + QColor highlightedtextcolor() { + return qApp->palette().highlightedText().color(); } QColor linkcolor() { return qApp->palette().link().color(); @@ -134,6 +129,15 @@ public: QColor linkvisitedcolor() { return qApp->palette().linkVisited().color(); } + QColor alternatebasecolor() { + return qApp->palette().alternateBase().color(); + } + QColor tooltipbasecolor() { + return qApp->palette().toolTipBase().color(); + } + QColor tooltiptextcolor() { + return qApp->palette().toolTipText().color(); + } signals: