diff --git a/resources/skins/dark/metadata.xml b/resources/skins/dark/metadata.xml index f2ab79705..db3f2ab4e 100755 --- a/resources/skins/dark/metadata.xml +++ b/resources/skins/dark/metadata.xml @@ -1,10 +1,11 @@ - + Martin Rotter rotter.martinos@gmail.com - #FFA07A + #7ae2ff + #f08f84 \ No newline at end of file diff --git a/resources/skins/vergilius/metadata.xml b/resources/skins/vergilius/metadata.xml index d520af087..caefe5f2e 100755 --- a/resources/skins/vergilius/metadata.xml +++ b/resources/skins/vergilius/metadata.xml @@ -1,10 +1,11 @@ - + Martin Rotter rotter.martinos@gmail.com - #4891F0 + #4861f0 + #d93636 \ No newline at end of file diff --git a/src/librssguard/miscellaneous/skinfactory.h b/src/librssguard/miscellaneous/skinfactory.h index 754f47abe..0c174c412 100644 --- a/src/librssguard/miscellaneous/skinfactory.h +++ b/src/librssguard/miscellaneous/skinfactory.h @@ -12,7 +12,8 @@ struct RSSGUARD_DLLSPEC Skin { enum class PaletteColors { - Highlight = 1 + Highlight = 1, + Error = 2 }; QString m_baseName; @@ -26,7 +27,6 @@ struct RSSGUARD_DLLSPEC Skin { QString m_enclosureImageMarkup; QString m_layoutMarkup; QString m_enclosureMarkup; - QHash m_colorPalette; }; diff --git a/src/librssguard/services/abstract/feed.cpp b/src/librssguard/services/abstract/feed.cpp index 7e228154a..858209488 100755 --- a/src/librssguard/services/abstract/feed.cpp +++ b/src/librssguard/services/abstract/feed.cpp @@ -71,13 +71,13 @@ QVariant Feed::data(int column, int role) const { case Qt::ForegroundRole: switch (status()) { case Status::NewMessages: - return QColor(Qt::blue); + return qApp->skins()->currentSkin().m_colorPalette[Skin::PaletteColors::Highlight]; case Status::NetworkError: case Status::ParsingError: case Status::AuthError: case Status::OtherError: - return QColor(Qt::red); + return qApp->skins()->currentSkin().m_colorPalette[Skin::PaletteColors::Error]; default: return QVariant(); diff --git a/src/librssguard/services/abstract/label.h b/src/librssguard/services/abstract/label.h index a5e3fb919..4ed5b370e 100755 --- a/src/librssguard/services/abstract/label.h +++ b/src/librssguard/services/abstract/label.h @@ -10,6 +10,7 @@ class RSSGUARD_DLLSPEC Label : public RootItem { Q_OBJECT + // Added for message filtering with labels. Q_PROPERTY(QString customId READ customId) Q_PROPERTY(QColor color READ color) diff --git a/src/librssguard/services/abstract/rootitem.h b/src/librssguard/services/abstract/rootitem.h index 4935089c5..fa079a320 100644 --- a/src/librssguard/services/abstract/rootitem.h +++ b/src/librssguard/services/abstract/rootitem.h @@ -21,6 +21,7 @@ class QAction; class RSSGUARD_DLLSPEC RootItem : public QObject { Q_OBJECT + // Added for message filtering with labels. Q_PROPERTY(QString title READ title) public: