X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=gui%2Fmainwin.h;h=8092395c61274b8220fcf2528ee5824d9c9e1206;hb=7ec4585cecc74ce8d9a94b0e52f00a96d105e79e;hp=ff3596ec49c148e63f8c77b4d952e96ce3f71a02;hpb=2a068c11e76c7b34afb64d443dbb1afd2e208aaa;p=quassel.git

diff --git a/gui/mainwin.h b/gui/mainwin.h
index ff3596ec..8092395c 100644
--- a/gui/mainwin.h
+++ b/gui/mainwin.h
@@ -30,7 +30,7 @@
 
 class ServerListDlg;
 class CoreConnectDlg;
-class NetworkView;
+class BufferViewDock;
 class Buffer;
 class BufferWidget;
 class SettingsDlg;
@@ -50,39 +50,47 @@ 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 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 userInput(BufferId, QString);
     void networkConnected(QString);
     void networkDisconnected(QString);
     void recvNetworkState(QString, QVariant);
-    void recvMessage(QString network, Message message);
+    void recvMessage(Message message);
     void recvStatusMsg(QString network, QString message);
-    void setTopic(QString, QString, QString);
-    void setNicks(QString, QString, QStringList);
+    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();
+    void layoutMsg();
+
   private:
     Ui::MainWin ui;
 
@@ -90,7 +98,10 @@ class MainWin : public QMainWindow {
     void setupViews();
     void setupSettingsDlg();
     void syncToCore();  // implemented in main_mono.cpp or main_gui.cpp
-    Buffer * getBuffer(QString net, QString buf);
+    //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 +113,21 @@ class MainWin : public QMainWindow {
     CoreConnectDlg *coreConnectDlg;
     SettingsDlg *settingsDlg;
 
-    QString currentNetwork, currentBuffer;
-    QHash<QString, QHash<QString, Buffer*> > buffers;
+    //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;
+    //QHash<QString, QList<Message> > coreBackLog;
+    QList<BufferId> coreBuffers;
+
+    QList<BufferViewDock *> netViews;
 
-    QList<NetworkView *> netViews;
+    QTimer *layoutTimer;
+    QList<Message> layoutQueue;
 };
 
 #endif