X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=000e5704e23c0f347fd3870fdb69499833743e84;hb=619019336137e74eea45fc7217e9201904fcbe00;hp=cc8d8d128bc0645ac3fe5f77e87ebc4893b92691;hpb=a35e9270e608bfbc5b21ba47d49b3139f06b13e9;p=quassel.git

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index cc8d8d12..000e5704 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -36,14 +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;
 
@@ -62,11 +65,10 @@ class MainWin
 
     void init();
 
-    void addBufferView(BufferViewConfig *config);
+    void addBufferView(ClientBufferViewConfig *config);
     BufferView *allBuffersView() const;
 
-    inline QSystemTrayIcon *systemTrayIcon() const;
-    inline BufferWidget *bufferWidget() const;
+    inline SystemTray *systemTray() const;
 
     virtual bool event(QEvent *event);
 
@@ -85,14 +87,14 @@ class MainWin
   protected slots:
     void connectedToCore();
     void setConnectedState();
-    void updateLagIndicator(int lag);
-    void securedConnection();
+    void updateLagIndicator(int lag = -1);
     void disconnectedFromCore();
     void setDisconnectedState();
     void systrayActivated(QSystemTrayIcon::ActivationReason);
 
   private slots:
     void addBufferView(int bufferViewConfigId);
+    void awayLogDestroyed();
     void removeBufferView(int bufferViewConfigId);
     void messagesInserted(const QModelIndex &parent, int start, int end);
     void showAboutDlg();
@@ -100,6 +102,7 @@ class MainWin
     void startInternalCore();
     void showCoreConnectionDlg(bool autoConnect = false);
     void showCoreInfoDlg();
+    void showAwayLog();
     void showSettingsDlg();
     void showNotificationsDlg();
 #ifdef HAVE_KDE
@@ -107,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();
@@ -131,7 +134,6 @@ class MainWin
     KHelpMenu *_kHelpMenu;
 #endif
 
-    QMenu *systrayMenu;
     QLabel *coreLagLabel;
     QLabel *sslLabel;
     MsgProcessorStatusWidget *msgProcessorStatusWidget;
@@ -148,28 +150,30 @@ class MainWin
     void setupStatusBar();
     void setupSystray();
     void setupTitleSetter();
+    void setupToolBars();
 
     void updateIcon();
-    void toggleVisibility();
+    void hideToTray();
+    void toggleMinimizedToTray();
     void enableMenus();
 
-    QSystemTrayIcon *_trayIcon;
+    SystemTray *_systemTray;
 
     QList<BufferViewDock *> _bufferViews;
     BufferWidget *_bufferWidget;
     NickListWidget *_nickListWidget;
+    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;
-}
-
-BufferWidget *MainWin::bufferWidget() const {
-  return _bufferWidget;
+SystemTray *MainWin::systemTray() const {
+  return _systemTray;
 }
 
 #endif