projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qtui: Fix icons in the AboutDlg
[quassel.git]
/
src
/
qtui
/
qtui.h
diff --git
a/src/qtui/qtui.h
b/src/qtui/qtui.h
index
20c0d53
..
0d13e64
100644
(file)
--- a/
src/qtui/qtui.h
+++ b/
src/qtui/qtui.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
5
by the Quassel Project *
+ * Copyright (C) 2005-201
8
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-18,12
+18,20
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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 "abstractnotificationbackend.h"
+#include "graphicalui.h"
#include "qtuistyle.h"
class MainWin;
#include "qtuistyle.h"
class MainWin;
@@
-42,8
+50,8
@@
public:
QtUi();
~QtUi();
QtUi();
~QtUi();
- MessageModel *createMessageModel(QObject *parent);
- AbstractMessageProcessor *createMessageProcessor(QObject *parent);
+ MessageModel *createMessageModel(QObject *parent)
override
;
+ AbstractMessageProcessor *createMessageProcessor(QObject *parent)
override
;
inline static QtUi *instance();
inline static QtUiStyle *style();
inline static QtUi *instance();
inline static QtUiStyle *style();
@@
-59,32
+67,59
@@
public:
static const QList<AbstractNotificationBackend *> ¬ificationBackends();
static const QList<AbstractNotificationBackend::Notification> &activeNotifications();
static const QList<AbstractNotificationBackend *> ¬ificationBackends();
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;
+
public slots:
public slots:
- v
irtual void init()
;
+ v
oid init() override
;
uint invokeNotification(BufferId bufId, AbstractNotificationBackend::NotificationType type, const QString &sender, const QString &text);
void closeNotification(uint notificationId);
void closeNotifications(BufferId bufferId = BufferId());
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();
+
protected slots:
protected slots:
- void connectedToCore();
- void disconnectedFromCore();
+ void connectedToCore()
override
;
+ void disconnectedFromCore()
override
;
void notificationActivated(uint notificationId);
void bufferMarkedAsRead(BufferId);
protected:
void notificationActivated(uint notificationId);
void bufferMarkedAsRead(BufferId);
protected:
- v
irtual void minimizeRestore(bool show)
;
-
virtual bool isHidingMainWidgetAllowed() const
;
+ v
oid minimizeRestore(bool show) override
;
+
bool isHidingMainWidgetAllowed() const override
;
private slots:
void useSystemTrayChanged(const QVariant &);
private slots:
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;
private:
static QtUi *_instance;
static MainWin *_mainWin;
static QList<AbstractNotificationBackend *> _notificationBackends;
static QList<AbstractNotificationBackend::Notification> _notifications;
+ QString _systemIconTheme;
+
+#if QT_VERSION >= 0x050000
+ std::unique_ptr<QTemporaryDir> _dummyThemeDir;
+#endif
+
bool _useSystemTray;
};
bool _useSystemTray;
};
@@
-92,5
+127,3
@@
private:
QtUi *QtUi::instance() { return _instance ? _instance : new QtUi(); }
QtUiStyle *QtUi::style() { return qobject_cast<QtUiStyle *>(uiStyle()); }
MainWin *QtUi::mainWindow() { return _mainWin; }
QtUi *QtUi::instance() { return _instance ? _instance : new QtUi(); }
QtUiStyle *QtUi::style() { return qobject_cast<QtUiStyle *>(uiStyle()); }
MainWin *QtUi::mainWindow() { return _mainWin; }
-
-#endif