X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtui.h;h=0e3cad7c47017c23fa370a48df809824e76e2455;hp=437cc1530fa9734f9c98d766707e33e94144cdb0;hb=911f181e0e179eb51279c0880eb701a43163b8b5;hpb=7582ce11d6fb8b5123f7ac4794c57e981a634e93

diff --git a/src/qtui/qtui.h b/src/qtui/qtui.h
index 437cc153..0e3cad7c 100644
--- a/src/qtui/qtui.h
+++ b/src/qtui/qtui.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2010 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  *
@@ -15,15 +15,23 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   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 <QStringList>
+
+#if QT_VERSION >= 0x050000
+#  include <QTemporaryDir>
+#endif
 
 #include "abstractnotificationbackend.h"
+#include "graphicalui.h"
 #include "qtuistyle.h"
 
 class MainWin;
@@ -34,61 +42,104 @@ class QtUiMessageProcessor;
 /** This is basically a wrapper around MainWin, which is necessary because we cannot derive MainWin
  *  from both QMainWindow and AbstractUi (because of multiple inheritance of QObject).
  */
-class QtUi : public GraphicalUi {
-  Q_OBJECT
+class QtUi : public GraphicalUi
+{
+    Q_OBJECT
 
 public:
-  QtUi();
-  ~QtUi();
+    QtUi();
+    ~QtUi();
+
+    MessageModel *createMessageModel(QObject *parent) override;
+    AbstractMessageProcessor *createMessageProcessor(QObject *parent) override;
+
+    inline static QtUi *instance();
+    inline static QtUiStyle *style();
+    inline static MainWin *mainWindow();
+
+    static bool haveSystemTray();
+
+    /* Notifications */
+
+    static void registerNotificationBackend(AbstractNotificationBackend *);
+    static void unregisterNotificationBackend(AbstractNotificationBackend *);
+    static void unregisterAllNotificationBackends();
+    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;
 
-  MessageModel *createMessageModel(QObject *parent);
-  AbstractMessageProcessor *createMessageProcessor(QObject *parent);
-
-  inline static QtUi *instance();
-  inline static QtUiStyle *style();
-  inline static MainWin *mainWindow();
-
-  static bool haveSystemTray();
-
-  /* Notifications */
+public slots:
+    void init() override;
 
-  static void registerNotificationBackend(AbstractNotificationBackend *);
-  static void unregisterNotificationBackend(AbstractNotificationBackend *);
-  static void unregisterAllNotificationBackends();
-  static const QList<AbstractNotificationBackend *> &notificationBackends();
-  static const QList<AbstractNotificationBackend::Notification> &activeNotifications();
+    uint invokeNotification(BufferId bufId, AbstractNotificationBackend::NotificationType type, const QString &sender, const QString &text);
+    void closeNotification(uint notificationId);
+    void closeNotifications(BufferId bufferId = BufferId());
 
-public slots:
-  virtual void init();
+    /**
+     * 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();
 
-  uint invokeNotification(BufferId bufId, AbstractNotificationBackend::NotificationType type, const QString &sender, const QString &text);
-  void closeNotification(uint notificationId);
-  void closeNotifications(BufferId bufferId = BufferId());
+signals:
+    void iconThemeRefreshed();
 
 protected slots:
-  void connectedToCore();
-  void disconnectedFromCore();
-  void notificationActivated(uint notificationId);
-  void bufferMarkedAsRead(BufferId);
+    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 &);
+    void useSystemTrayChanged(const QVariant &);
+
+private:
+    /**
+     * Sets up icon theme handling.
+     */
+    void setupIconTheme();
 
 private:
-  static QtUi *_instance;
-  static MainWin *_mainWin;
-  static QList<AbstractNotificationBackend *> _notificationBackends;
-  static QList<AbstractNotificationBackend::Notification> _notifications;
+    static QtUi *_instance;
+    static MainWin *_mainWin;
+    static QList<AbstractNotificationBackend *> _notificationBackends;
+    static QList<AbstractNotificationBackend::Notification> _notifications;
 
-  bool _useSystemTray;
+    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()); }
+QtUiStyle *QtUi::style() { return qobject_cast<QtUiStyle *>(uiStyle()); }
 MainWin *QtUi::mainWindow() { return _mainWin; }
-
-#endif