X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fbufferwidget.cpp;h=c1e992dcd3f6a6ee72327cea0d0954cfbcf81aea;hp=51c551c3328a97dde609021d002f4dd3cc4e30b6;hb=dbefd590650e9053c7a1513a5f49aad3e582108a;hpb=d298e7275374e2da41b0ed9ef1080464a77c8cf1

diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp
index 51c551c3..c1e992dc 100644
--- a/src/qtui/bufferwidget.cpp
+++ b/src/qtui/bufferwidget.cpp
@@ -19,162 +19,40 @@
  ***************************************************************************/
 
 #include "bufferwidget.h"
-#include "buffer.h"
-#include "chatline.h"
-#include "chatline-old.h"
-#include "chatwidget.h"
+#include "chatview.h"
 #include "settings.h"
 #include "client.h"
-#include "identity.h"
-#include "network.h"
-#include "networkmodel.h"
 
 #include "global.h"
 
-BufferWidget::BufferWidget(QWidget *parent)
-  : QWidget(parent),
-    _bufferModel(0),
-    _selectionModel(0),
-    _currentBuffer(0)
-{
+BufferWidget::BufferWidget(QWidget *parent) : AbstractBufferContainer(parent) {
   ui.setupUi(this);
 }
 
 BufferWidget::~BufferWidget() {
-}
-
-void BufferWidget::init() {
-}
 
-void BufferWidget::setModel(BufferModel *bufferModel) {
-  if(_bufferModel) {
-    disconnect(_bufferModel, 0, this, 0);
-  }
-  _bufferModel = bufferModel;
-
-  if(bufferModel) {
-    connect(bufferModel, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)),
-            this, SLOT(rowsAboutToBeRemoved(QModelIndex, int, int)));
-  }
 }
 
-void BufferWidget::setSelectionModel(QItemSelectionModel *selectionModel) {
-  if(_selectionModel) {
-    disconnect(_selectionModel, 0, this, 0);
-  }
-  _selectionModel = selectionModel;
-
-  if(selectionModel) {
-    connect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
-            this, SLOT(currentChanged(QModelIndex, QModelIndex)));
-  }
-}
-
-void BufferWidget::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) {
-  Q_ASSERT(model());
-  if(!parent.isValid()) {
-    // ok this means that whole networks are about to be removed
-    // we can't determine which buffers are affect, so we hope that all nets are removed
-    // this is the most common case (for example disconnecting from the core or terminating the clint)
-    if(model()->rowCount(parent) != end - start + 1)
-      return;
-
-    ChatWidget *chatWidget;
-    QHash<BufferId, ChatWidget *>::iterator iter = _chatWidgets.begin();
-    while(iter != _chatWidgets.end()) {
-      chatWidget = *iter;
-      iter = _chatWidgets.erase(iter);
-      ui.stackedWidget->removeWidget(chatWidget);
-      chatWidget->deleteLater();
-    }
-    
-  } else {
-    // check if there are explicitly buffers removed
-    for(int i = start; i <= end; i++) {
-      QVariant variant = parent.child(i,0).data(NetworkModel::BufferIdRole);
-      if(!variant.isValid())
-        continue;
-      
-      BufferId bufferId = qVariantValue<BufferId>(variant);
-      removeBuffer(bufferId);
-    }
-  }
-}
-
-void BufferWidget::removeBuffer(BufferId bufferId) {
-  if(!_chatWidgets.contains(bufferId))
-    return;
-
-  if(Client::buffer(bufferId)) Client::buffer(bufferId)->setVisible(false);
-  ChatWidget *chatWidget = _chatWidgets.take(bufferId);
-  ui.stackedWidget->removeWidget(chatWidget);
-  chatWidget->deleteLater();
+AbstractChatView *BufferWidget::createChatView(BufferId id) {
+  ChatView *chatView;
+  chatView = new ChatView(Client::buffer(id), this);
+  _chatViews[id] = chatView;
+  ui.stackedWidget->addWidget(chatView);
+  chatView->setFocusProxy(this);
+  chatView->setBufferForBacklogFetching(id);
+  return chatView;
 }
 
-void BufferWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
-  BufferId newBufferId = current.data(NetworkModel::BufferIdRole).value<BufferId>();
-  BufferId oldBufferId = previous.data(NetworkModel::BufferIdRole).value<BufferId>();
-  if(newBufferId != oldBufferId)
-    setCurrentBuffer(newBufferId);
+void BufferWidget::removeChatView(BufferId id) {
+  QWidget *view = _chatViews.value(id, 0);
+  if(!view) return;
+  ui.stackedWidget->removeWidget(view);
+  view->deleteLater();
+  _chatViews.take(id);
 }
 
-void BufferWidget::setCurrentBuffer(BufferId bufferId) {
-  if(!bufferId.isValid()) {
-    ui.stackedWidget->setCurrentWidget(ui.page);
-    return;
-  }
-  
-  ChatWidget *chatWidget = 0;
-  ChatView *chatView = 0;
-  Buffer *buf = Client::buffer(bufferId);
-  if(!buf) {
-    qWarning() << "BufferWidget::setBuffer(BufferId): Can't show unknown Buffer:" << bufferId;
-    return;
-  }
-  Buffer *prevBuffer = Client::buffer(currentBuffer());
-  if(prevBuffer) prevBuffer->setVisible(false);
-  if(Global::SPUTDEV) {
-    if(_chatViews.contains(bufferId)) {
-      chatView = _chatViews[bufferId];
-    } else {
-      chatView = new ChatView(buf, this);
-      //chatView->init(bufferId);
-      QList<ChatLine *> lines;
-      QList<AbstractUiMsg *> msgs = buf->contents();
-      foreach(AbstractUiMsg *msg, msgs) {
-        lines.append(dynamic_cast<ChatLine *>(msg));
-      }
-      chatView->setContents(lines);
-      connect(buf, SIGNAL(msgAppended(AbstractUiMsg *)), chatView, SLOT(appendMsg(AbstractUiMsg *)));
-      connect(buf, SIGNAL(msgPrepended(AbstractUiMsg *)), chatView, SLOT(prependMsg(AbstractUiMsg *)));
-      _chatViews[bufferId] = chatView;
-      ui.stackedWidget->addWidget(chatView);
-      chatView->setFocusProxy(this);
-    }
-    _currentBuffer = bufferId;
-    ui.stackedWidget->setCurrentWidget(chatView);
-  } else {
-    if(_chatWidgets.contains(bufferId)) {
-      chatWidget = _chatWidgets[bufferId];
-    } else {
-      chatWidget = new ChatWidget(this);
-      chatWidget->init(bufferId);
-      QList<ChatLineOld *> lines;
-      QList<AbstractUiMsg *> msgs = buf->contents();
-      foreach(AbstractUiMsg *msg, msgs) {
-        lines.append(dynamic_cast<ChatLineOld*>(msg));
-      }
-      chatWidget->setContents(lines);
-      connect(buf, SIGNAL(msgAppended(AbstractUiMsg *)), chatWidget, SLOT(appendMsg(AbstractUiMsg *)));
-      connect(buf, SIGNAL(msgPrepended(AbstractUiMsg *)), chatWidget, SLOT(prependMsg(AbstractUiMsg *)));
-      _chatWidgets[bufferId] = chatWidget;
-      ui.stackedWidget->addWidget(chatWidget);
-      chatWidget->setFocusProxy(this);
-    }
-    _currentBuffer = bufferId;
-    ui.stackedWidget->setCurrentWidget(chatWidget);
-  }
-  buf->setVisible(true);
-  setFocus();
+void BufferWidget::showChatView(BufferId id) {
+  if(!id.isValid()) ui.stackedWidget->setCurrentWidget(ui.page);
+  else ui.stackedWidget->setCurrentWidget(_chatViews.value(id));
 }