From 1d862fdd2b2ab74078e1bd9a28ada07b7e922804 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Mon, 20 Apr 2020 09:04:39 +0200
Subject: [PATCH] Enhancements to icon theme, defaults on linux to default icon
 theme.

---
 src/librssguard/definitions/definitions.h     |  6 ++++++
 src/librssguard/gui/settings/settingsgui.cpp  |  6 +++++-
 src/librssguard/miscellaneous/iconfactory.cpp | 13 ++++++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 src/librssguard/gui/settings/settingsgui.cpp

diff --git a/src/librssguard/definitions/definitions.h b/src/librssguard/definitions/definitions.h
index c98553915..49506ef54 100755
--- a/src/librssguard/definitions/definitions.h
+++ b/src/librssguard/definitions/definitions.h
@@ -128,7 +128,13 @@
 #define APP_SKIN_DEFAULT    "vergilius"
 #define APP_SKIN_METADATA_FILE "metadata.xml"
 #define APP_STYLE_DEFAULT   "Fusion"
+
+#if defined(Q_OS_LINUX)
+#define APP_THEME_DEFAULT   ""
+#else
 #define APP_THEME_DEFAULT   "Faenza"
+#endif
+
 #define APP_NO_THEME        ""
 #define APP_THEME_SUFFIX    ".png"
 
diff --git a/src/librssguard/gui/settings/settingsgui.cpp b/src/librssguard/gui/settings/settingsgui.cpp
old mode 100644
new mode 100755
index 984616954..629a0c424
--- a/src/librssguard/gui/settings/settingsgui.cpp
+++ b/src/librssguard/gui/settings/settingsgui.cpp
@@ -103,7 +103,11 @@ void SettingsGui::loadSettings() {
     if (icon_theme_name == APP_NO_THEME) {
       // Add just "no theme" on other systems.
       //: Label for disabling icon theme.
-      m_ui->m_cmbIconTheme->addItem(tr("no icon theme/system icon theme"), APP_NO_THEME);
+#if defined(Q_OS_LINUX)
+      m_ui->m_cmbIconTheme->addItem(tr("system icon theme"), APP_NO_THEME);
+#else
+      m_ui->m_cmbIconTheme->addItem(tr("no icon theme"), APP_NO_THEME);
+#endif
     }
     else {
       m_ui->m_cmbIconTheme->addItem(icon_theme_name, icon_theme_name);
diff --git a/src/librssguard/miscellaneous/iconfactory.cpp b/src/librssguard/miscellaneous/iconfactory.cpp
index 5683aa023..d980ecce9 100755
--- a/src/librssguard/miscellaneous/iconfactory.cpp
+++ b/src/librssguard/miscellaneous/iconfactory.cpp
@@ -85,17 +85,24 @@ void IconFactory::loadCurrentIconTheme() {
   }
   else {
     // Desired icon theme is not currently available.
-    // Install "default" icon theme instead.
-    qWarning("Icon theme '%s' cannot be loaded because it is not installed. No icon theme (or default/system icon theme) is loaded now.",
+    // Activate "default" or "no" icon theme instead.
+#if defined(Q_OS_LINUX)
+    qWarning("Icon theme '%s' cannot be loaded. Activating \"system default\" icon theme.",
+             qPrintable(theme_name_from_settings));
+#else
+    qWarning("Icon theme '%s' cannot be loaded because it is not installed. Activating \"no\" icon theme.",
              qPrintable(theme_name_from_settings));
     QIcon::setThemeName(APP_NO_THEME);
+#endif
   }
 }
 
 QStringList IconFactory::installedIconThemes() const {
   QStringList icon_theme_names;
 
-  icon_theme_names << APP_NO_THEME; //<< QSL("Faenza");
+#if !defined(Q_OS_LINUX)
+  icon_theme_names << APP_NO_THEME;
+#endif
 
   // Iterate all directories with icon themes.
   QStringList icon_themes_paths = QIcon::themeSearchPaths();