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

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index fc0ba025..a78832d8 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,25 +46,33 @@ 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 &);
 
   protected:
     void closeEvent(QCloseEvent *event);
+    virtual void changeEvent(QEvent *event);
+    virtual void keyPressEvent(QKeyEvent *event);
 
   protected slots:
     void connectedToCore();
     void disconnectedFromCore();
+    void systrayActivated( QSystemTrayIcon::ActivationReason );
 
   private slots:
-
-    void showServerList();
     void showSettingsDlg();
+    void showNetworkDlg();
     void showDebugConsole();
+
     void showCoreConnectionDlg(bool autoConnect = false);
     void coreConnectionDlgFinished(int result);
 
+    void clientNetworkCreated(NetworkId);
+    void clientNetworkRemoved(NetworkId);
+    void clientNetworkUpdated();
+    void connectOrDisconnectFromNet();
+
   signals:
     void connectToCore(const QVariantMap &connInfo);
     void disconnectFromCore();
@@ -73,25 +82,41 @@ class MainWin : public QMainWindow {
     Ui::MainWin ui;
     QtUi *gui;
 
+    QMenu *systrayMenu;
+
     void setupMenus();
     void setupViews();
+    void setupNickWidget();
+    void setupChatMonitor();
+    void setupInputWidget();
+    void setupTopicWidget();
+    void setupSystray();
+
     void setupSettingsDlg();
 
+    void toggleVisibility();
+
     void enableMenus();
 
+    void bindKey(int key);
+    void jumpKey(int key);
+
+    QHash<int, BufferId> _keyboardJump;
     QSystemTrayIcon *systray;
 
-    ServerListDlg *serverListDlg;
     CoreConnectDlg *coreConnectDlg;
     SettingsDlg *settingsDlg;
 
-    uint currentBuffer;
+    BufferId currentBuffer;
     QString currentProfile;
 
     QList<QDockWidget *> netViews;
     QDockWidget *nickDock;
     NickListWidget *nickListWidget;
 
+    QAction *actionEditNetworks;
+    QList<QAction *> networkActions;
+
     DebugConsole *debugConsole;
     friend class QtUi;
 };