X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fbufferwidget.cpp;h=541ddb5d172b622c1afb7b225656e91309ece50f;hp=5448221bfda86730f3aa27daa0ee7ad0f12a939f;hb=e5ef65b239e9a128a5cf86e6eef9bce1fd098448;hpb=a76b7bf7206e939b1503910825a3225119c89e8b

diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp
index 5448221b..541ddb5d 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        *
@@ -20,28 +20,45 @@
 
 #include "bufferwidget.h"
 #include "buffer.h"
-#include "chatline.h"
+#include "chatline-old.h"
 #include "chatwidget.h"
 #include "settings.h"
+#include "client.h"
+#include "network.h"
 
-BufferWidget::BufferWidget(QWidget *parent) : QWidget(parent) {
+BufferWidget::BufferWidget(QWidget *parent)
+  : QWidget(parent),
+    _currentBuffer(0),
+    _currentNetwork(0)
+{
   ui.setupUi(this);
+  ui.ownNick->clear();  // TODO add nick history
   connect(ui.inputEdit, SIGNAL(returnPressed()), this, SLOT(enterPressed()));
 }
 
 void BufferWidget::init() {
+
 }
 
 BufferWidget::~BufferWidget() {
 }
 
-void BufferWidget::setBuffer(Buffer *buf) {
+BufferId BufferWidget::currentBuffer() const {
+  return _currentBuffer;
+}
+
+void BufferWidget::setCurrentBuffer(BufferId bufferId) {
   ChatWidget *chatWidget;
-  if(_chatWidgets.contains(buf->uid())) {
-     chatWidget = _chatWidgets[buf->uid()];
+  if(_chatWidgets.contains(bufferId)) {
+     chatWidget = _chatWidgets[bufferId];
   } 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(networkName, bufferName);
+    chatWidget->init(bufferId);
     QList<ChatLine *> lines;
     QList<AbstractUiMsg *> msgs = buf->contents();
     foreach(AbstractUiMsg *msg, msgs) {
@@ -50,16 +67,38 @@ void BufferWidget::setBuffer(Buffer *buf) {
     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;
+    _chatWidgets[bufferId] = 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)));
+  connect(this, SIGNAL(userInput(QString)), Client::buffer(bufferId), SLOT(processUserInput(QString)));
   chatWidget->setFocusProxy(ui.inputEdit);
   ui.inputEdit->setFocus();
-  ui.ownNick->clear();  // TODO add nick history
-  // ui.ownNick->addItem(state->ownNick);
+
+}
+
+NetworkId BufferWidget::currentNetwork() const {
+  return _currentNetwork;
+}
+
+void BufferWidget::setCurrentNetwork(NetworkId networkId) {
+  Network *net = Client::network(networkId);
+  if(!net)
+    return;
+  _currentNetwork = networkId;
+  
+  ui.ownNick->clear();
+  ui.ownNick->addItem(net->myNick());
+}
+
+void BufferWidget::removeBuffer(BufferId bufferId) {
+  if(!_chatWidgets.contains(bufferId))
+    return;
+
+  ChatWidget *chatWidget = _chatWidgets.take(bufferId);
+  ui.stackedWidget->removeWidget(chatWidget);
+  chatWidget->deleteLater();
 }
 
 void BufferWidget::saveState() {
@@ -78,13 +117,6 @@ void BufferWidget::enterPressed() {
   ui.inputEdit->clear();
 }
 
-void BufferWidget::setActive(bool act) {
-  if(act != active) {
-    active = act;
-    //renderContents();
-    //scrollToEnd();
-  }
-}
 
 
 /*