X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtui.h;h=907fb31b4702df2209cdb1fb3e50052a6cd58d8a;hp=96e934f170e7af6d949976b4321d684f548dea50;hb=c27d5bfbe80bfeb583a25404f4ccee4b70b010e0;hpb=ca31d8d669faaf6041d270f16b4006972f058f07 diff --git a/src/qtui/qtui.h b/src/qtui/qtui.h index 96e934f1..907fb31b 100644 --- a/src/qtui/qtui.h +++ b/src/qtui/qtui.h @@ -18,12 +18,22 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef QTUI_H -#define QTUI_H +#pragma once -#include "graphicalui.h" +#include +#include +#include + +#include +#include +#include + +#if QT_VERSION >= 0x050000 +# include +#endif #include "abstractnotificationbackend.h" +#include "graphicalui.h" #include "qtuistyle.h" class MainWin; @@ -49,6 +59,8 @@ public: inline static QtUiStyle *style(); inline static MainWin *mainWindow(); + QString debugLog() const; + static bool haveSystemTray(); /* Notifications */ @@ -59,6 +71,26 @@ public: static const QList ¬ificationBackends(); static const QList &activeNotifications(); + /** + * Determine available fallback icon themes. + * + * @returns The list of supported fallback themes (Breeze (Dark), Oxygen) that are available on the system + */ + std::vector> 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; @@ -66,6 +98,17 @@ public slots: 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() override; void disconnectedFromCore() override; @@ -79,12 +122,24 @@ protected: private slots: void useSystemTrayChanged(const QVariant &); +private: + /** + * Sets up icon theme handling. + */ + void setupIconTheme(); + private: static QtUi *_instance; static MainWin *_mainWin; static QList _notificationBackends; static QList _notifications; + QString _systemIconTheme; + +#if QT_VERSION >= 0x050000 + std::unique_ptr _dummyThemeDir; +#endif + bool _useSystemTray; }; @@ -92,5 +147,3 @@ private: QtUi *QtUi::instance() { return _instance ? _instance : new QtUi(); } QtUiStyle *QtUi::style() { return qobject_cast(uiStyle()); } MainWin *QtUi::mainWindow() { return _mainWin; } - -#endif