X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtui.h;h=a6551a865ad59dbbbc81806308566bd3587ebf6d;hp=e54fb244d9ab5dd8f3d1682190b7ebf85393db95;hb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24;hpb=9f0918fca1d858523104435690e5094bfe6244b7

diff --git a/src/qtui/qtui.h b/src/qtui/qtui.h
index e54fb244..a6551a86 100644
--- a/src/qtui/qtui.h
+++ b/src/qtui/qtui.h
@@ -24,11 +24,10 @@
 #include <tuple>
 #include <vector>
 
-#include <QStringList>
-
-#if QT_VERSION >= 0x050000
-#  include <QTemporaryDir>
-#endif
+#include <QList>
+#include <QObject>
+#include <QString>
+#include <QTemporaryDir>
 
 #include "abstractnotificationbackend.h"
 #include "graphicalui.h"
@@ -48,15 +47,17 @@ class QtUi : public GraphicalUi
 
 public:
     QtUi();
-    ~QtUi();
+    ~QtUi() override;
 
     MessageModel *createMessageModel(QObject *parent) override;
     AbstractMessageProcessor *createMessageProcessor(QObject *parent) override;
 
-    inline static QtUi *instance();
+    static QtUi *instance();
     inline static QtUiStyle *style();
     inline static MainWin *mainWindow();
 
+    QString debugLog() const;
+
     static bool haveSystemTray();
 
     /* Notifications */
@@ -74,6 +75,19 @@ public:
      */
     std::vector<std::pair<QString, QString>> availableIconThemes() const;
 
+    /**
+     * Determine the system icon theme set when Quassel was started.
+     *
+     * This property stores the icon theme initially configured in Qt when starting up (may be empty on platforms
+     * not supporting system icon themes). If the --icontheme option is given, uses that.
+     *
+     * Since Qt does not support notifications on theme changes, this property will not be updated when the theme
+     * changes at runtime.
+     *
+     * @returns The system icon theme at startup time
+     */
+    QString systemIconTheme() const;
+
 public slots:
     void init() override;
 
@@ -112,21 +126,17 @@ private:
     void setupIconTheme();
 
 private:
-    static QtUi *_instance;
-    static MainWin *_mainWin;
     static QList<AbstractNotificationBackend *> _notificationBackends;
     static QList<AbstractNotificationBackend::Notification> _notifications;
 
+    std::unique_ptr<MainWin> _mainWin;
+
     QString _systemIconTheme;
 
-#if QT_VERSION >= 0x050000
     std::unique_ptr<QTemporaryDir> _dummyThemeDir;
-#endif
 
     bool _useSystemTray;
 };
 
-
-QtUi *QtUi::instance() { return _instance ? _instance : new QtUi(); }
 QtUiStyle *QtUi::style() { return qobject_cast<QtUiStyle *>(uiStyle()); }
-MainWin *QtUi::mainWindow() { return _mainWin; }
+MainWin *QtUi::mainWindow() { return instance()->_mainWin.get(); }