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

diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp
index 9bb2cab7..c1e992dc 100644
--- a/src/qtui/bufferwidget.cpp
+++ b/src/qtui/bufferwidget.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel Team                             *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -19,100 +19,40 @@
  ***************************************************************************/
 
 #include "bufferwidget.h"
-#include "buffer.h"
-#include "chatline-old.h"
-#include "chatwidget.h"
+#include "chatview.h"
 #include "settings.h"
+#include "client.h"
 
-BufferWidget::BufferWidget(QWidget *parent) : QWidget(parent) {
-  ui.setupUi(this);
-  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() {
 
 }
 
-void BufferWidget::setBuffer(Buffer *buf) {
-  /*
+AbstractChatView *BufferWidget::createChatView(BufferId id) {
   ChatView *chatView;
-  if(_chatViews.contains(buf->uid())) {
-    chatView = _chatViews[buf->uid()];
-  } else {
-    chatView = new ChatView(buf, this);
-    ui.stackedWidget->addWidget(chatView);
-    _chatViews[buf->uid()] = chatView;
-  }
-  ui.stackedWidget->setCurrentWidget(chatView);
-  disconnect(this, SIGNAL(userInput(QString)), 0, 0);
-  connect(this, SIGNAL(userInput(QString)), buf, SLOT(processUserInput(QString)));
-  //chatView->setFocusProxy(ui.inputEdit);
-  ui.inputEdit->setFocus();
-  ui.ownNick->clear();  // TODO add nick history
-}
-  */
-  
-  // ui.ownNick->addItem(state->ownNick);
-
-  ChatWidget *chatWidget;
-  if(_chatWidgets.contains(buf->uid())) {
-     chatWidget = _chatWidgets[buf->uid()];
-  } else {
-    chatWidget = new ChatWidget(this);
-    chatWidget->init(buf->networkName(), buf->name());
-    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[buf->uid()] = chatWidget;
-    ui.stackedWidget->addWidget(chatWidget);
-  }
-  ui.stackedWidget->setCurrentWidget(chatWidget);
-  disconnect(this, SIGNAL(userInput(QString)), 0, 0);
-  connect(this, SIGNAL(userInput(QString)), buf, SLOT(processUserInput(QString)));
-  chatWidget->setFocusProxy(ui.inputEdit);
-  ui.inputEdit->setFocus();
-  ui.ownNick->clear();  // TODO add nick history
-  // ui.ownNick->addItem(state->ownNick);
-}
-
-void BufferWidget::saveState() {
-
-}
-
-QSize BufferWidget::sizeHint() const {
-  return QSize(800,400);
+  chatView = new ChatView(Client::buffer(id), this);
+  _chatViews[id] = chatView;
+  ui.stackedWidget->addWidget(chatView);
+  chatView->setFocusProxy(this);
+  chatView->setBufferForBacklogFetching(id);
+  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(BufferId id) {
+  QWidget *view = _chatViews.value(id, 0);
+  if(!view) return;
+  ui.stackedWidget->removeWidget(view);
+  view->deleteLater();
+  _chatViews.take(id);
 }
 
-void BufferWidget::setActive(bool act) {
-  if(act != active) {
-    active = act;
-    //renderContents();
-    //scrollToEnd();
-  }
-}
-
-
-/*
-void BufferWidget::displayMsg(Message msg) {
-  chatWidget->appendMsg(msg);
+void BufferWidget::showChatView(BufferId id) {
+  if(!id.isValid()) ui.stackedWidget->setCurrentWidget(ui.page);
+  else ui.stackedWidget->setCurrentWidget(_chatViews.value(id));
 }
-*/