projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor the system tray's context menu
[quassel.git]
/
src
/
qtui
/
systemtray.h
diff --git
a/src/qtui/systemtray.h
b/src/qtui/systemtray.h
index
dc31edc
..
df79ddf
100644
(file)
--- a/
src/qtui/systemtray.h
+++ b/
src/qtui/systemtray.h
@@
-23,6
+23,7
@@
#include "icon.h"
#include "icon.h"
+class Action;
class QMenu;
class SystemTray : public QObject {
class QMenu;
class SystemTray : public QObject {
@@
-61,7
+62,7
@@
public:
explicit SystemTray(QWidget *parent);
virtual ~SystemTray();
explicit SystemTray(QWidget *parent);
virtual ~SystemTray();
- virtual void init()
{}
+ virtual void init()
;
inline State state() const;
inline bool isAlerted() const;
inline State state() const;
inline bool isAlerted() const;
@@
-96,9
+97,10
@@
protected:
inline QString toolTipTitle() const;
inline QString toolTipSubTitle() const;
inline QMenu *trayMenu() const;
inline QString toolTipTitle() const;
inline QString toolTipSubTitle() const;
inline QMenu *trayMenu() const;
- void setTrayMenu(QMenu *);
private slots:
private slots:
+ void minimizeRestore();
+ void trayMenuAboutToShow();
private:
Mode _mode;
private:
Mode _mode;
@@
-109,6
+111,7
@@
private:
QMenu *_trayMenu;
QWidget *_associatedWidget;
QMenu *_trayMenu;
QWidget *_associatedWidget;
+ Action *_minimizeRestoreAction;
};
// inlines
};
// inlines