projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce a notification type and add extra notifications for KNotify
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
fdd8c5e
..
76bf35e
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-36,12
+36,13
@@
class ActionCollection;
class BufferView;
class BufferViewConfig;
class ActionCollection;
class BufferView;
class BufferViewConfig;
+class ClientBufferViewConfig;
class BufferViewDock;
class BufferWidget;
class InputWidget;
class MsgProcessorStatusWidget;
class NickListWidget;
class BufferViewDock;
class BufferWidget;
class InputWidget;
class MsgProcessorStatusWidget;
class NickListWidget;
-class SystemTray
Icon
;
+class SystemTray;
class QMenu;
class QLabel;
class QMenu;
class QLabel;
@@
-64,10
+65,10
@@
class MainWin
void init();
void init();
- void addBufferView(BufferViewConfig *config);
+ void addBufferView(
Client
BufferViewConfig *config);
BufferView *allBuffersView() const;
BufferView *allBuffersView() const;
- inline
QSystemTrayIcon *systemTrayIcon
() const;
+ inline
SystemTray *systemTray
() const;
virtual bool event(QEvent *event);
virtual bool event(QEvent *event);
@@
-109,8
+110,9
@@
class MainWin
#endif
void on_actionConfigureNetworks_triggered();
void on_actionConfigureViews_triggered();
#endif
void on_actionConfigureNetworks_triggered();
void on_actionConfigureViews_triggered();
- void on_actionLock
DockPositions
_toggled(bool lock);
+ void on_actionLock
Layout
_toggled(bool lock);
void on_actionDebugNetworkModel_triggered();
void on_actionDebugNetworkModel_triggered();
+ void on_actionDebugBufferViewOverlay_triggered();
void on_actionDebugMessageModel_triggered();
void on_actionDebugLog_triggered();
void on_actionDebugMessageModel_triggered();
void on_actionDebugLog_triggered();
@@
-124,6
+126,8
@@
class MainWin
void loadLayout();
void saveLayout();
void loadLayout();
void saveLayout();
+ void bufferViewToggled(bool enabled);
+
signals:
void connectToCore(const QVariantMap &connInfo);
void disconnectFromCore();
signals:
void connectToCore(const QVariantMap &connInfo);
void disconnectFromCore();
@@
-133,7
+137,6
@@
class MainWin
KHelpMenu *_kHelpMenu;
#endif
KHelpMenu *_kHelpMenu;
#endif
- QMenu *systrayMenu;
QLabel *coreLagLabel;
QLabel *sslLabel;
MsgProcessorStatusWidget *msgProcessorStatusWidget;
QLabel *coreLagLabel;
QLabel *sslLabel;
MsgProcessorStatusWidget *msgProcessorStatusWidget;
@@
-157,7
+160,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;
@@
-172,8
+175,8
@@
class MainWin
friend class QtUi;
};
friend class QtUi;
};
-
QSystemTrayIcon *MainWin::systemTrayIcon
() const {
- return _
trayIcon
;
+
SystemTray *MainWin::systemTray
() const {
+ return _
systemTray
;
}
#endif
}
#endif