FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for #210.

Browse Source
This commit is contained in:
Martin Rotter 2020-10-27 08:24:41 +01:00
parent 670235e37e
commit ea8ec86abd
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/skins/dark/metadata.xml
View File

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<skin version="0.03"> <skin version="0.04">
<author> <author>
<name>Martin Rotter</name> <name>Martin Rotter</name>
<email>rotter.martinos@gmail.com</email> <email>rotter.martinos@gmail.com</email>
</author> </author>
<palette> <palette>
<color key="1">#FFA07A</color> <color key="1">#7ae2ff</color>
<color key="2">#f08f84</color>
</palette> </palette>
</skin> </skin>

5
resources/skins/vergilius/metadata.xml
View File

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<skin version="0.22"> <skin version="0.23">
<author> <author>
<name>Martin Rotter</name> <name>Martin Rotter</name>
<email>rotter.martinos@gmail.com</email> <email>rotter.martinos@gmail.com</email>
</author> </author>
<palette> <palette>
<color key="1">#4891F0</color> <color key="1">#4861f0</color>
<color key="2">#d93636</color>
</palette> </palette>
</skin> </skin>

4
src/librssguard/miscellaneous/skinfactory.h
View File

@ -12,7 +12,8 @@
struct RSSGUARD_DLLSPEC Skin { struct RSSGUARD_DLLSPEC Skin {
enum class PaletteColors { enum class PaletteColors {
Highlight = 1 Highlight = 1,
Error = 2
}; };
QString m_baseName; QString m_baseName;
@ -26,7 +27,6 @@ struct RSSGUARD_DLLSPEC Skin {
QString m_enclosureImageMarkup; QString m_enclosureImageMarkup;
QString m_layoutMarkup; QString m_layoutMarkup;
QString m_enclosureMarkup; QString m_enclosureMarkup;
QHash<Skin::PaletteColors, QColor> m_colorPalette; QHash<Skin::PaletteColors, QColor> m_colorPalette;
}; };

4
src/librssguard/services/abstract/feed.cpp
View File

@ -71,13 +71,13 @@ QVariant Feed::data(int column, int role) const {
case Qt::ForegroundRole: case Qt::ForegroundRole:
switch (status()) { switch (status()) {
case Status::NewMessages: case Status::NewMessages:
return QColor(Qt::blue); return qApp->skins()->currentSkin().m_colorPalette[Skin::PaletteColors::Highlight];
case Status::NetworkError: case Status::NetworkError:
case Status::ParsingError: case Status::ParsingError:
case Status::AuthError: case Status::AuthError:
case Status::OtherError: case Status::OtherError:
return QColor(Qt::red); return qApp->skins()->currentSkin().m_colorPalette[Skin::PaletteColors::Error];
default: default:
return QVariant(); return QVariant();

1
src/librssguard/services/abstract/label.h
View File

@ -10,6 +10,7 @@
class RSSGUARD_DLLSPEC Label : public RootItem { class RSSGUARD_DLLSPEC Label : public RootItem {
Q_OBJECT Q_OBJECT
// Added for message filtering with labels.
Q_PROPERTY(QString customId READ customId) Q_PROPERTY(QString customId READ customId)
Q_PROPERTY(QColor color READ color) Q_PROPERTY(QColor color READ color)

1
src/librssguard/services/abstract/rootitem.h
View File

@ -21,6 +21,7 @@ class QAction;
class RSSGUARD_DLLSPEC RootItem : public QObject { class RSSGUARD_DLLSPEC RootItem : public QObject {
Q_OBJECT Q_OBJECT
// Added for message filtering with labels.
Q_PROPERTY(QString title READ title) Q_PROPERTY(QString title READ title)
public: public: