X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=3a3be26e516b492ad3d57ed310bc6f8fba137f36;hb=7fd90308c54f3e91ed864fc55eb5ccb096847bee;hp=fc0ba0254a90b578144c2145a95693f7d22de279;hpb=50706d89d4d60e258ebb6873d3778383621898e4;p=quassel.git

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index fc0ba025..3a3be26e 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -26,6 +26,8 @@
 #include "qtui.h"
 #include "bufferviewfilter.h"
 
+#include <QSystemTrayIcon>
+
 class ServerListDlg;
 class CoreConnectDlg;
 class Buffer;
@@ -33,7 +35,6 @@ class SettingsDlg;
 class QtUi;
 class Message;
 class NickListWidget;
-
 class DebugConsole;
 
 //!\brief The main window of Quassel's QtUi.
@@ -45,7 +46,7 @@ class MainWin : public QMainWindow {
     virtual ~MainWin();
 
     void init();
-    void addBufferView(const QString &, QAbstractItemModel *, const BufferViewFilter::Modes &, const QList<uint> &);
+    QDockWidget *addBufferView(const QString &, QAbstractItemModel *, const BufferViewFilter::Modes &, const QList<NetworkId> &);
 
     AbstractUiMsg *layoutMsg(const Message &);
 
@@ -55,18 +56,21 @@ class MainWin : public QMainWindow {
   protected slots:
     void connectedToCore();
     void disconnectedFromCore();
+    void systrayActivated( QSystemTrayIcon::ActivationReason );
 
   private slots:
 
-    void showServerList();
     void showSettingsDlg();
     void showDebugConsole();
     void showCoreConnectionDlg(bool autoConnect = false);
     void coreConnectionDlgFinished(int result);
 
+    void disconnectFromNet();
+
   signals:
     void connectToCore(const QVariantMap &connInfo);
     void disconnectFromCore();
+    void disconnectFromNetwork(NetworkId);
     void requestBacklog(BufferInfo, QVariant, QVariant);
 
   private:
@@ -75,17 +79,21 @@ class MainWin : public QMainWindow {
 
     void setupMenus();
     void setupViews();
+    void setupNickWidget();
+    void setupChatMonitor();
+    void setupInputWidget();
+    void setupTopicWidget();
+  
     void setupSettingsDlg();
 
     void enableMenus();
 
     QSystemTrayIcon *systray;
 
-    ServerListDlg *serverListDlg;
     CoreConnectDlg *coreConnectDlg;
     SettingsDlg *settingsDlg;
 
-    uint currentBuffer;
+    BufferId currentBuffer;
     QString currentProfile;
 
     QList<QDockWidget *> netViews;