Add (config file only) option to use user's icon theme. Linux only.

ChangeLog

@@ -3,6 +3,9 @@
 1. Re-add all album sorts from Cantata 1.x
 2. Try to detect DLNA streams (e.g. when using upmpdcli), and show as regular
    albums in grouped view.
+3. Add option to use user's configured icon theme, and not Cantata's supplied
+   theme. Option needs to be manually set in config file. See README for
+   details.
 
 2.0.0
 -----

README

@@ -476,6 +476,11 @@ seekStep=<Integer>
     Configure seek time when Ctrl+Arrow keys is used.
     Default is 5. (Values 2..60 are acceptable)
 
+useStandardIcons=<Boolean>
+    If set to true, then Cantata will use icons from the user's configured icon
+    theme, and not its own icons.
+    Default is false.
+
 e.g.
 [General]
 maxCoverUpdatePerIteration=10
@@ -490,7 +495,7 @@ menu=3
 stopHttpStreamOnPause=true
 cacheScaledCovers=true
 seekStep=5
-
+useStandardIcons=true
 
 8. CUE Files
 ============

gui/application_qt.cpp

@@ -32,8 +32,10 @@
 static void setupIconTheme(Application *app)
 {
     if (Utils::KDE!=Utils::currentDe() || QLatin1String("breeze")==QIcon::themeName()) {
-        QIcon::setThemeSearchPaths(QStringList() << CANTATA_SYS_ICONS_DIR << QIcon::themeSearchPaths());
-        QIcon::setThemeName(QLatin1String("cantata"));
+        if (!Settings::self()->useStandardIcons()) {
+            QIcon::setThemeSearchPaths(QStringList() << CANTATA_SYS_ICONS_DIR << QIcon::themeSearchPaths());
+            QIcon::setThemeName(QLatin1String("cantata"));
+        }
         if (Utils::KDE!=Utils::currentDe()) {
             app->setAttribute(Qt::AA_DontShowIconsInMenus, true);
         }

gui/settings.cpp

@@ -739,6 +739,13 @@ bool Settings::mpris()
     return cfg.get("mpris", true);
 }
 
+#ifdef Q_OS_LINUX
+bool Settings::useStandardIcons()
+{
+    return cfg.get("useStandardIcons", false);
+}
+#endif
+
 void Settings::removeConnectionDetails(const QString &v)
 {
     if (v==currentConnection()) {

gui/settings.h

@@ -161,6 +161,9 @@ public:
     bool retinaSupport();
     QSet<QString> ignorePrefixes();
     bool mpris();
+    #ifdef Q_OS_LINUX
+    bool useStandardIcons();
+    #endif
 
     void removeConnectionDetails(const QString &v);
     void saveConnectionDetails(const MPDConnectionDetails &v);