X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=721cc3e9bcbd40b0c4f2d49a03dd05787007c2d9;hb=a33e42aee121185f479667b2104a15fc2033762e;hp=0f5e299ed862b20e128784212eaf750b689b0850;hpb=4e0445e459c690cfa6013c5ad574e94f9214827b;p=quassel.git

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 0f5e299e..721cc3e9 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -24,20 +24,24 @@
 #include "ui_mainwin.h"
 
 #include "qtui.h"
-#include "bufferviewfilter.h"
+#include "titlesetter.h"
 
 #include <QSystemTrayIcon>
 #include <QTimer>
 
+
 class ServerListDlg;
+class ChannelListDlg;
 class CoreConnectDlg;
 class Buffer;
+class BufferViewConfig;
 class SettingsDlg;
 class QtUi;
 class Message;
 class NickListWidget;
 class DebugConsole;
 
+
 //!\brief The main window of Quassel's QtUi.
 class MainWin : public QMainWindow {
   Q_OBJECT
@@ -47,9 +51,8 @@ class MainWin : public QMainWindow {
     virtual ~MainWin();
 
     void init();
-    QDockWidget *addBufferView(const QString &, QAbstractItemModel *, const BufferViewFilter::Modes &, const QList<NetworkId> &);
+    void addBufferView(BufferViewConfig *config = 0);
 
-    AbstractUiMsg *layoutMsg(const Message &);
     void displayTrayIconMessage(const QString &title, const QString &message);
 
     virtual bool event(QEvent *event);
@@ -63,13 +66,21 @@ class MainWin : public QMainWindow {
 
   protected slots:
     void connectedToCore();
+    void setConnectedState();
+    void securedConnection();
     void disconnectedFromCore();
+    void setDisconnectedState();
     void systrayActivated( QSystemTrayIcon::ActivationReason );
 
   private slots:
+    void addBufferView(int bufferViewConfigId);
+    void removeBufferView(int bufferViewConfigId);
     void receiveMessage(const Message &msg);
+    void showChannelList(NetworkId netId = NetworkId());
     void showSettingsDlg();
-    void showNetworkDlg();
+    void on_actionEditNetworks_triggered();
+    void on_actionManageViews_triggered();
+    void on_actionLockDockPositions_toggled(bool lock);
     void showAboutDlg();
     void showDebugConsole();
 
@@ -83,7 +94,11 @@ class MainWin : public QMainWindow {
 
     void changeTopic(const QString &topic);
     void makeTrayIconBlink();
+    void saveStatusBarStatus(bool enabled);
 
+    void loadLayout();
+    void saveLayout();
+  
   signals:
     void connectToCore(const QVariantMap &connInfo);
     void disconnectFromCore();
@@ -94,6 +109,9 @@ class MainWin : public QMainWindow {
     QtUi *gui;
 
     QMenu *systrayMenu;
+    QLabel *sslLabel;
+
+    TitleSetter _titleSetter;
 
     void setupMenus();
     void setupViews();
@@ -101,6 +119,7 @@ class MainWin : public QMainWindow {
     void setupChatMonitor();
     void setupInputWidget();
     void setupTopicWidget();
+    void setupStatusBar();
     void setupSystray();
 
     void setupSettingsDlg();
@@ -111,23 +130,22 @@ class MainWin : public QMainWindow {
 
     QSystemTrayIcon *systray;
     QIcon activeTrayIcon;
-    QIcon inactiveTrayIcon;
+    QIcon onlineTrayIcon;
+    QIcon offlineTrayIcon;
     bool trayIconActive;
     QTimer *timer;
 
     CoreConnectDlg *coreConnectDlg;
+    ChannelListDlg *channelListDlg;
     SettingsDlg *settingsDlg;
     DebugConsole *debugConsole;
 
     BufferId currentBuffer;
     QString currentProfile;
 
-    QList<QDockWidget *> netViews;
+    QList<QDockWidget *> _netViews;
     NickListWidget *nickListWidget;
 
-    QAction *actionEditNetworks;
-    QList<QAction *> networkActions;
-
     friend class QtUi;
 };