fixing crashes when removing buffers from a view

[quassel.git] / src / uisupport / bufferview.cpp

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 598686e..180db0d 100644 (file)
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -20,9 +20,11 @@
 
 #include "bufferview.h"
 
+#include "buffermodel.h"
 #include "bufferviewfilter.h"
 #include "buffersyncer.h"
 #include "client.h"
+#include "mappedselectionmodel.h"
 #include "network.h"
 #include "networkmodel.h"
 
@@ -78,11 +80,12 @@ void BufferView::init() {
 
 void BufferView::setModel(QAbstractItemModel *model) {
   delete selectionModel();
+  if(QTreeView::model()) {
+    disconnect(QTreeView::model(), SIGNAL(layoutChanged()), this, SLOT(layoutChanged()));
+  }
+  
   QTreeView::setModel(model);
   init();
-  if(!model)
-    return;
-
   // remove old Actions
   QList<QAction *> oldactions = header()->actions();
   foreach(QAction *action, oldactions) {
@@ -90,6 +93,11 @@ void BufferView::setModel(QAbstractItemModel *model) {
     action->deleteLater();
   }
 
+  if(!model)
+    return;
+
+  connect(model, SIGNAL(layoutChanged()), this, SLOT(layoutChanged()));
+  
   QString sectionName;
   QAction *showSection;
   for(int i = 1; i < model->columnCount(); i++) {
@@ -121,11 +129,25 @@ void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *
   } else {
     BufferViewFilter *filter = new BufferViewFilter(model_, config);
     setModel(filter);
-    connect(this, SIGNAL(removeBuffer(const QModelIndex &)), filter, SLOT(removeBuffer(const QModelIndex &)));
+    connect(this, SIGNAL(removeBuffer(const QModelIndex &)),
+           filter, SLOT(removeBuffer(const QModelIndex &)));
   }
   setConfig(config);
 }
 
+void BufferView::setSelectionModel(QItemSelectionModel *selectionModel) {
+  if(QTreeView::selectionModel())
+    disconnect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
+              model(), SIGNAL(checkPreviousCurrentForRemoval(QModelIndex, QModelIndex)));
+    
+  QTreeView::setSelectionModel(selectionModel);
+  BufferViewFilter *filter = qobject_cast<BufferViewFilter *>(model());
+  if(filter) {
+    connect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
+           filter, SLOT(checkPreviousCurrentForRemoval(QModelIndex, QModelIndex)));
+  }
+}
+
 void BufferView::setConfig(BufferViewConfig *config) {
   if(_config == config)
     return;
@@ -169,27 +191,54 @@ void BufferView::joinChannel(const QModelIndex &index) {
 }
 
 void BufferView::keyPressEvent(QKeyEvent *event) {
-  if(event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete) {
+  if((event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete) && !selectionModel()->selectedIndexes().isEmpty()) {
     event->accept();
     QModelIndex index = selectionModel()->selectedIndexes().first();
-    if(index.isValid()) {
+    if(index.isValid() && index.data(NetworkModel::ItemTypeRole) == NetworkModel::BufferItemType) {
       emit removeBuffer(index);
     }
   }
   QTreeView::keyPressEvent(event);
 }
 
-// ensure that newly inserted network nodes are expanded per default
 void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) {
   QTreeView::rowsInserted(parent, start, end);
-  if(model()->rowCount(parent) == 1 && parent.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType
-     && parent.data(NetworkModel::ItemActiveRole) == true) {
+
+  // ensure that newly inserted network nodes are expanded per default
+  if(parent.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
+    return;
+  
+  if(model()->rowCount(parent) == 1 && parent.data(NetworkModel::ItemActiveRole) == true) {
     // without updating the parent the expand will have no effect... Qt Bug?
     update(parent);
     expand(parent);
   }
 }
 
+void BufferView::layoutChanged() {
+  Q_ASSERT(model());
+
+  // expand all active networks
+  QModelIndex networkIdx;
+  for(int row = 0; row < model()->rowCount(); row++) {
+    networkIdx = model()->index(row, 0);
+    update(networkIdx);
+    if(model()->rowCount(networkIdx) > 0 && model()->data(networkIdx, NetworkModel::ItemActiveRole) == true) {
+      expand(networkIdx);
+    } else {
+      collapse(networkIdx);
+    }
+  }
+
+  // update selection to current one
+  MappedSelectionModel *mappedSelectionModel = qobject_cast<MappedSelectionModel *>(selectionModel());
+  if(!config() || !mappedSelectionModel)
+    return;
+
+  mappedSelectionModel->mappedSetCurrentIndex(Client::bufferModel()->standardSelectionModel()->currentIndex(), QItemSelectionModel::Current);
+  mappedSelectionModel->mappedSelect(Client::bufferModel()->standardSelectionModel()->selection(), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+}
+
 void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
   QTreeView::dataChanged(topLeft, bottomRight);