projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Annual AboutDlg bump
[quassel.git]
/
src
/
qtui
/
systemtray.h
diff --git
a/src/qtui/systemtray.h
b/src/qtui/systemtray.h
index
b2b0afb
..
dc31edc
100644
(file)
--- a/
src/qtui/systemtray.h
+++ b/
src/qtui/systemtray.h
@@
-27,6
+27,7
@@
class QMenu;
class SystemTray : public QObject {
Q_OBJECT
class SystemTray : public QObject {
Q_OBJECT
+ Q_ENUMS(State Mode MessageIcon ActivationReason)
public:
enum State {
public:
enum State {
@@
-58,7
+59,7
@@
public:
MiddleClick
};
MiddleClick
};
-
SystemTray(QObject *parent = 0
);
+
explicit SystemTray(QWidget *parent
);
virtual ~SystemTray();
virtual void init() {}
virtual ~SystemTray();
virtual void init() {}
@@
-67,8
+68,9
@@
public:
virtual inline bool isSystemTrayAvailable() const;
void setAlert(bool alerted);
virtual inline bool isSystemTrayAvailable() const;
void setAlert(bool alerted);
- inline void setInhibitActivation();
- inline bool isActivationInhibited() const;
+ virtual inline bool isVisible() const { return false; }
+
+ QWidget *associatedWidget() const;
public slots:
virtual void setState(State);
public slots:
virtual void setState(State);
@@
-82,6
+84,9
@@
signals:
void toolTipChanged(const QString &title, const QString &subtitle);
void messageClicked();
void toolTipChanged(const QString &title, const QString &subtitle);
void messageClicked();
+protected slots:
+ virtual void activate(SystemTray::ActivationReason = Trigger);
+
protected:
virtual void setMode(Mode mode);
inline Mode mode() const;
protected:
virtual void setMode(Mode mode);
inline Mode mode() const;
@@
-93,28
+98,23
@@
protected:
inline QMenu *trayMenu() const;
void setTrayMenu(QMenu *);
inline QMenu *trayMenu() const;
void setTrayMenu(QMenu *);
- virtual bool eventFilter(QObject *obj, QEvent *event);
-
private slots:
private:
Mode _mode;
State _state;
private slots:
private:
Mode _mode;
State _state;
- bool _inhibitActivation;
-
QString _toolTipTitle, _toolTipSubTitle;
Icon _passiveIcon, _activeIcon, _needsAttentionIcon;
QMenu *_trayMenu;
QString _toolTipTitle, _toolTipSubTitle;
Icon _passiveIcon, _activeIcon, _needsAttentionIcon;
QMenu *_trayMenu;
+ QWidget *_associatedWidget;
};
// inlines
bool SystemTray::isSystemTrayAvailable() const { return false; }
bool SystemTray::isAlerted() const { return state() == NeedsAttention; }
};
// inlines
bool SystemTray::isSystemTrayAvailable() const { return false; }
bool SystemTray::isAlerted() const { return state() == NeedsAttention; }
-void SystemTray::setInhibitActivation() { _inhibitActivation = true; }
-bool SystemTray::isActivationInhibited() const { return _inhibitActivation; }
SystemTray::Mode SystemTray::mode() const { return _mode; }
SystemTray::State SystemTray::state() const { return _state; }
QMenu *SystemTray::trayMenu() const { return _trayMenu; }
SystemTray::Mode SystemTray::mode() const { return _mode; }
SystemTray::State SystemTray::state() const { return _state; }
QMenu *SystemTray::trayMenu() const { return _trayMenu; }