diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml index 76d8d06ed..d12ea4713 100644 --- a/resources/desktop/com.github.rssguard.appdata.xml +++ b/resources/desktop/com.github.rssguard.appdata.xml @@ -26,7 +26,7 @@ https://github.com/sponsors/martinrotter - + none diff --git a/src/librssguard/miscellaneous/skinfactory.cpp b/src/librssguard/miscellaneous/skinfactory.cpp index e82cf86bf..43fbe87f3 100644 --- a/src/librssguard/miscellaneous/skinfactory.cpp +++ b/src/librssguard/miscellaneous/skinfactory.cpp @@ -65,6 +65,13 @@ void SkinFactory::loadSkinFromData(const Skin& skin) { qWarningNN << LOGSEC_GUI << "Respecting forced style(s):\n" << " QT_STYLE_OVERRIDE: " QUOTE_NO_SPACE(env_forced_style) << "\n" << " CLI (-style): " QUOTE_NO_SPACE(cli_forced_style); + + if (!cli_forced_style.isEmpty()) { + style_name = cli_forced_style; + } + else if (!env_forced_style.isEmpty()) { + style_name = env_forced_style; + } } if (isStyleGoodForDarkVariant(style_name) && diff --git a/src/librssguard/services/abstract/rootitem.h b/src/librssguard/services/abstract/rootitem.h index 63548be3a..119e0c4d0 100644 --- a/src/librssguard/services/abstract/rootitem.h +++ b/src/librssguard/services/abstract/rootitem.h @@ -206,9 +206,10 @@ class RSSGUARD_DLLSPEC RootItem : public QObject { // automatically sorted and are always sorted by title. // // Sort order number cannot be negative but order of list of items with same - // parent does not have to form continuous series, for example: + // parent MUST form continuous series AND start with zero, for example: // 0, 1, 2, 3, 4, ... - // 5, 7, 12, 13, 19 + // + // NOTE: This is checked with DatabaseQueries::fixupOrders() method on app startup. int sortOrder() const; void setSortOrder(int sort_order);