From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Tue, 24 Mar 2009 16:36:06 +0000 (+0100)
Subject: Merge branch 'bufferviewoverlay'
X-Git-Tag: 0.5-rc1~250
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=ab16c77fe03b73a863d9b52b11919bcbac903f58

Merge branch 'bufferviewoverlay'

Conflicts:

	src/client/client.cpp
	src/client/client.h
---

ab16c77fe03b73a863d9b52b11919bcbac903f58
diff --cc src/client/CMakeLists.txt
index 5277844e,e7e9e4df..f60f66c5
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@@ -12,8 -12,8 +12,9 @@@ set(SOURCE
      backlogrequester.cpp
      buffermodel.cpp
      buffersettings.cpp
+     bufferviewoverlay.cpp
      client.cpp
 +    clientaliasmanager.cpp
      clientbacklogmanager.cpp
      clientbufferviewconfig.cpp
      clientbufferviewmanager.cpp
@@@ -34,8 -33,8 +35,9 @@@ set(MOC_HDR
      abstractmessageprocessor.h
      abstractui.h
      buffermodel.h
+     bufferviewoverlay.h
      client.h
 +    clientaliasmanager.h
      clientbacklogmanager.h
      clientbufferviewconfig.h
      clientbufferviewmanager.h
diff --cc src/client/client.cpp
index ca219bbd,3d430371..d04e258d
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@@ -27,7 -27,7 +27,8 @@@
  #include "buffersettings.h"
  #include "buffersyncer.h"
  #include "bufferviewconfig.h"
+ #include "bufferviewoverlay.h"
 +#include "clientaliasmanager.h"
  #include "clientbacklogmanager.h"
  #include "clientbufferviewmanager.h"
  #include "clientirclisthelper.h"
@@@ -82,11 -77,11 +83,12 @@@ Client::Client(QObject *parent
      _networkModel(0),
      _bufferModel(0),
      _bufferSyncer(0),
 +    _aliasManager(0),
      _backlogManager(new ClientBacklogManager(this)),
      _bufferViewManager(0),
+     _bufferViewOverlay(new BufferViewOverlay(this)),
      _ircListHelper(new ClientIrcListHelper(this)),
 -    _inputHandler(new ClientUserInputHandler(this)),
 +    _inputHandler(0),
      _messageModel(0),
      _messageProcessor(0),
      _connectedToCore(false),
@@@ -320,15 -302,9 +322,15 @@@ void Client::setSyncedToCore() 
    // create a new BufferViewManager
    Q_ASSERT(!_bufferViewManager);
    _bufferViewManager = new ClientBufferViewManager(signalProxy(), this);
-   connect(bufferViewManager(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog()));
    connect(bufferViewManager(), SIGNAL(initDone()), this, SLOT(createDefaultBufferView()));
+   connect(bufferViewManager(), SIGNAL(viewsInitialized()), this, SLOT(requestInitialBacklogBarrier()));
  
 +  // create AliasManager
 +  Q_ASSERT(!_aliasManager);
 +  _aliasManager = new ClientAliasManager(this);
 +  connect(aliasManager(), SIGNAL(initDone()), SLOT(sendBufferedUserInput()));
 +  signalProxy()->synchronize(aliasManager());
 +
    _syncedToCore = true;
    emit connected();
    emit coreConnectionStateChanged(true);
diff --cc src/client/client.h
index 2821ab98,ec4ab3a2..0c9922a4
--- a/src/client/client.h
+++ b/src/client/client.h
@@@ -42,7 -42,7 +42,8 @@@ class AbstractUiMsg
  class NetworkModel;
  class BufferModel;
  class BufferSyncer;
+ class BufferViewOverlay;
 +class ClientAliasManager;
  class ClientBacklogManager;
  class ClientBufferViewManager;
  class ClientIrcListHelper;
@@@ -186,11 -186,9 +189,11 @@@ private slots
  
    void setConnectedToCore(AccountId id, QIODevice *socket = 0);
    void setSyncedToCore();
-   void requestInitialBacklog();
+   void requestInitialBacklogBarrier();
    void createDefaultBufferView();
  
 +  void sendBufferedUserInput();
 +
  private:
    Client(QObject *parent = 0);
    virtual ~Client();
@@@ -207,9 -205,9 +210,10 @@@
    NetworkModel * _networkModel;
    BufferModel * _bufferModel;
    BufferSyncer * _bufferSyncer;
 +  ClientAliasManager *_aliasManager;
    ClientBacklogManager *_backlogManager;
    ClientBufferViewManager *_bufferViewManager;
+   BufferViewOverlay *_bufferViewOverlay;
    ClientIrcListHelper *_ircListHelper;
    ClientUserInputHandler *_inputHandler;