Icon theming moved from main to KokoVP class. Theme name are read fro…

…m config file, empty line interprets as using system theme
brainrom · Sep 4, 2024 · 0a94a09 · 0a94a09
1 parent 6a06357
commit 0a94a09
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/kokovp.cpp b/kokovp.cpp
@@ -65,6 +65,8 @@ KokoVP::KokoVP(QWidget *parent)
     assert(!inst);
     inst = this;
 
+    QIcon::setFallbackThemeName("kokovp-default");
+
     playerWidget = new PlayerWidget(this);
     player = new PlayerController(playerWidget);
     pref = new PrefDialog();
@@ -416,6 +418,10 @@ void KokoVP::readConfig()
 
     player->setOption("alang", Config::i().get("tracks/alang").toStringList());
     player->setOption("slang", Config::i().get("tracks/slang").toStringList());
+
+    QString icon_theme = Config::i().get("misc/icon_theme", "").toString();
+    if (!icon_theme.isEmpty())
+        QIcon::setThemeName(icon_theme);
 }
 
 void KokoVP::insertActionsMap(QAction *action)

diff --git a/main.cpp b/main.cpp
@@ -22,7 +22,6 @@
 #include <QLibraryInfo>
 #include <QDir>
 #include <QCommandLineParser>
-#include <QIcon>
 
 #include "singleinstance.h"
 
@@ -53,9 +52,6 @@ int main(int argc, char *argv[])
     if (translator.load(sysLocale, "KokoVP_", QString(), ":/i18n"))
         a.installTranslator(&translator);
 
-    QIcon::setFallbackSearchPaths(QIcon::fallbackSearchPaths() << ":/icons");
-    QIcon::setFallbackThemeName("kokovp-default");
-
     SingleInstance inst("KokoVP", &a);
 
     if (!parser.isSet(newInstanceOption))