X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffermodel.cpp;h=b67a447da2509ccbc3d44e7336a4011ef324d525;hp=c9537f31a9d8ced01bf8636a429215375f25b5e1;hb=6cd120c0b28d9cca7e2465fad731977d532ce74d;hpb=2a04cb443a50e37165fc2d5447cc705a813efd3e

diff --git a/src/client/buffermodel.cpp b/src/client/buffermodel.cpp
index c9537f31..b67a447d 100644
--- a/src/client/buffermodel.cpp
+++ b/src/client/buffermodel.cpp
@@ -27,28 +27,24 @@
 
 BufferModel::BufferModel(NetworkModel *parent)
   : QSortFilterProxyModel(parent),
-    _selectionModelSynchronizer(this),
-    _propertyMapper(this)
+    _selectionModelSynchronizer(this)
 {
   setSourceModel(parent);
-
-  // initialize the Property Mapper
-  _propertyMapper.setModel(this);
-  _selectionModelSynchronizer.addRegularSelectionModel(_propertyMapper.selectionModel());
-  connect(&_selectionModelSynchronizer, SIGNAL(setCurrentIndex(QModelIndex, QItemSelectionModel::SelectionFlags)),
-	  this, SLOT(setCurrentIndex(QModelIndex, QItemSelectionModel::SelectionFlags)));
-}
-
-BufferModel::~BufferModel() {
+  if(QCoreApplication::instance()->arguments().contains("--debugbufferswitches")) {
+    connect(_selectionModelSynchronizer.selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
+	    this, SLOT(debug_currentChanged(const QModelIndex &, const QModelIndex &)));
+  }
 }
 
 bool BufferModel::filterAcceptsRow(int sourceRow, const QModelIndex &parent) const {
   Q_UNUSED(sourceRow);
-  // hide childs of buffers and everything below
-  if(parent.data(NetworkModel::ItemTypeRole) == NetworkModel::BufferItemType)
-    return false;
-  else
+  // only networks and buffers are allowed
+  if(!parent.isValid())
+    return true;
+  if(parent.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType)
     return true;
+
+  return false;
 }
 
 void BufferModel::synchronizeSelectionModel(MappedSelectionModel *selectionModel) {
@@ -63,23 +59,16 @@ void BufferModel::synchronizeView(QAbstractItemView *view) {
   view->setSelectionModel(mappedSelectionModel);
 }
 
-void BufferModel::mapProperty(int column, int role, QObject *target, const QByteArray &property) {
-  _propertyMapper.addMapping(column, role, target, property);
+QModelIndex BufferModel::currentIndex() {
+  return standardSelectionModel()->currentIndex();
 }
 
-// This Slot indicates that the user has selected a different buffer in the gui
-void BufferModel::setCurrentIndex(const QModelIndex &index, QItemSelectionModel::SelectionFlags command) {
-  Q_UNUSED(command)
-  BufferId newCurrentBuffer;
-  if(index.data(NetworkModel::ItemTypeRole) == NetworkModel::BufferItemType
-     && currentBuffer != (newCurrentBuffer = qVariantValue<BufferId>(index.data(NetworkModel::BufferIdRole)))) {
-    currentBuffer = newCurrentBuffer;
-    // FIXME: to something like: index.setData(ActivitRole, NoActivity);
-    // networkModel->bufferActivity(BufferItem::NoActivity, currentBuffer);
-    emit selectionChanged(index);
-  }
+void BufferModel::setCurrentIndex(const QModelIndex &newCurrent) {
+  _selectionModelSynchronizer.selectionModel()->setCurrentIndex(newCurrent, QItemSelectionModel::Current);
+  _selectionModelSynchronizer.selectionModel()->select(newCurrent, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
 }
 
-QModelIndex BufferModel::currentIndex() {
-  return propertyMapper()->selectionModel()->currentIndex();
+void BufferModel::debug_currentChanged(QModelIndex current, QModelIndex previous) {
+  Q_UNUSED(previous);
+  qDebug() << "Switched current Buffer: " << current << current.data().toString() << "Buffer:" << current.data(NetworkModel::BufferIdRole).value<BufferId>();
 }