From 5a5b697fbe6615066713d56952dd543cded4355e Mon Sep 17 00:00:00 2001 From: igrekster Date: Fri, 28 Jan 2022 01:47:23 +1100 Subject: [PATCH] configure icon/skin themes early in startup (#611) After changing the icon theme some of the icons were still from my current system (Gentoo/KDE) icon theme. Moving the theme setup earlier in the startup fixed it. --- src/librssguard/miscellaneous/application.cpp | 6 ++++++ src/rssguard/main.cpp | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/librssguard/miscellaneous/application.cpp b/src/librssguard/miscellaneous/application.cpp index 41112e29b..b4a10a292 100644 --- a/src/librssguard/miscellaneous/application.cpp +++ b/src/librssguard/miscellaneous/application.cpp @@ -81,6 +81,12 @@ Application::Application(const QString& id, int& argc, char** argv) //: Name of translator - optional. QObject::tr("LANG_AUTHOR"); + // Add an extra path for non-system icon themes and set current icon theme + // and skin. + m_icons->setupSearchPaths(); + m_icons->loadCurrentIconTheme(); + m_skins->loadCurrentSkin(); + connect(this, &Application::aboutToQuit, this, &Application::onAboutToQuit); connect(this, &Application::commitDataRequest, this, &Application::onCommitData); connect(this, &Application::saveStateRequest, this, &Application::onSaveState); diff --git a/src/rssguard/main.cpp b/src/rssguard/main.cpp index 1798a643b..740b58fdc 100644 --- a/src/rssguard/main.cpp +++ b/src/rssguard/main.cpp @@ -74,12 +74,6 @@ int main(int argc, char* argv[]) { qRegisterMetaType>("QList"); qRegisterMetaType("Label*"); - // Add an extra path for non-system icon themes and set current icon theme - // and skin. - qApp->icons()->setupSearchPaths(); - qApp->icons()->loadCurrentIconTheme(); - qApp->skins()->loadCurrentSkin(); - // These settings needs to be set before any QSettings object. Application::setApplicationName(QSL(APP_NAME)); Application::setApplicationVersion(QSL(APP_VERSION));