pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed #210 - changed blue to more visible orange

Browse source
This commit is contained in:
Martin Rotter 2019-06-27 08:16:06 +02:00
parent a770bfab8f
commit 95ae8b9cf6
24 changed files with 75 additions and 223 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
localization/rssguard_cs.ts
View file

@ -1257,7 +1257,7 @@ or this functionality is not implemented yet.</source>
</message>
<message>
<source>Show password</source>
<translation>Zobrazit heslo</translation>
<translation type="unfinished"/>
</message>
<message>
<source>Requires HTTP authentication</source>
@ -1265,15 +1265,15 @@ or this functionality is not implemented yet.</source>
</message>
<message>
<source>&amp;Test setup</source>
<translation>&amp;Otestovat nastavení</translation>
<translation type="unfinished"/>
</message>
<message>
<source>Force execution of server-side update when updating feeds from RSS Guard</source>
<translation>Vynutit aktualizace kanálů na straně serveru.</translation>
<translation type="unfinished"/>
</message>
<message>
<source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
<translation>Zapnutí této položky může výrazně zpomalit aktualizaci kanálů.</translation>
<translation type="unfinished"/>
</message>
<message>
<source>Note that at least API level %1 is required.</source>
@ -3043,16 +3043,6 @@ Tokeny vyprší: %2</translation>
+ %n dalších kanálů.</numerusform><numerusform>
+ %n dalších kanálů.</numerusform></translation>
</message>
<message>
<source>Welcome to %1.
Please, check NEW stuff included in this
version by clicking this popup notification.</source>
<translation>Vítá Vás %1.
Prosím, zkontrolujte novinky kliknutím
na tuto bublinu.</translation>
</message>
<message>
<source>Load initial set of feeds</source>

9
localization/rssguard_da.ts
View file

@ -1250,7 +1250,7 @@ or this functionality is not implemented yet.</source>
</message>
<message>
<source>Show password</source>
<translation>Vis kodeord</translation>
<translation type="unfinished"/>
</message>
<message>
<source>Requires HTTP authentication</source>
@ -3022,13 +3022,6 @@ Login tokens expiration: %2</source>
+ %n other feeds.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
<source>Welcome to %1.
Please, check NEW stuff included in this
version by clicking this popup notification.</source>
<translation type="unfinished"/>
</message>
<message>
<source>Load initial set of feeds</source>
<translation type="unfinished"/>

10
localization/rssguard_de.ts
View file

@ -3033,16 +3033,6 @@ Ablauf des Login tokens: %2</translation>
+ %n other feeds.</source>
<translation><numerusform>+ %n anderer Feed.</numerusform><numerusform>+ %n andere Feeds.</numerusform></translation>
</message>
<message>
<source>Welcome to %1.
Please, check NEW stuff included in this
version by clicking this popup notification.</source>
<translation>Willkommen bei %1.
Bitte überprüfen Sie die in dieser Version enthaltene Neuerungen
durch Klicken auf diese Benachrichtigung.</translation>
</message>
<message>
<source>Load initial set of feeds</source>
<translation>Zu Beginn standardmäßige Zusammenstellung von Feeds laden</translation>

18
localization/rssguard_en.ts
View file

@ -1279,7 +1279,7 @@ or this functionality is not implemented yet.</translation>
</message>
<message>
<source>Show password</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Show password </translation>
</message>
<message>
<source>Requires HTTP authentication</source>
@ -1287,15 +1287,15 @@ or this functionality is not implemented yet.</translation>
</message>
<message>
<source>&amp;Test setup</source>
<translation type="unfinished"></translation>
<translation type="unfinished">&amp;Test setup </translation>
</message>
<message>
<source>Force execution of server-side update when updating feeds from RSS Guard</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Force execution of server-side update when updating feeds from RSS Guard.</translation>
</message>
<message>
<source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Leaving this option on causes that updates of feeds will be probably much slower and may time-out often. </translation>
</message>
<message>
<source>Note that at least API level %1 is required.</source>
@ -3060,16 +3060,6 @@ Login tokens expiration: %2</source>
<numerusform></numerusform>
</translation>
</message>
<message>
<source>Welcome to %1.
Please, check NEW stuff included in this
version by clicking this popup notification.</source>
<translation>Welcome to %1.
Please, check NEW stuff included in this
version by clicking this popup notification.</translation>
</message>
<message>
<source>Load initial set of feeds</source>
<translation>Load initial set of feeds</translation>

10
localization/rssguard_es.ts
View file

@ -3035,16 +3035,6 @@ Login tokens expiration: %2</source>
+ %n fuente restante.</numerusform><numerusform>
+ %n fuentes restantes.</numerusform></translation>
</message>
<message>
<source>Welcome to %1.
Please, check NEW stuff included in this
version by clicking this popup notification.</source>
<translation>Bienvenido a %1.
Por favor, consulte las NUEVAS funciones incluidas en esta
versión pulsando en esta notificación emergente..</translation>
</message>
<message>
<source>Load initial set of feeds</source>

7
localization/rssguard_fr.ts
View file

@ -3028,13 +3028,6 @@ Login tokens expiration: %2</source>
+ %n other feeds.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
<source>Welcome to %1.
Please, check NEW stuff included in this
version by clicking this popup notification.</source>
<translation type="unfinished"/>
</message>
<message>
<source>Load initial set of feeds</source>
<translation type="unfinished"/>

7
localization/rssguard_he.ts
View file

@ -3022,13 +3022,6 @@ Login tokens expiration: %2</source>
+ %n other feeds.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
<source>Welcome to %1.
Please, check NEW stuff included in this
version by clicking this popup notification.</source>
<translation type="unfinished"/>
</message>
<message>
<source>Load initial set of feeds</source>
<translation type="unfinished"/>

10
localization/rssguard_id.ts
View file

@ -3031,16 +3031,6 @@ Login tokens expiration: %2</source>
+ %n other feeds.</source>
<translation><numerusform>+ %n feed lain.</numerusform></translation>
</message>
<message>
<source>Welcome to %1.
Please, check NEW stuff included in this
version by clicking this popup notification.</source>
<translation>Selamat datang di %1.
Silahkan, memeriksa hal BARU yang termasuk
di versi ini dengan meng-klik popup notifikasi ini.</translation>
</message>
<message>
<source>Load initial set of feeds</source>
<translation>Memuat kumpulan awal dari feed</translation>

10
localization/rssguard_it.ts
View file

@ -3033,16 +3033,6 @@ Login tokens expiration: %2</source>
+ %n other feeds.</source>
<translation><numerusform>+ %n altra fonte.</numerusform><numerusform>+ %n altre fonti.</numerusform></translation>
</message>
<message>
<source>Welcome to %1.
Please, check NEW stuff included in this
version by clicking this popup notification.</source>
<translation>Benvenuto in %1.
Controlla la NUOVA roba inclusa in questa
versione facendo clic su questa notifica a scomparsa.</translation>
</message>
<message>
<source>Load initial set of feeds</source>
<translation>Carica insieme fonti iniziale</translation>

7
localization/rssguard_ja.ts
View file

@ -3022,13 +3022,6 @@ Login tokens expiration: %2</source>
+ %n other feeds.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
<source>Welcome to %1.
Please, check NEW stuff included in this
version by clicking this popup notification.</source>
<translation type="unfinished"/>
</message>
<message>
<source>Load initial set of feeds</source>
<translation type="unfinished"/>

22
localization/rssguard_lt.ts
View file

@ -1269,7 +1269,7 @@ arba šis funkcionalumas dar nėra įgyvendintas.</translation>
</message>
<message>
<source>Force execution of server-side update when updating feeds from RSS Guard</source>
<translation>Priverstinai vykdyti serverio pusės atnaujinimus, kuomet atnaujinama iš RSS Guard</translation>
<translation>Priverstinai vykdyti serverio pusės atnaujinimus, kuomet atnaujinama iš RSS Guard.</translation>
</message>
<message>
<source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
@ -3045,16 +3045,6 @@ Prisijungimo prieigos raktai nustoja galioti: %2</translation>
+ %n kitų žinučių.</numerusform><numerusform>
+ %n kitų žinučių.</numerusform></translation>
</message>
<message>
<source>Welcome to %1.
Please, check NEW stuff included in this
version by clicking this popup notification.</source>
<translation>Sveiki atvykę į %1.
Susipažinkite su NAUJOMIS šios
versijos ypatybėmis, spusteldami šį pranešimą.</translation>
</message>
<message>
<source>Load initial set of feeds</source>
@ -3618,23 +3608,23 @@ Vilkaduobės:
</message>
<message>
<source>Feed list font</source>
<translation type="unfinished"/>
<translation>Kanalų sąrašo šriftas</translation>
</message>
<message>
<source>Display placeholders to indicate locations of pictures</source>
<translation type="unfinished"/>
<translation>Rodyti vietaženklius, siekiant nurodyti paveikslų vietas</translation>
</message>
<message>
<source>Message list font</source>
<translation type="unfinished"/>
<translation>Žinučių sąrašo šriftas</translation>
</message>
<message>
<source>Internal message browser font</source>
<translation type="unfinished"/>
<translation>Vidinės žinučių naršyklės šriftas</translation>
</message>
<message>
<source>Select new font</source>
<translation type="unfinished"/>
<translation>Pasirinkti naują šriftą</translation>
</message>
</context>
<context>

10
localization/rssguard_nl.ts
View file

@ -3037,16 +3037,6 @@ Login tokens expiration: %2</source>
+ %n andere feed.</numerusform><numerusform>
+ %n andere feeds.</numerusform></translation>
</message>
<message>
<source>Welcome to %1.
Please, check NEW stuff included in this
version by clicking this popup notification.</source>
<translation>Welkom bij %1.
Check voor NIEUW materiaal in deze versie
door te clicken op deze popup melding.</translation>
</message>
<message>
<source>Load initial set of feeds</source>

10
localization/rssguard_pl.ts
View file

@ -3039,16 +3039,6 @@ Login tokens expiration: %2</source>
+ %n innych kanałów.</numerusform><numerusform>
+ %n innych kanałów.</numerusform></translation>
</message>
<message>
<source>Welcome to %1.
Please, check NEW stuff included in this
version by clicking this popup notification.</source>
<translation>Witaj w %1.
Sprawdź nowe możliwości dodane w
tej wersji, klikając na to powiadomienie.</translation>
</message>
<message>
<source>Load initial set of feeds</source>

12
localization/rssguard_pt.ts
View file

@ -1267,7 +1267,7 @@ ou esta função ainda não foi implementada.</translation>
</message>
<message>
<source>Force execution of server-side update when updating feeds from RSS Guard</source>
<translation>Forçar execução de atualização do lado do servidor ao atualizar feeds do RSS Guard</translation>
<translation>Forçar execução de atualização do lado do servidor ao atualizar feeds do RSS Guard.</translation>
</message>
<message>
<source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
@ -3039,16 +3039,6 @@ Expiração dos tokens de login: %2</translation>
+ %n outro feed.</numerusform><numerusform>
+ %n outros feeds.</numerusform></translation>
</message>
<message>
<source>Welcome to %1.
Please, check NEW stuff included in this
version by clicking this popup notification.</source>
<translation>Bem-vindo ao %1.
Por favor, veja o NOVO conteúdo incluído nesta
versão, clicando nesta notificação popup.</translation>
</message>
<message>
<source>Load initial set of feeds</source>

12
localization/rssguard_sv.ts
View file

@ -1267,7 +1267,7 @@ att funktionen inte är implementerad än.</translation>
</message>
<message>
<source>Force execution of server-side update when updating feeds from RSS Guard</source>
<translation>Forcera serveruppdatering när flöden uppdateras från RSS-Guard</translation>
<translation>Tvinga serveruppdatering när flöden uppdateras från RSS-Guard</translation>
</message>
<message>
<source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
@ -3038,16 +3038,6 @@ Inloggningstoken upphör: %2</translation>
+ %n annat flöde.</numerusform><numerusform>
+ %n andra flöden.</numerusform></translation>
</message>
<message>
<source>Welcome to %1.
Please, check NEW stuff included in this
version by clicking this popup notification.</source>
<translation>Välkommen till %1.
Kolla in NYA grejer i den här versionen
genom att klicka på denna popup-avisering.</translation>
</message>
<message>
<source>Load initial set of feeds</source>

9
localization/rssguard_uk.ts
View file

@ -1253,7 +1253,7 @@ or this functionality is not implemented yet.</source>
</message>
<message>
<source>Show password</source>
<translation>Показувати пароль</translation>
<translation>Показати пароль</translation>
</message>
<message>
<source>Requires HTTP authentication</source>
@ -3033,13 +3033,6 @@ Login tokens expiration: %2</translation>
+ %n other feeds.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
<source>Welcome to %1.
Please, check NEW stuff included in this
version by clicking this popup notification.</source>
<translation type="unfinished"/>
</message>
<message>
<source>Load initial set of feeds</source>
<translation>Завантажити початковий набір підписок</translation>

13
localization/rssguard_zh.ts
View file

@ -1261,15 +1261,15 @@ or this functionality is not implemented yet.</source>
</message>
<message>
<source>&amp;Test setup</source>
<translation>&amp;测试设置</translation>
<translation type="unfinished"/>
</message>
<message>
<source>Force execution of server-side update when updating feeds from RSS Guard</source>
<translation>当从 RSS Guard 更新订阅时，强制执行服务器端更新</translation>
<translation type="unfinished"/>
</message>
<message>
<source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
<translation>选择这个选项将导致订阅更新变得更慢，而且可能会经常超时。</translation>
<translation type="unfinished"/>
</message>
<message>
<source>Note that at least API level %1 is required.</source>
@ -3025,13 +3025,6 @@ Login tokens expiration: %2</source>
+ %n other feeds.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
<source>Welcome to %1.
Please, check NEW stuff included in this
version by clicking this popup notification.</source>
<translation type="unfinished"/>
</message>
<message>
<source>Load initial set of feeds</source>
<translation type="unfinished"/>

2
resources/desktop/com.github.rssguard.appdata.xml
View file

@ -30,7 +30,7 @@
<url type="donation">https://martinrotter.github.io/donate/</url>
<content_rating type="oars-1.1" />
<releases>
<release version="3.5.9" date="2019-06-12"/>
<release version="3.5.9" date="2019-06-27"/>
</releases>
<content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute>

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

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

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

@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<skin version="0.20">
<skin version="0.21">
<author>
<name>Martin Rotter</name>
<email>rotter.martinos@gmail.com</email>
</author>
<palette>
<color key="1">#4891F0</color>
</palette>
</skin>

5
src/librssguard/core/messagesmodel.cpp
View file

@ -8,6 +8,7 @@
#include "miscellaneous/databasefactory.h"
#include "miscellaneous/databasequeries.h"
#include "miscellaneous/iconfactory.h"
#include "miscellaneous/skinfactory.h"
#include "miscellaneous/textfactory.h"
#include "services/abstract/recyclebin.h"
#include "services/abstract/serviceroot.h"
@ -283,14 +284,14 @@ QVariant MessagesModel::data(const QModelIndex& idx, int role) const {
QModelIndex idx_important = index(idx.row(), MSG_DB_IMPORTANT_INDEX);
QVariant dta = m_cache->containsData(idx_important.row()) ? m_cache->data(idx_important) : QSqlQueryModel::data(idx_important);
return dta.toInt() == 1 ? QColor(Qt::blue) : QVariant();
return dta.toInt() == 1 ? qApp->skins()->currentSkin().m_colorPalette[Skin::PaletteColors::Highlight] : QVariant();
}
case HighlightUnread: {
QModelIndex idx_read = index(idx.row(), MSG_DB_READ_INDEX);
QVariant dta = m_cache->containsData(idx_read.row()) ? m_cache->data(idx_read) : QSqlQueryModel::data(idx_read);
return dta.toInt() == 0 ? QColor(Qt::blue) : QVariant();
return dta.toInt() == 0 ? qApp->skins()->currentSkin().m_colorPalette[Skin::PaletteColors::Highlight] : QVariant();
}
case NoHighlighting:

33
src/librssguard/librssguard.pro
View file

@ -410,39 +410,10 @@ INCLUDEPATH += $$PWD/. \
$$PWD/gui/dialogs \
$$PWD/dynamic-shortcuts
TRANSLATIONS_WO_QT += $$PWD/../../localization/rssguard_cs.ts \
$$PWD/../../localization/rssguard_da.ts \
$$PWD/../../localization/rssguard_de.ts \
$$PWD/../../localization/rssguard_en.ts \
$$PWD/../../localization/rssguard_es.ts \
$$PWD/../../localization/rssguard_fr.ts \
$$PWD/../../localization/rssguard_he.ts \
$$PWD/../../localization/rssguard_id.ts \
$$PWD/../../localization/rssguard_it.ts \
$$PWD/../../localization/rssguard_ja.ts \
$$PWD/../../localization/rssguard_lt.ts \
$$PWD/../../localization/rssguard_nl.ts \
$$PWD/../../localization/rssguard_pl.ts \
$$PWD/../../localization/rssguard_pt.ts \
$$PWD/../../localization/rssguard_sv.ts \
$$PWD/../../localization/rssguard_uk.ts \
$$PWD/../../localization/rssguard_zh.ts
TRANSLATIONS_WO_QT += $$files($$PWD/../../localization/rssguard_*.ts, false)
TRANSLATIONS += $$TRANSLATIONS_WO_QT \
$$PWD/../../localization/qtbase_cs.ts \
$$PWD/../../localization/qtbase_da.ts \
$$PWD/../../localization/qtbase_de.ts \
$$PWD/../../localization/qtbase_es.ts \
$$PWD/../../localization/qtbase_fr.ts \
$$PWD/../../localization/qtbase_he.ts \
$$PWD/../../localization/qtbase_it.ts \
$$PWD/../../localization/qtbase_ja.ts \
$$PWD/../../localization/qtbase_lt.ts \
$$PWD/../../localization/qtbase_pl.ts \
$$PWD/../../localization/qtbase_pt.ts \
$$PWD/../../localization/qtbase_sv.ts \
$$PWD/../../localization/qtbase_uk.ts \
$$PWD/../../localization/qtbase_zh.ts
$$files($$PWD/../../localization/qtbase_*.ts, false)
load(uic)
uic.commands -= -no-stringliteral

23
src/librssguard/miscellaneous/skinfactory.cpp
View file

@ -11,8 +11,6 @@
SkinFactory::SkinFactory(QObject* parent) : QObject(parent) {}
SkinFactory::~SkinFactory() = default;
void SkinFactory::loadCurrentSkin() {
QList<QString> skin_names_to_try;
skin_names_to_try.append(selectedSkinName());
@ -110,6 +108,23 @@ Skin SkinFactory::skinInfo(const QString& skin_name, bool* ok) const {
// Obtain other information.
skin.m_baseName = skin_name;
// Obtain color palette.
QHash<Skin::PaletteColors, QColor> palette;
QDomNodeList colors_of_palette = skin_node.namedItem(QSL("palette")).toElement().elementsByTagName(QSL("color"));
for (int i = 0; i < colors_of_palette.size(); i++) {
QDomElement elem_clr = colors_of_palette.item(i).toElement();
Skin::PaletteColors key = Skin::PaletteColors(elem_clr.attribute(QSL("key")).toInt());
QColor value = elem_clr.text();
if (value.isValid()) {
palette.insert(key, value);
}
}
skin.m_colorPalette = palette;
// Free resources.
skin_file.close();
skin_file.deleteLater();
@ -170,3 +185,7 @@ QList<Skin> SkinFactory::installedSkins() const {
return skins;
}
uint qHash(const Skin::PaletteColors& key) {
return uint(key);
}

25
src/librssguard/miscellaneous/skinfactory.h
View file

@ -5,10 +5,16 @@
#include <QObject>
#include <QColor>
#include <QHash>
#include <QMetaType>
#include <QStringList>
struct RSSGUARD_DLLSPEC Skin {
enum class PaletteColors {
Highlight = 1
};
QString m_baseName;
QString m_visibleName;
QString m_author;
@ -20,27 +26,24 @@ struct RSSGUARD_DLLSPEC Skin {
QString m_enclosureImageMarkup;
QString m_layoutMarkup;
QString m_enclosureMarkup;
QHash<Skin::PaletteColors, QColor> m_colorPalette;
};
uint qHash(const Skin::PaletteColors& key);
Q_DECLARE_METATYPE(Skin)
class RSSGUARD_DLLSPEC SkinFactory : public QObject {
Q_OBJECT
public:
// Constructor.
explicit SkinFactory(QObject* parent = nullptr);
// Destructor.
virtual ~SkinFactory();
virtual ~SkinFactory() = default;
// Loads skin name from settings and sets it as active.
void loadCurrentSkin();
inline Skin currentSkin() const {
return m_currentSkin;
}
Skin currentSkin() const;
// Returns the name of the skin, that should be activated
// after application restart.
@ -68,4 +71,8 @@ class RSSGUARD_DLLSPEC SkinFactory : public QObject {
Skin m_currentSkin;
};
inline Skin SkinFactory::currentSkin() const {
return m_currentSkin;
}
#endif // SKINFACTORY_H