X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=000e5704e23c0f347fd3870fdb69499833743e84;hp=a4f6496a4e05e3e6262cf9f3f60615d546acf8cd;hb=7c9c1b348382b8b77f96a883945c522d32a478d5;hpb=453ccab6ade4a21c7aa3c331af893c91468250a4

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index a4f6496a..000e5704 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -36,15 +36,17 @@
 class ActionCollection;
 class BufferView;
 class BufferViewConfig;
+class ClientBufferViewConfig;
 class BufferViewDock;
 class BufferWidget;
 class InputWidget;
 class MsgProcessorStatusWidget;
 class NickListWidget;
-class SystemTrayIcon;
+class SystemTray;
 
 class QMenu;
 class QLabel;
+class QToolBar;
 
 class KHelpMenu;
 
@@ -63,10 +65,10 @@ class MainWin
 
     void init();
 
-    void addBufferView(BufferViewConfig *config);
+    void addBufferView(ClientBufferViewConfig *config);
     BufferView *allBuffersView() const;
 
-    inline QSystemTrayIcon *systemTrayIcon() const;
+    inline SystemTray *systemTray() const;
 
     virtual bool event(QEvent *event);
 
@@ -108,7 +110,7 @@ class MainWin
 #endif
     void on_actionConfigureNetworks_triggered();
     void on_actionConfigureViews_triggered();
-    void on_actionLockDockPositions_toggled(bool lock);
+    void on_actionLockLayout_toggled(bool lock);
     void on_actionDebugNetworkModel_triggered();
     void on_actionDebugMessageModel_triggered();
     void on_actionDebugLog_triggered();
@@ -132,7 +134,6 @@ class MainWin
     KHelpMenu *_kHelpMenu;
 #endif
 
-    QMenu *systrayMenu;
     QLabel *coreLagLabel;
     QLabel *sslLabel;
     MsgProcessorStatusWidget *msgProcessorStatusWidget;
@@ -149,13 +150,14 @@ class MainWin
     void setupStatusBar();
     void setupSystray();
     void setupTitleSetter();
+    void setupToolBars();
 
     void updateIcon();
     void hideToTray();
     void toggleMinimizedToTray();
     void enableMenus();
 
-    QSystemTrayIcon *_trayIcon;
+    SystemTray *_systemTray;
 
     QList<BufferViewDock *> _bufferViews;
     BufferWidget *_bufferWidget;
@@ -163,13 +165,15 @@ class MainWin
     InputWidget *_inputWidget;
 
     QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu;
+    QMenu *_toolbarMenu;
+    QToolBar *_mainToolBar, *_chatViewToolBar, *_nickToolBar;
 
     QWidget *_awayLog;
     friend class QtUi;
 };
 
-QSystemTrayIcon *MainWin::systemTrayIcon() const {
-  return _trayIcon;
+SystemTray *MainWin::systemTray() const {
+  return _systemTray;
 }
 
 #endif