Make selections in bufferviews (mostly) synchronous again.

[quassel.git] / gui / bufferviewwidget.cpp

diff --git a/gui/bufferviewwidget.cpp b/gui/bufferviewwidget.cpp
index 31023f7..a78754e 100644 (file)
--- a/gui/bufferviewwidget.cpp
+++ b/gui/bufferviewwidget.cpp
@@ -154,8 +154,8 @@ BufferTreeModel::BufferTreeModel(QObject *parent) : QAbstractItemModel(parent) {
   QList<QVariant> rootData;
   rootData << "Buffer" << "Network";
   rootItem = new TreeItem(rootData, 0);
-  
-  connect(this, SIGNAL(fakeUserInput(BufferId, QString)), guiProxy, SLOT(gsUserInput(BufferId, QString)));
+
+  connect(this, SIGNAL(fakeUserInput(BufferId, QString)), ClientProxy::instance(), SLOT(gsUserInput(BufferId, QString)));
 }
 
 BufferTreeModel::~BufferTreeModel() {
@@ -291,11 +291,11 @@ QModelIndex BufferTreeModel::getOrCreateBufferItemIndex(Buffer *buffer) {
     TreeItem *networkItem = static_cast<TreeItem*>(networkItemIndex.internalPointer());
 
     int nextRow = networkItem->childCount();
-    
+
     beginInsertRows(networkItemIndex, nextRow, nextRow);
     networkItem->appendChild(new BufferTreeItem(buffer, networkItem));
     endInsertRows();
-                         
+
     bufferItem[buffer] = static_cast<BufferTreeItem *>(networkItem->child(nextRow));
     return index(nextRow, 0, networkItemIndex);
   }
@@ -331,6 +331,17 @@ bool BufferTreeModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
   Buffer *sourceBuffer = static_cast<BufferTreeItem *>(networkItem[network]->child(sourcerow))->buffer();
   Buffer *targetBuffer = getBufferByIndex(parent);
   
+  if(sourceBuffer == targetBuffer) // we won't merge with ourself :)
+    return false;
+  
+  /*
+  if(QMessageBox::warning(static_cast<QWidget *>(QObject::parent()),
+                          tr("Merge Buffers?"),
+                          tr("Do you really want to merge the following Buffers?<br />%1.%2<br />%3.%4").arg(sourceBuffer->networkName()).arg(sourceBuffer->bufferName()).arg(targetBuffer->networkName()).arg(targetBuffer->bufferName()),
+                          QMessageBox::Yes|QMessageBox::No) == QMessageBox::No)
+    return false;
+
+  */
   qDebug() << "merging" << sourceBuffer->bufferName() << "with" << targetBuffer->bufferName();
   bufferItem.remove(getBufferByIndex(parent));
   removeRow(parent.row(), BufferTreeModel::parent(parent));
@@ -350,6 +361,7 @@ void BufferTreeModel::changeCurrent(const QModelIndex &current, const QModelInde
     currentBuffer = getBufferByIndex(current);
     bufferActivity(Buffer::NoActivity, currentBuffer);
     emit bufferSelected(currentBuffer);
+    emit updateSelection(current, QItemSelectionModel::ClearAndSelect);
   }
 }
 
@@ -398,6 +410,5 @@ BufferViewDock::BufferViewDock(QAbstractItemModel *model, QString viewname, Buff
 
   BufferViewWidget *viewWidget = new BufferViewWidget(this);
   viewWidget->treeView()->setFilteredModel(model, mode, nets);
-  viewWidget->treeView()->init();
   setWidget(viewWidget);
 }