X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtui.cpp;h=d899ba8e5858e1422843d1320ea72e896eb6db51;hp=2cfc810260678ea0312506788a4dd29beef759e7;hb=932ab289c1482a8069cc320a16aca9216058523a;hpb=9f0918fca1d858523104435690e5094bfe6244b7

diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp
index 2cfc8102..d899ba8e 100644
--- a/src/qtui/qtui.cpp
+++ b/src/qtui/qtui.cpp
@@ -30,6 +30,7 @@
 #include "buffermodel.h"
 #include "chatlinemodel.h"
 #include "contextmenuactionprovider.h"
+#include "icon.h"
 #include "mainwin.h"
 #include "qtuimessageprocessor.h"
 #include "qtuisettings.h"
@@ -64,7 +65,7 @@ QtUi::QtUi()
 
     setupIconTheme();
 
-    QApplication::setWindowIcon(QIcon::fromTheme("quassel"));
+    QApplication::setWindowIcon(icon::get("quassel"));
 
     setContextMenuActionProvider(new ContextMenuActionProvider(this));
     setToolBarActionProvider(new ToolBarActionProvider(this));
@@ -273,7 +274,9 @@ std::vector<std::pair<QString, QString>> QtUi::availableIconThemes() const
     static const std::vector<std::pair<QString, QString>> supported {
         { "breeze", tr("Breeze") },
         { "breeze-dark", tr("Breeze Dark") },
+#ifdef WITH_OXYGEN_ICONS
         { "oxygen", tr("Oxygen") }
+#endif
     };
 
     std::vector<std::pair<QString, QString>> result;
@@ -290,6 +293,12 @@ std::vector<std::pair<QString, QString>> QtUi::availableIconThemes() const
 }
 
 
+QString QtUi::systemIconTheme() const
+{
+    return _systemIconTheme;
+}
+
+
 void QtUi::setupIconTheme()
 {
     // Add paths to our own icon sets to the theme search paths
@@ -336,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();