X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtui.h;h=a6551a865ad59dbbbc81806308566bd3587ebf6d;hp=20c0d5353be60d213cc2bc55f0f7a65e095049ab;hb=20745bd0cbae035b84913127dfec9e8433d1282d;hpb=921e54680da16fcf2adb7a90506875aceb6633a4

diff --git a/src/qtui/qtui.h b/src/qtui/qtui.h
index 20c0d535..a6551a86 100644
--- a/src/qtui/qtui.h
+++ b/src/qtui/qtui.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,12 +18,19 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef QTUI_H
-#define QTUI_H
+#pragma once
 
-#include "graphicalui.h"
+#include <memory>
+#include <tuple>
+#include <vector>
+
+#include <QList>
+#include <QObject>
+#include <QString>
+#include <QTemporaryDir>
 
 #include "abstractnotificationbackend.h"
+#include "graphicalui.h"
 #include "qtuistyle.h"
 
 class MainWin;
@@ -40,15 +47,17 @@ class QtUi : public GraphicalUi
 
 public:
     QtUi();
-    ~QtUi();
+    ~QtUi() override;
 
-    MessageModel *createMessageModel(QObject *parent);
-    AbstractMessageProcessor *createMessageProcessor(QObject *parent);
+    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 */
@@ -59,38 +68,75 @@ public:
     static const QList<AbstractNotificationBackend *> &notificationBackends();
     static const QList<AbstractNotificationBackend::Notification> &activeNotifications();
 
+    /**
+     * Determine available fallback icon themes.
+     *
+     * @returns The list of supported fallback themes (Breeze (Dark), Oxygen) that are available on the system
+     */
+    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:
-    virtual void init();
+    void init() override;
 
     uint invokeNotification(BufferId bufId, AbstractNotificationBackend::NotificationType type, const QString &sender, const QString &text);
     void closeNotification(uint notificationId);
     void closeNotifications(BufferId bufferId = BufferId());
 
+    /**
+     * Refresh the current icon theme.
+     *
+     * @note This will not detect changes in the system icon theme, so if that changes, a client restart
+     *       is required for icons to work correctly.
+     */
+    void refreshIconTheme();
+
+signals:
+    void iconThemeRefreshed();
+
 protected slots:
-    void connectedToCore();
-    void disconnectedFromCore();
+    void connectedToCore() override;
+    void disconnectedFromCore() override;
     void notificationActivated(uint notificationId);
     void bufferMarkedAsRead(BufferId);
 
 protected:
-    virtual void minimizeRestore(bool show);
-    virtual bool isHidingMainWidgetAllowed() const;
+    void minimizeRestore(bool show) override;
+    bool isHidingMainWidgetAllowed() const override;
 
 private slots:
     void useSystemTrayChanged(const QVariant &);
 
 private:
-    static QtUi *_instance;
-    static MainWin *_mainWin;
+    /**
+     * Sets up icon theme handling.
+     */
+    void setupIconTheme();
+
+private:
     static QList<AbstractNotificationBackend *> _notificationBackends;
     static QList<AbstractNotificationBackend::Notification> _notifications;
 
+    std::unique_ptr<MainWin> _mainWin;
+
+    QString _systemIconTheme;
+
+    std::unique_ptr<QTemporaryDir> _dummyThemeDir;
+
     bool _useSystemTray;
 };
 
-
-QtUi *QtUi::instance() { return _instance ? _instance : new QtUi(); }
 QtUiStyle *QtUi::style() { return qobject_cast<QtUiStyle *>(uiStyle()); }
-MainWin *QtUi::mainWindow() { return _mainWin; }
-
-#endif
+MainWin *QtUi::mainWindow() { return instance()->_mainWin.get(); }