From 932ab289c1482a8069cc320a16aca9216058523a Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 18 Jun 2018 23:04:30 +0200
Subject: [PATCH] icons: Override system icon theme by default

Preliminary reports from the field are in, and apparently the
fallback theme handling is too fragile to unleash it onto
unsuspecting users, due to bugs in Qt, desktop environments and
just plain stupid desktop themes.

Override by default to get a consistent look of Quassel in most
cases. Users can still actively choose the other way.
---
 src/qtui/qtui.cpp                                | 2 +-
 src/qtui/settingspages/appearancesettingspage.ui | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp
index a37bc404..d899ba8e 100644
--- a/src/qtui/qtui.cpp
+++ b/src/qtui/qtui.cpp
@@ -345,7 +345,7 @@ void QtUi::refreshIconTheme()
         }
     }
 
-    if (_systemIconTheme.isEmpty() || _systemIconTheme == fallbackTheme || s.value("Icons/OverrideSystemTheme", false).toBool()) {
+    if (_systemIconTheme.isEmpty() || _systemIconTheme == fallbackTheme || s.value("Icons/OverrideSystemTheme", true).toBool()) {
         // We have a valid fallback theme and want to override the system theme (if it's even defined), so we're basically done
         QIcon::setThemeName(fallbackTheme);
         emit iconThemeRefreshed();
diff --git a/src/qtui/settingspages/appearancesettingspage.ui b/src/qtui/settingspages/appearancesettingspage.ui
index 03383535..26f29d1a 100644
--- a/src/qtui/settingspages/appearancesettingspage.ui
+++ b/src/qtui/settingspages/appearancesettingspage.ui
@@ -90,13 +90,13 @@
         <string>Override system theme</string>
        </property>
        <property name="checked">
-        <bool>false</bool>
+        <bool>true</bool>
        </property>
        <property name="settingsKey" stdset="0">
         <string notr="true">/UiStyle/Icons/OverrideSystemTheme</string>
        </property>
        <property name="defaultValue" stdset="0">
-        <bool>false</bool>
+        <bool>true</bool>
        </property>
       </widget>
      </item>
-- 
2.20.1