X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fbufferwidget.cpp;h=541ddb5d172b622c1afb7b225656e91309ece50f;hp=fc501c24eb24069ddf4aad147096948606211b43;hb=e2aa07398950ba83b47d1772eb8fb23bc8fdd931;hpb=8699dd758516d0ded076811e8ea656adc95e69d0

diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp
index fc501c24..541ddb5d 100644
--- a/src/qtui/bufferwidget.cpp
+++ b/src/qtui/bufferwidget.cpp
@@ -23,9 +23,16 @@
 #include "chatline-old.h"
 #include "chatwidget.h"
 #include "settings.h"
-
-BufferWidget::BufferWidget(QWidget *parent) : QWidget(parent) {
+#include "client.h"
+#include "network.h"
+
+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()));
 }
 
@@ -34,65 +41,67 @@ void BufferWidget::init() {
 }
 
 BufferWidget::~BufferWidget() {
-
 }
 
-void BufferWidget::setBuffer(Buffer *buf) {
-  /*
-  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
+BufferId BufferWidget::currentBuffer() const {
+  return _currentBuffer;
 }
-  */
-  
-  // ui.ownNick->addItem(state->ownNick);
 
+void BufferWidget::setCurrentBuffer(BufferId bufferId) {
   ChatWidget *chatWidget;
-  if(_chatWidgets.contains(buf)) {
-     chatWidget = _chatWidgets[buf];
+  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(buf->networkName(), buf->name());
+    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(destroyed(QObject *)), this, SLOT(bufferDestroyed(QObject *)));
     connect(buf, SIGNAL(msgAppended(AbstractUiMsg *)), chatWidget, SLOT(appendMsg(AbstractUiMsg *)));
     connect(buf, SIGNAL(msgPrepended(AbstractUiMsg *)), chatWidget, SLOT(prependMsg(AbstractUiMsg *)));
-    _chatWidgets[buf] = 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);
+
 }
 
-void BufferWidget::bufferDestroyed(QObject *buf) {
-  QWidget *widget = _chatWidgets[(Buffer*)buf];
-  ui.stackedWidget->removeWidget(widget);
-  widget->deleteLater();
+NetworkId BufferWidget::currentNetwork() const {
+  return _currentNetwork;
 }
 
-void BufferWidget::saveState() {
+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() {
 }
 
 QSize BufferWidget::sizeHint() const {
@@ -108,14 +117,6 @@ void BufferWidget::enterPressed() {
   ui.inputEdit->clear();
 }
 
-void BufferWidget::setActive(bool act) {
-  if(act != active) {
-    active = act;
-    //renderContents();
-    //scrollToEnd();
-  }
-}
-
 
 
 /*