X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=d4b8ab1486e6f60db332372607957264015acab1;hp=d84163049c6416fd25255aba770988be3736cff9;hb=a71a4cc60303b29f493d9d0b6636f00473c4eaf6;hpb=6250a7e25eb2c0a6794d4aa5679c70082d825031

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index d8416304..d4b8ab14 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel Team                             *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -26,12 +26,16 @@
 #include "qtui.h"
 #include "bufferviewfilter.h"
 
+#include <QSystemTrayIcon>
+
 class ServerListDlg;
 class CoreConnectDlg;
 class Buffer;
 class SettingsDlg;
 class QtUi;
 class Message;
+class NickListWidget;
+class DebugConsole;
 
 //!\brief The main window of Quassel's QtUi.
 class MainWin : public QMainWindow {
@@ -42,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 &);
 
@@ -52,24 +56,23 @@ 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 showBuffer(BufferInfo);
-    void showBuffer(Buffer *);
-
-    void importBacklog();
+    void disconnectFromNet();
 
   signals:
     void connectToCore(const QVariantMap &connInfo);
     void disconnectFromCore();
+    void disconnectFromNetwork(NetworkId);
     void requestBacklog(BufferInfo, QVariant, QVariant);
-    void importOldBacklog();
 
   private:
     Ui::MainWin ui;
@@ -87,11 +90,14 @@ class MainWin : public QMainWindow {
     CoreConnectDlg *coreConnectDlg;
     SettingsDlg *settingsDlg;
 
-    uint currentBuffer;
+    BufferId currentBuffer;
     QString currentProfile;
 
     QList<QDockWidget *> netViews;
+    QDockWidget *nickDock;
+    NickListWidget *nickListWidget;
 
+    DebugConsole *debugConsole;
     friend class QtUi;
 };