From 95ae8b9cf6238157dc000d577e6f6d04522ac793 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 27 Jun 2019 08:16:06 +0200 Subject: [PATCH] fixed #210 - changed blue to more visible orange --- localization/rssguard_cs.ts | 18 +++------- localization/rssguard_da.ts | 9 +---- localization/rssguard_de.ts | 10 ------ localization/rssguard_en.ts | 18 +++------- localization/rssguard_es.ts | 10 ------ localization/rssguard_fr.ts | 7 ---- localization/rssguard_he.ts | 7 ---- localization/rssguard_id.ts | 10 ------ localization/rssguard_it.ts | 10 ------ localization/rssguard_ja.ts | 7 ---- localization/rssguard_lt.ts | 28 +++++----------- localization/rssguard_nl.ts | 10 ------ localization/rssguard_pl.ts | 10 ------ localization/rssguard_pt.ts | 12 +------ localization/rssguard_sv.ts | 12 +------ localization/rssguard_uk.ts | 9 +---- localization/rssguard_zh.ts | 13 ++------ .../desktop/com.github.rssguard.appdata.xml | 2 +- resources/skins/dark/metadata.xml | 5 ++- resources/skins/vergilius/metadata.xml | 5 ++- src/librssguard/core/messagesmodel.cpp | 5 +-- src/librssguard/librssguard.pro | 33 ++----------------- src/librssguard/miscellaneous/skinfactory.cpp | 23 +++++++++++-- src/librssguard/miscellaneous/skinfactory.h | 25 +++++++++----- 24 files changed, 75 insertions(+), 223 deletions(-) diff --git a/localization/rssguard_cs.ts b/localization/rssguard_cs.ts index 9c7560a4d..2ec348cc0 100644 --- a/localization/rssguard_cs.ts +++ b/localization/rssguard_cs.ts @@ -1257,7 +1257,7 @@ or this functionality is not implemented yet. Show password - Zobrazit heslo + Requires HTTP authentication @@ -1265,15 +1265,15 @@ or this functionality is not implemented yet. &Test setup - &Otestovat nastavení + Force execution of server-side update when updating feeds from RSS Guard - Vynutit aktualizace kanálů na straně serveru. + Leaving this option on causes that updates of feeds will be probably much slower and may time-out often. - Zapnutí této položky může výrazně zpomalit aktualizaci kanálů. + Note that at least API level %1 is required. @@ -3043,16 +3043,6 @@ Tokeny vyprší: %2 + %n dalších kanálů. + %n dalších kanálů. - - - Welcome to %1. - -Please, check NEW stuff included in this -version by clicking this popup notification. - Vítá Vás %1. - -Prosím, zkontrolujte novinky kliknutím -na tuto bublinu. Load initial set of feeds diff --git a/localization/rssguard_da.ts b/localization/rssguard_da.ts index 9a5d907d3..d4160d878 100644 --- a/localization/rssguard_da.ts +++ b/localization/rssguard_da.ts @@ -1250,7 +1250,7 @@ or this functionality is not implemented yet. Show password - Vis kodeord + Requires HTTP authentication @@ -3022,13 +3022,6 @@ Login tokens expiration: %2 + %n other feeds. - - Welcome to %1. - -Please, check NEW stuff included in this -version by clicking this popup notification. - - Load initial set of feeds diff --git a/localization/rssguard_de.ts b/localization/rssguard_de.ts index e5cde8090..8e5a5cbf2 100644 --- a/localization/rssguard_de.ts +++ b/localization/rssguard_de.ts @@ -3033,16 +3033,6 @@ Ablauf des Login tokens: %2 + %n other feeds. + %n anderer Feed.+ %n andere Feeds. - - Welcome to %1. - -Please, check NEW stuff included in this -version by clicking this popup notification. - Willkommen bei %1. - -Bitte überprüfen Sie die in dieser Version enthaltene Neuerungen -durch Klicken auf diese Benachrichtigung. - Load initial set of feeds Zu Beginn standardmäßige Zusammenstellung von Feeds laden diff --git a/localization/rssguard_en.ts b/localization/rssguard_en.ts index e1bfe1cdb..3bc6e809b 100644 --- a/localization/rssguard_en.ts +++ b/localization/rssguard_en.ts @@ -1279,7 +1279,7 @@ or this functionality is not implemented yet. Show password - + Show password Requires HTTP authentication @@ -1287,15 +1287,15 @@ or this functionality is not implemented yet. &Test setup - + &Test setup Force execution of server-side update when updating feeds from RSS Guard - + Force execution of server-side update when updating feeds from RSS Guard. Leaving this option on causes that updates of feeds will be probably much slower and may time-out often. - + Leaving this option on causes that updates of feeds will be probably much slower and may time-out often. Note that at least API level %1 is required. @@ -3060,16 +3060,6 @@ Login tokens expiration: %2 - - Welcome to %1. - -Please, check NEW stuff included in this -version by clicking this popup notification. - Welcome to %1. - -Please, check NEW stuff included in this -version by clicking this popup notification. - Load initial set of feeds Load initial set of feeds diff --git a/localization/rssguard_es.ts b/localization/rssguard_es.ts index 1339d03ec..2493fe376 100755 --- a/localization/rssguard_es.ts +++ b/localization/rssguard_es.ts @@ -3035,16 +3035,6 @@ Login tokens expiration: %2 + %n fuente restante. + %n fuentes restantes. - - - Welcome to %1. - -Please, check NEW stuff included in this -version by clicking this popup notification. - Bienvenido a %1. - -Por favor, consulte las NUEVAS funciones incluidas en esta -versión pulsando en esta notificación emergente.. Load initial set of feeds diff --git a/localization/rssguard_fr.ts b/localization/rssguard_fr.ts index d38da3371..42babc072 100644 --- a/localization/rssguard_fr.ts +++ b/localization/rssguard_fr.ts @@ -3028,13 +3028,6 @@ Login tokens expiration: %2 + %n other feeds. - - Welcome to %1. - -Please, check NEW stuff included in this -version by clicking this popup notification. - - Load initial set of feeds diff --git a/localization/rssguard_he.ts b/localization/rssguard_he.ts index d1d7fd887..91703f039 100644 --- a/localization/rssguard_he.ts +++ b/localization/rssguard_he.ts @@ -3022,13 +3022,6 @@ Login tokens expiration: %2 + %n other feeds. - - Welcome to %1. - -Please, check NEW stuff included in this -version by clicking this popup notification. - - Load initial set of feeds diff --git a/localization/rssguard_id.ts b/localization/rssguard_id.ts index 61732b623..f8e9ea879 100644 --- a/localization/rssguard_id.ts +++ b/localization/rssguard_id.ts @@ -3031,16 +3031,6 @@ Login tokens expiration: %2 + %n other feeds. + %n feed lain. - - Welcome to %1. - -Please, check NEW stuff included in this -version by clicking this popup notification. - Selamat datang di %1. - -Silahkan, memeriksa hal BARU yang termasuk -di versi ini dengan meng-klik popup notifikasi ini. - Load initial set of feeds Memuat kumpulan awal dari feed diff --git a/localization/rssguard_it.ts b/localization/rssguard_it.ts index 5c21ccead..4abde8952 100644 --- a/localization/rssguard_it.ts +++ b/localization/rssguard_it.ts @@ -3033,16 +3033,6 @@ Login tokens expiration: %2 + %n other feeds. + %n altra fonte.+ %n altre fonti. - - Welcome to %1. - -Please, check NEW stuff included in this -version by clicking this popup notification. - Benvenuto in %1. - -Controlla la NUOVA roba inclusa in questa -versione facendo clic su questa notifica a scomparsa. - Load initial set of feeds Carica insieme fonti iniziale diff --git a/localization/rssguard_ja.ts b/localization/rssguard_ja.ts index 973403790..b9781fefe 100644 --- a/localization/rssguard_ja.ts +++ b/localization/rssguard_ja.ts @@ -3022,13 +3022,6 @@ Login tokens expiration: %2 + %n other feeds. - - Welcome to %1. - -Please, check NEW stuff included in this -version by clicking this popup notification. - - Load initial set of feeds diff --git a/localization/rssguard_lt.ts b/localization/rssguard_lt.ts index 8b8287271..c66b1ee3b 100644 --- a/localization/rssguard_lt.ts +++ b/localization/rssguard_lt.ts @@ -1257,7 +1257,7 @@ arba šis funkcionalumas dar nėra įgyvendintas. Show password - Rodyti slaptažodį + Rodyti slaptažodį Requires HTTP authentication @@ -1265,15 +1265,15 @@ arba šis funkcionalumas dar nėra įgyvendintas. &Test setup - &Išbandyti sąranką + &Išbandyti sąranką Force execution of server-side update when updating feeds from RSS Guard - Priverstinai vykdyti serverio pusės atnaujinimus, kuomet atnaujinama iš RSS Guard + Priverstinai vykdyti serverio pusės atnaujinimus, kuomet atnaujinama iš RSS Guard. Leaving this option on causes that updates of feeds will be probably much slower and may time-out often. - Palikus šį parametrą įjungtą, bus sąlygojama, jog kanalų atnaujinimai bus žymiai lėtesni ir dažnu atveju gali būti pereikvojami pagal laiką. + Palikus šį parametrą įjungtą, bus sąlygojama, jog kanalų atnaujinimai bus žymiai lėtesni ir dažnu atveju gali būti pereikvojami pagal laiką. Note that at least API level %1 is required. @@ -3045,16 +3045,6 @@ Prisijungimo prieigos raktai nustoja galioti: %2 + %n kitų žinučių. + %n kitų žinučių. - - - Welcome to %1. - -Please, check NEW stuff included in this -version by clicking this popup notification. - Sveiki atvykę į %1. - -Susipažinkite su NAUJOMIS šios -versijos ypatybėmis, spusteldami šį pranešimą. Load initial set of feeds @@ -3618,23 +3608,23 @@ Vilkaduobės: Feed list font - + Kanalų sąrašo šriftas Display placeholders to indicate locations of pictures - + Rodyti vietaženklius, siekiant nurodyti paveikslų vietas Message list font - + Žinučių sąrašo šriftas Internal message browser font - + Vidinės žinučių naršyklės šriftas Select new font - + Pasirinkti naują šriftą diff --git a/localization/rssguard_nl.ts b/localization/rssguard_nl.ts index c5583c5f4..841aa41e9 100644 --- a/localization/rssguard_nl.ts +++ b/localization/rssguard_nl.ts @@ -3037,16 +3037,6 @@ Login tokens expiration: %2 + %n andere feed. + %n andere feeds. - - - Welcome to %1. - -Please, check NEW stuff included in this -version by clicking this popup notification. - Welkom bij %1. - -Check voor NIEUW materiaal in deze versie -door te clicken op deze popup melding. Load initial set of feeds diff --git a/localization/rssguard_pl.ts b/localization/rssguard_pl.ts index 56091aeee..d3f1c8d6b 100644 --- a/localization/rssguard_pl.ts +++ b/localization/rssguard_pl.ts @@ -3039,16 +3039,6 @@ Login tokens expiration: %2 + %n innych kanałów. + %n innych kanałów. - - - Welcome to %1. - -Please, check NEW stuff included in this -version by clicking this popup notification. - Witaj w %1. - -Sprawdź nowe możliwości dodane w -tej wersji, klikając na to powiadomienie. Load initial set of feeds diff --git a/localization/rssguard_pt.ts b/localization/rssguard_pt.ts index ae2be9d68..a7d3c27e2 100644 --- a/localization/rssguard_pt.ts +++ b/localization/rssguard_pt.ts @@ -1267,7 +1267,7 @@ ou esta função ainda não foi implementada. Force execution of server-side update when updating feeds from RSS Guard - Forçar execução de atualização do lado do servidor ao atualizar feeds do RSS Guard + Forçar execução de atualização do lado do servidor ao atualizar feeds do RSS Guard. Leaving this option on causes that updates of feeds will be probably much slower and may time-out often. @@ -3039,16 +3039,6 @@ Expiração dos tokens de login: %2 + %n outro feed. + %n outros feeds. - - - Welcome to %1. - -Please, check NEW stuff included in this -version by clicking this popup notification. - Bem-vindo ao %1. - -Por favor, veja o NOVO conteúdo incluído nesta -versão, clicando nesta notificação popup. Load initial set of feeds diff --git a/localization/rssguard_sv.ts b/localization/rssguard_sv.ts index 5f6065471..3d3d8d70e 100644 --- a/localization/rssguard_sv.ts +++ b/localization/rssguard_sv.ts @@ -1267,7 +1267,7 @@ att funktionen inte är implementerad än. Force execution of server-side update when updating feeds from RSS Guard - Forcera serveruppdatering när flöden uppdateras från RSS-Guard + Tvinga serveruppdatering när flöden uppdateras från RSS-Guard Leaving this option on causes that updates of feeds will be probably much slower and may time-out often. @@ -3038,16 +3038,6 @@ Inloggningstoken upphör: %2 + %n annat flöde. + %n andra flöden. - - - Welcome to %1. - -Please, check NEW stuff included in this -version by clicking this popup notification. - Välkommen till %1. - -Kolla in NYA grejer i den här versionen -genom att klicka på denna popup-avisering. Load initial set of feeds diff --git a/localization/rssguard_uk.ts b/localization/rssguard_uk.ts index 6a2699aa5..238aa6a4e 100644 --- a/localization/rssguard_uk.ts +++ b/localization/rssguard_uk.ts @@ -1253,7 +1253,7 @@ or this functionality is not implemented yet. Show password - Показувати пароль + Показати пароль Requires HTTP authentication @@ -3033,13 +3033,6 @@ Login tokens expiration: %2 + %n other feeds. - - Welcome to %1. - -Please, check NEW stuff included in this -version by clicking this popup notification. - - Load initial set of feeds Завантажити початковий набір підписок diff --git a/localization/rssguard_zh.ts b/localization/rssguard_zh.ts index f7857228d..9cac8aeca 100755 --- a/localization/rssguard_zh.ts +++ b/localization/rssguard_zh.ts @@ -1261,15 +1261,15 @@ or this functionality is not implemented yet. &Test setup - &测试设置 + Force execution of server-side update when updating feeds from RSS Guard - 当从 RSS Guard 更新订阅时，强制执行服务器端更新 + Leaving this option on causes that updates of feeds will be probably much slower and may time-out often. - 选择这个选项将导致订阅更新变得更慢，而且可能会经常超时。 + Note that at least API level %1 is required. @@ -3025,13 +3025,6 @@ Login tokens expiration: %2 + %n other feeds. - - Welcome to %1. - -Please, check NEW stuff included in this -version by clicking this popup notification. - - Load initial set of feeds diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml index f1819f91e..905697c40 100755 --- a/resources/desktop/com.github.rssguard.appdata.xml +++ b/resources/desktop/com.github.rssguard.appdata.xml @@ -30,7 +30,7 @@ https://martinrotter.github.io/donate/ - + none diff --git a/resources/skins/dark/metadata.xml b/resources/skins/dark/metadata.xml index 71b241bae..5261a1691 100755 --- a/resources/skins/dark/metadata.xml +++ b/resources/skins/dark/metadata.xml @@ -1,7 +1,10 @@ - + Martin Rotter rotter.martinos@gmail.com + + #FFA07A + \ No newline at end of file diff --git a/resources/skins/vergilius/metadata.xml b/resources/skins/vergilius/metadata.xml index b10c2674b..d6d5acffe 100755 --- a/resources/skins/vergilius/metadata.xml +++ b/resources/skins/vergilius/metadata.xml @@ -1,7 +1,10 @@ - + Martin Rotter rotter.martinos@gmail.com + + #4891F0 + \ No newline at end of file diff --git a/src/librssguard/core/messagesmodel.cpp b/src/librssguard/core/messagesmodel.cpp index 614195ead..29e7c0c44 100644 --- a/src/librssguard/core/messagesmodel.cpp +++ b/src/librssguard/core/messagesmodel.cpp @@ -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: diff --git a/src/librssguard/librssguard.pro b/src/librssguard/librssguard.pro index d4533f982..da2caf724 100644 --- a/src/librssguard/librssguard.pro +++ b/src/librssguard/librssguard.pro @@ -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 diff --git a/src/librssguard/miscellaneous/skinfactory.cpp b/src/librssguard/miscellaneous/skinfactory.cpp index 8fd6b2110..be159bef9 100644 --- a/src/librssguard/miscellaneous/skinfactory.cpp +++ b/src/librssguard/miscellaneous/skinfactory.cpp @@ -11,8 +11,6 @@ SkinFactory::SkinFactory(QObject* parent) : QObject(parent) {} -SkinFactory::~SkinFactory() = default; - void SkinFactory::loadCurrentSkin() { QList 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 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 SkinFactory::installedSkins() const { return skins; } + +uint qHash(const Skin::PaletteColors& key) { + return uint(key); +} diff --git a/src/librssguard/miscellaneous/skinfactory.h b/src/librssguard/miscellaneous/skinfactory.h index f1da3ed72..754f47abe 100644 --- a/src/librssguard/miscellaneous/skinfactory.h +++ b/src/librssguard/miscellaneous/skinfactory.h @@ -5,10 +5,16 @@ #include +#include +#include #include #include 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 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