projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use SystemTray in MainWin and notification backends
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
4d16825
..
000e570
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-42,7
+42,7
@@
class BufferWidget;
class InputWidget;
class MsgProcessorStatusWidget;
class NickListWidget;
class InputWidget;
class MsgProcessorStatusWidget;
class NickListWidget;
-class SystemTray
Icon
;
+class SystemTray;
class QMenu;
class QLabel;
class QMenu;
class QLabel;
@@
-68,7
+68,7
@@
class MainWin
void addBufferView(ClientBufferViewConfig *config);
BufferView *allBuffersView() const;
void addBufferView(ClientBufferViewConfig *config);
BufferView *allBuffersView() const;
- inline
QSystemTrayIcon *systemTrayIcon
() const;
+ inline
SystemTray *systemTray
() const;
virtual bool event(QEvent *event);
virtual bool event(QEvent *event);
@@
-134,7
+134,6
@@
class MainWin
KHelpMenu *_kHelpMenu;
#endif
KHelpMenu *_kHelpMenu;
#endif
- QMenu *systrayMenu;
QLabel *coreLagLabel;
QLabel *sslLabel;
MsgProcessorStatusWidget *msgProcessorStatusWidget;
QLabel *coreLagLabel;
QLabel *sslLabel;
MsgProcessorStatusWidget *msgProcessorStatusWidget;
@@
-158,7
+157,7
@@
class MainWin
void toggleMinimizedToTray();
void enableMenus();
void toggleMinimizedToTray();
void enableMenus();
-
QSystemTrayIcon *_trayIcon
;
+
SystemTray *_systemTray
;
QList<BufferViewDock *> _bufferViews;
BufferWidget *_bufferWidget;
QList<BufferViewDock *> _bufferViews;
BufferWidget *_bufferWidget;
@@
-173,8
+172,8
@@
class MainWin
friend class QtUi;
};
friend class QtUi;
};
-
QSystemTrayIcon *MainWin::systemTrayIcon
() const {
- return _
trayIcon
;
+
SystemTray *MainWin::systemTray
() const {
+ return _
systemTray
;
}
#endif
}
#endif