From 44193043959e1b49e8d6e74701aa54f164323a44 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Tue, 10 May 2016 07:16:59 +0200
Subject: [PATCH] Icon theme tweaks.

---
 resources/text/CHANGELOG          | 8 ++++++++
 src/definitions/definitions.h.in  | 2 +-
 src/gui/dialogs/formsettings.cpp  | 2 +-
 src/miscellaneous/iconfactory.cpp | 3 +--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index 9e6f38647..3b6638a21 100755
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -1,6 +1,14 @@
 3.2.2
 —————
 
+Changed:
+
+▪ Some minor tweaks for default icon theme loading.
+
+
+3.2.2
+—————
+
 Added:
 
 ▪ RSS Guard now supports system-wide icon themes and on Windows -> built-in Faenza theme was tweaked.
diff --git a/src/definitions/definitions.h.in b/src/definitions/definitions.h.in
index f60e044c2..9f27f0ca3 100755
--- a/src/definitions/definitions.h.in
+++ b/src/definitions/definitions.h.in
@@ -144,7 +144,7 @@
 #define APP_IS_RUNNING      "app_is_running"
 #define APP_SKIN_DEFAULT    "base/vergilius.xml"
 #define APP_THEME_DEFAULT   "Faenza"
-#define APP_NO_THEME        "-"
+#define APP_NO_THEME        ""
 #define APP_THEME_SUFFIX    ".png"
 
 #ifndef QSL
diff --git a/src/gui/dialogs/formsettings.cpp b/src/gui/dialogs/formsettings.cpp
index a653fcd42..67223d057 100755
--- a/src/gui/dialogs/formsettings.cpp
+++ b/src/gui/dialogs/formsettings.cpp
@@ -718,7 +718,7 @@ void FormSettings::loadInterface() {
     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"), APP_NO_THEME);
+      m_ui->m_cmbIconTheme->addItem(tr("no icon theme/system icon theme"), APP_NO_THEME);
     }
     else {
       m_ui->m_cmbIconTheme->addItem(icon_theme_name, icon_theme_name);
diff --git a/src/miscellaneous/iconfactory.cpp b/src/miscellaneous/iconfactory.cpp
index c235c7faf..9d9d91a9c 100755
--- a/src/miscellaneous/iconfactory.cpp
+++ b/src/miscellaneous/iconfactory.cpp
@@ -111,7 +111,7 @@ void IconFactory::loadCurrentIconTheme() {
   else {
     // Desired icon theme is not currently available.
     // Install "default" icon theme instead.
-    qDebug("Icon theme '%s' cannot be loaded because it is not installed. No icon theme is loaded now.",
+    qDebug("Icon theme '%s' cannot be loaded because it is not installed. No icon theme (or default icon theme) is loaded now.",
            qPrintable(theme_name_from_settings));
     QIcon::setThemeName(APP_NO_THEME);
   }
@@ -144,7 +144,6 @@ QStringList IconFactory::installedIconThemes() const {
   }
 
   icon_theme_names.removeDuplicates();
-  icon_theme_names.removeAll(QString());
 
   return icon_theme_names;
 }