kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-04 08:58:20 +03:00
Code Issues Projects Releases Wiki Activity

expose all latte colors to applets

Browse Source
This commit is contained in:
Michail Vourlakos 2018-11-17 18:12:42 +02:00
parent 954dac650f
commit a6a291d2c5
3 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/schemecolors.cpp
View File

@ -88,19 +88,19 @@ QColor SchemeColors::highlightedTextColor() const
return m_highlightedTextColor;
}
QColor SchemeColors::positiveText() const
QColor SchemeColors::positiveTextColor() const
{
return m_positiveColor;
return m_positiveTextColor;
}
QColor SchemeColors::neutralText() const
QColor SchemeColors::neutralTextColor() const
{
return m_neutralText;
return m_neutralTextColor;
}
QColor SchemeColors::negativeText() const
QColor SchemeColors::negativeTextColor() const
{
return m_negativeText;
return m_negativeTextColor;
}
QColor SchemeColors::buttonTextColor() const
@ -228,9 +228,9 @@ void SchemeColors::updateScheme()
m_highlightColor = selGroup.readEntry("BackgroundNormal", QColor());
m_highlightedTextColor = selGroup.readEntry("ForegroundNormal", QColor());
m_positiveColor = selGroup.readEntry("ForegroundPositive", QColor());
m_neutralText = selGroup.readEntry("ForegroundNeutral", QColor());;
m_negativeText = selGroup.readEntry("ForegroundNegative", QColor());
m_positiveTextColor = viewGroup.readEntry("ForegroundPositive", QColor());
m_neutralTextColor = viewGroup.readEntry("ForegroundNeutral", QColor());;
m_negativeTextColor = viewGroup.readEntry("ForegroundNegative", QColor());
m_buttonTextColor = buttonGroup.readEntry("ForegroundNormal", QColor());
m_buttonBackgroundColor = buttonGroup.readEntry("BackgroundNormal", QColor());

18
app/schemecolors.h
View File

@ -38,9 +38,9 @@ class SchemeColors: public QObject
Q_PROPERTY(QColor highlightColor READ highlightColor NOTIFY colorsChanged)
Q_PROPERTY(QColor highlightedTextColor READ highlightedTextColor NOTIFY colorsChanged)
Q_PROPERTY(QColor positiveText READ positiveText NOTIFY colorsChanged)
Q_PROPERTY(QColor neutralText READ neutralText NOTIFY colorsChanged)
Q_PROPERTY(QColor negativeText READ negativeText NOTIFY colorsChanged)
Q_PROPERTY(QColor positiveTextColor READ positiveTextColor NOTIFY colorsChanged)
Q_PROPERTY(QColor neutralTextColor READ neutralTextColor NOTIFY colorsChanged)
Q_PROPERTY(QColor negativeTextColor READ negativeTextColor NOTIFY colorsChanged)
Q_PROPERTY(QColor buttonTextColor READ buttonTextColor NOTIFY colorsChanged)
Q_PROPERTY(QColor buttonBackgroundColor READ buttonBackgroundColor NOTIFY colorsChanged)
@ -62,9 +62,9 @@ public:
QColor inactiveTextColor() const;
QColor highlightColor() const;
QColor highlightedTextColor() const;
QColor positiveText() const;
QColor neutralText() const;
QColor negativeText() const;
QColor positiveTextColor() const;
QColor neutralTextColor() const;
QColor negativeTextColor() const;
QColor buttonTextColor() const;
QColor buttonBackgroundColor() const;
@ -95,9 +95,9 @@ private:
QColor m_highlightColor;
QColor m_highlightedTextColor;
QColor m_positiveColor;
QColor m_neutralText;
QColor m_negativeText;
QColor m_positiveTextColor;
QColor m_neutralTextColor;
QColor m_negativeTextColor;
QColor m_buttonTextColor;
QColor m_buttonBackgroundColor;

17
containment/package/contents/ui/colorizer/Manager.qml
View File

@ -70,10 +70,21 @@ Loader{
//! new TEMPORARY options to pass palette to applets
//! UNTIL Latte produces two different color schemes files (LIGHT / DARK)
//! to be passed to applets etc...
readonly property color textColor: applyTheme.textColor
readonly property color highlightColor: theme.highlightColor
readonly property color highlightedTextColor: theme.highlightedTextColor
readonly property color backgroundColor: applyTheme.backgroundColor
readonly property color textColor: applyTheme.textColor
readonly property color inactiveBackgroundColor: applyTheme === theme ? theme.backgroundColor : applyTheme.inactiveBackgroundColor
readonly property color inactiveTextColor: applyTheme === theme ? theme.textColor : applyTheme.inactiveTextColor
readonly property color highlightColor: applyTheme.highlightColor
readonly property color highlightedTextColor: applyTheme.highlightedTextColor
readonly property color positiveTextColor: applyTheme.positiveTextColor
readonly property color neutralTextColor: applyTheme.neutralTextColor
readonly property color negativeTextColor: applyTheme.negativeTextColor
readonly property color buttonTextColor: applyTheme.buttonTextColor
readonly property color buttonBackgroundColor: applyTheme.buttonBackgroundColor
readonly property color buttonHoverColor: applyTheme.buttonHoverColor
readonly property color buttonFocusColor: applyTheme.buttonFocusColor
readonly property string scheme: themeExtended ? applyTheme.schemeFile : "kdeglobals"