X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fbufferwidget.cpp;h=a6707053de9cf936f1e74fd66bcdecaea0d57984;hb=26c15c14a067c8709d2e04ef9d8965550dcee52d;hp=cf6ae8301b3878e8ae03557fbd4a470ea3aa0cab;hpb=50706d89d4d60e258ebb6873d3778383621898e4;p=quassel.git

diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp
index cf6ae830..a6707053 100644
--- a/src/qtui/bufferwidget.cpp
+++ b/src/qtui/bufferwidget.cpp
@@ -19,93 +19,42 @@
  ***************************************************************************/
 
 #include "bufferwidget.h"
-#include "buffer.h"
+#include "chatline.h"
 #include "chatline-old.h"
+#include "chatview.h"
 #include "chatwidget.h"
 #include "settings.h"
 #include "client.h"
 
-BufferWidget::BufferWidget(QWidget *parent)
-  : QWidget(parent),
-    _currentBuffer(0)
-{
-  ui.setupUi(this);
-  ui.ownNick->clear();  // TODO add nick history
-  connect(ui.inputEdit, SIGNAL(returnPressed()), this, SLOT(enterPressed()));
-}
-
-void BufferWidget::init() {
+#include "global.h"
 
+BufferWidget::BufferWidget(QWidget *parent) : AbstractBufferContainer(parent) {
+  ui.setupUi(this);
 }
 
 BufferWidget::~BufferWidget() {
-}
 
-BufferId BufferWidget::currentBuffer() const {
-  return _currentBuffer;
 }
 
-void BufferWidget::setCurrentBuffer(BufferId bufferId) {
-  ChatWidget *chatWidget;
-  if(_chatWidgets.contains(bufferId)) {
-     chatWidget = _chatWidgets[bufferId];
+AbstractChatView *BufferWidget::createChatView(BufferId id) {
+  AbstractChatView *chatView;
+  if(Global::SPUTDEV) {
+    chatView = new ChatView(Client::buffer(id), this);
   } else {
-    Buffer *buf = Client::buffer(bufferId);
-    if(!buf) {
-      qWarning() << "BufferWidget::setBuffer(BufferId): Can't show unknown Buffer:" << bufferId;
-      return;
-    }
-    chatWidget = new ChatWidget(this);
-    chatWidget->init(bufferId);
-    QList<ChatLine *> lines;
-    QList<AbstractUiMsg *> msgs = buf->contents();
-    foreach(AbstractUiMsg *msg, msgs) {
-      lines.append(dynamic_cast<ChatLine*>(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);
+    chatView = new ChatWidget(id, this);
   }
-  ui.stackedWidget->setCurrentWidget(chatWidget);
-  disconnect(this, SIGNAL(userInput(QString)), 0, 0);
-  connect(this, SIGNAL(userInput(QString)), Client::buffer(bufferId), SLOT(processUserInput(QString)));
-  chatWidget->setFocusProxy(ui.inputEdit);
-  ui.inputEdit->setFocus();
-
-}
-
-void BufferWidget::removeBuffer(BufferId bufferId) {
-  if(!_chatWidgets.contains(bufferId))
-    return;
-
-  ChatWidget *chatWidget = _chatWidgets.take(bufferId);
-  ui.stackedWidget->removeWidget(chatWidget);
-  chatWidget->deleteLater();
-}
-
-void BufferWidget::saveState() {
-}
-
-QSize BufferWidget::sizeHint() const {
-  return QSize(800,400);
+  ui.stackedWidget->addWidget(dynamic_cast<QWidget *>(chatView));
+  dynamic_cast<QWidget *>(chatView)->setFocusProxy(this);
+  return chatView;
 }
 
-void BufferWidget::enterPressed() {
-  QStringList lines = ui.inputEdit->text().split('\n', QString::SkipEmptyParts);
-  foreach(QString msg, lines) {
-    if(msg.isEmpty()) continue;
-    emit userInput(msg);
-  }
-  ui.inputEdit->clear();
+void BufferWidget::removeChatView(AbstractChatView *view) {
+  ui.stackedWidget->removeWidget(dynamic_cast<QWidget *>(view));
+  dynamic_cast<QWidget *>(view)->deleteLater();
 }
 
-
-
-/*
-void BufferWidget::displayMsg(Message msg) {
-  chatWidget->appendMsg(msg);
+void BufferWidget::showChatView(AbstractChatView *view) {
+  if(!view) ui.stackedWidget->setCurrentWidget(ui.page);
+  else ui.stackedWidget->setCurrentWidget(dynamic_cast<QWidget *>(view));
 }
-*/