futher internal prettifications of the buffer switching process

[quassel.git] / src / qtui / bufferwidget.cpp

diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp
index 99a2f30..0ebcffb 100644 (file)
--- a/src/qtui/bufferwidget.cpp
+++ b/src/qtui/bufferwidget.cpp
@@ -31,7 +31,8 @@
 BufferWidget::BufferWidget(QWidget *parent)
   : QWidget(parent),
     _bufferModel(0),
-    _selectionModel(0)
+    _selectionModel(0),
+    _currentBuffer(0)
 {
   ui.setupUi(this);
 }
@@ -47,8 +48,11 @@ void BufferWidget::setModel(BufferModel *bufferModel) {
     disconnect(_bufferModel, 0, this, 0);
   }
   _bufferModel = bufferModel;
-  connect(bufferModel, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)),
-         this, SLOT(rowsAboutToBeRemoved(QModelIndex, int, int)));
+
+  if(bufferModel) {
+    connect(bufferModel, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)),
+           this, SLOT(rowsAboutToBeRemoved(QModelIndex, int, int)));
+  }
 }
 
 void BufferWidget::setSelectionModel(QItemSelectionModel *selectionModel) {
@@ -56,8 +60,11 @@ void BufferWidget::setSelectionModel(QItemSelectionModel *selectionModel) {
     disconnect(_selectionModel, 0, this, 0);
   }
   _selectionModel = selectionModel;
-  connect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
-         this, SLOT(currentChanged(QModelIndex, QModelIndex)));
+
+  if(selectionModel) {
+    connect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
+           this, SLOT(currentChanged(QModelIndex, QModelIndex)));
+  }
 }
 
 void BufferWidget::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) {
@@ -95,32 +102,36 @@ 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();
 }
 
 void BufferWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
-  Q_UNUSED(previous);
-  QVariant variant;
-
-  variant = current.data(NetworkModel::BufferIdRole);
-  if(!variant.isValid())
-    return;
-  
-  setCurrentBuffer(qVariantValue<BufferId>(variant));
+  BufferId newBufferId = current.data(NetworkModel::BufferIdRole).value<BufferId>();
+  BufferId oldBufferId = previous.data(NetworkModel::BufferIdRole).value<BufferId>();
+  if(newBufferId != oldBufferId)
+    setCurrentBuffer(newBufferId);
 }
 
 void BufferWidget::setCurrentBuffer(BufferId bufferId) {
-  ChatWidget *chatWidget;
+  if(!bufferId.isValid()) {
+    ui.stackedWidget->setCurrentWidget(ui.page);
+    return;
+  }
+  
+  ChatWidget *chatWidget = 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(_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(bufferId);
     QList<ChatLine *> lines;
@@ -135,7 +146,9 @@ void BufferWidget::setCurrentBuffer(BufferId bufferId) {
     ui.stackedWidget->addWidget(chatWidget);
     chatWidget->setFocusProxy(this);
   }
+  _currentBuffer = bufferId;
   ui.stackedWidget->setCurrentWidget(chatWidget);
+  buf->setVisible(true);
   setFocus();
 }