X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=gui%2Fmainwin.h;h=7876b50d902f8690119d5c275da58c15053689bb;hp=ff3596ec49c148e63f8c77b4d952e96ce3f71a02;hb=4ccba157efd91e531a3106012f5d54ba372a0292;hpb=2a068c11e76c7b34afb64d443dbb1afd2e208aaa

diff --git a/gui/mainwin.h b/gui/mainwin.h
index ff3596ec..7876b50d 100644
--- a/gui/mainwin.h
+++ b/gui/mainwin.h
@@ -30,13 +30,11 @@
 
 class ServerListDlg;
 class CoreConnectDlg;
-class NetworkView;
+class BufferViewDock;
 class Buffer;
 class BufferWidget;
 class SettingsDlg;
 
-extern LayoutThread *layoutThread;
-
 //!\brief The main window and central object of Quassel GUI.
 /** In addition to displaying the main window including standard stuff like a menubar,
  * dockwidgets and of course the chat window, this class also stores all data it
@@ -50,47 +48,58 @@ class MainWin : public QMainWindow {
     ~MainWin();
 
     void init();
-    void registerNetView(NetworkView *);
+    void registerBufferViewDock(BufferViewDock *);
 
   protected:
     void closeEvent(QCloseEvent *event);
 
   signals:
-    void sendInput(QString network, QString buffer, QString message);
-    void bufferSelected(Buffer *);
-    void bufferUpdated(Buffer *);
-    void bufferDestroyed(Buffer *);
-    void backlogReceived(Buffer *, QList<Message>);
+    //void sendInput(BufferId, QString message);
+    //void bufferSelected(Buffer *);
+    //void bufferUpdated(Buffer *);
+    //void bufferActivity(Buffer::ActivityLevel, Buffer *);
+    //void bufferDestroyed(Buffer *);
+    //void backlogReceived(Buffer *, QList<Message>);
+    //void requestBacklog(BufferId, QVariant, QVariant);
+
+    void importOldBacklog();
 
   private slots:
-    void userInput(QString, QString, QString);
-    void networkConnected(QString);
-    void networkDisconnected(QString);
-    void recvNetworkState(QString, QVariant);
-    void recvMessage(QString network, Message message);
-    void recvStatusMsg(QString network, QString message);
-    void setTopic(QString, QString, QString);
-    void setNicks(QString, QString, QStringList);
-    void addNick(QString net, QString nick, VarMap props);
-    void removeNick(QString net, QString nick);
-    void renameNick(QString net, QString oldnick, QString newnick);
-    void updateNick(QString net, QString nick, VarMap props);
-    void setOwnNick(QString net, QString nick);
+    
+    //void userInput(BufferId, QString);
+    //void networkConnected(QString);
+    //void networkDisconnected(QString);
+    //void recvNetworkState(QString, QVariant);
+    //void recvMessage(Message message);
+    //void recvStatusMsg(QString network, QString message);
+    //void setTopic(QString net, QString buf, QString);
+    //void addNick(QString net, QString nick, VarMap props);
+    //void removeNick(QString net, QString nick);
+    //void renameNick(QString net, QString oldnick, QString newnick);
+    //void updateNick(QString net, QString nick, VarMap props);
+    //void setOwnNick(QString net, QString nick);
+    //void recvBacklogData(BufferId, QList<QVariant>, bool);
+    //void updateBufferId(BufferId);
 
     void showServerList();
     void showSettingsDlg();
 
-    void showBuffer(QString net, QString buf);
+    void showBuffer(BufferId);
     void showBuffer(Buffer *);
 
+    void importBacklog();
+
   private:
     Ui::MainWin ui;
 
     void setupMenus();
     void setupViews();
     void setupSettingsDlg();
-    void syncToCore();  // implemented in main_mono.cpp or main_gui.cpp
-    Buffer * getBuffer(QString net, QString buf);
+    //void syncToCore();  // implemented in main_mono.cpp or main_gui.cpp
+    //Buffer * getBuffer(QString net, QString buf);
+    //Buffer *getBuffer(BufferId);
+    //BufferId getStatusBufferId(QString net);
+    //BufferId getBufferId(QString net, QString buf);
     //void buffersUpdated();
 
     QSystemTrayIcon *systray;
@@ -102,14 +111,21 @@ class MainWin : public QMainWindow {
     CoreConnectDlg *coreConnectDlg;
     SettingsDlg *settingsDlg;
 
-    QString currentNetwork, currentBuffer;
-    QHash<QString, QHash<QString, Buffer*> > buffers;
-    QHash<QString, QHash<QString, VarMap> > nicks;
-    QHash<QString, bool> connected;
-    QHash<QString, QString> ownNick;
-    QHash<QString, QList<Message> > coreBackLog;
-
-    QList<NetworkView *> netViews;
+    //QString currentNetwork, currentBuffer;
+    //QHash<QString, QHash<QString, Buffer*> > buffers;
+    uint currentBuffer;
+    //QHash<BufferId, Buffer *> buffers;
+    //QHash<uint, BufferId> bufferIds;
+    //QHash<QString, QHash<QString, VarMap> > nicks;
+    //QHash<QString, bool> connected;
+    //QHash<QString, QString> ownNick;
+    //QHash<QString, QList<Message> > coreBackLog;
+    //QList<BufferId> coreBuffers;
+
+    QList<BufferViewDock *> netViews;
+
+    //QTimer *layoutTimer;
+    //QList<Message> layoutQueue;
 };
 
 #endif