Using join and part icons to indicate in the buffer view if a channel is joined.
[quassel.git] / src / uisupport / bufferviewfilter.cpp
index a14ab03..91d910c 100644 (file)
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
 
 #include "bufferviewfilter.h"
 
-#include <QColor>
+#include <QApplication>
+#include <QPalette>
+#include <QBrush>
 
+#include "bufferinfo.h"
 #include "buffermodel.h"
+#include "buffersettings.h"
 #include "client.h"
+#include "clientbufferviewconfig.h"
+#include "iconloader.h"
 #include "networkmodel.h"
 
-#include "uisettings.h"
+class CheckRemovalEvent : public QEvent {
+public:
+  CheckRemovalEvent(const QModelIndex &source_index) : QEvent(QEvent::User), index(source_index) {};
+  QPersistentModelIndex index;
+};
 
 /*****************************************
 * The Filter for the Tree View
 *****************************************/
 BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *config)
   : QSortFilterProxyModel(model),
-    _config(0)
+    _config(0),
+    _sortOrder(Qt::AscendingOrder),
+    _channelJoinedIcon(SmallIcon("irc-join-channel")),
+    _channelPartedIcon(SmallIcon("irc-close-channel")),
+    _userOfflineIcon(SmallIcon("im-user-offline")),
+    _userAwayIcon(SmallIcon("im-user-away")),
+    _userOnlineIcon(SmallIcon("im-user")),
+    _editMode(false),
+    _enableEditMode(tr("Show / Hide buffers"), this)
 {
   setConfig(config);
   setSourceModel(model);
-  connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(source_rowsInserted(const QModelIndex &, int, int)));
-                       
-  // setSortCaseSensitivity(Qt::CaseInsensitive);
+
   setDynamicSortFilter(true);
+
+  connect(this, SIGNAL(_dataChanged(const QModelIndex &, const QModelIndex &)),
+         this, SLOT(_q_sourceDataChanged(QModelIndex,QModelIndex)));
+
+  _enableEditMode.setCheckable(true);
+  _enableEditMode.setChecked(_editMode);
+  connect(&_enableEditMode, SIGNAL(toggled(bool)), this, SLOT(enableEditMode(bool)));
+
+  BufferSettings bufferSettings;
+  _showUserStateIcons = bufferSettings.showUserStateIcons();
+  bufferSettings.notify("ShowUserStateIcons", this, SLOT(showUserStateIconsChanged()));
+}
+
+void BufferViewFilter::showUserStateIconsChanged() {
+  BufferSettings bufferSettings;
+  _showUserStateIcons = bufferSettings.showUserStateIcons();
 }
 
 void BufferViewFilter::setConfig(BufferViewConfig *config) {
   if(_config == config)
     return;
-  
+
   if(_config) {
     disconnect(_config, 0, this, 0);
   }
 
   _config = config;
-  if(config) {
-    connect(config, SIGNAL(bufferViewNameSet(const QString &)), this, SLOT(invalidate()));
-    connect(config, SIGNAL(networkIdSet(const NetworkId &)), this, SLOT(invalidate()));
-    connect(config, SIGNAL(addNewBuffersAutomaticallySet(bool)), this, SLOT(invalidate()));
-    connect(config, SIGNAL(sortAlphabeticallySet(bool)), this, SLOT(invalidate()));
-    connect(config, SIGNAL(hideInactiveBuffersSet(bool)), this, SLOT(invalidate()));
-    connect(config, SIGNAL(allowedBufferTypesSet(int)), this, SLOT(invalidate()));
-    connect(config, SIGNAL(minimumActivitySet(int)), this, SLOT(invalidate()));
-    connect(config, SIGNAL(bufferListSet()), this, SLOT(invalidate()));
-    connect(config, SIGNAL(bufferAdded(const BufferId &, int)), this, SLOT(invalidate()));
-    connect(config, SIGNAL(bufferMoved(const BufferId &, int)), this, SLOT(invalidate()));
-    connect(config, SIGNAL(bufferRemoved(const BufferId &)), this, SLOT(invalidate()));
+
+  if(!config) {
+    invalidate();
+    setObjectName("");
+    return;
+  }
+
+  if(config->isInitialized()) {
+    configInitialized();
+  } else {
+    connect(config, SIGNAL(initDone()), this, SLOT(configInitialized()));
+    invalidate();
   }
+}
+
+void BufferViewFilter::configInitialized() {
+  if(!config())
+    return;
+
+  connect(config(), SIGNAL(bufferViewNameSet(const QString &)), this, SLOT(invalidate()));
+  connect(config(), SIGNAL(networkIdSet(const NetworkId &)), this, SLOT(invalidate()));
+  connect(config(), SIGNAL(addNewBuffersAutomaticallySet(bool)), this, SLOT(invalidate()));
+  connect(config(), SIGNAL(sortAlphabeticallySet(bool)), this, SLOT(invalidate()));
+  connect(config(), SIGNAL(hideInactiveBuffersSet(bool)), this, SLOT(invalidate()));
+  connect(config(), SIGNAL(allowedBufferTypesSet(int)), this, SLOT(invalidate()));
+  connect(config(), SIGNAL(minimumActivitySet(int)), this, SLOT(invalidate()));
+  connect(config(), SIGNAL(bufferListSet()), this, SLOT(invalidate()));
+  connect(config(), SIGNAL(bufferAdded(const BufferId &, int)), this, SLOT(invalidate()));
+  connect(config(), SIGNAL(bufferMoved(const BufferId &, int)), this, SLOT(invalidate()));
+  connect(config(), SIGNAL(bufferRemoved(const BufferId &)), this, SLOT(invalidate()));
+  connect(config(), SIGNAL(bufferPermanentlyRemoved(const BufferId &)), this, SLOT(invalidate()));
+
+  disconnect(config(), SIGNAL(initDone()), this, SLOT(configInitialized()));
+
+  setObjectName(config()->bufferViewName());
+
   invalidate();
+  emit configChanged();
+}
+
+QList<QAction *> BufferViewFilter::actions(const QModelIndex &index) {
+  Q_UNUSED(index)
+  QList<QAction *> actionList;
+  actionList << &_enableEditMode;
+  return actionList;
 }
 
+void BufferViewFilter::enableEditMode(bool enable) {
+  if(_editMode == enable) {
+    return;
+  }
+  _editMode = enable;
+
+  if(!config())
+    return;
+
+  if(enable == false) {
+    int numBuffers = config()->bufferList().count();
+    QSet<BufferId>::const_iterator iter;
+    for(iter = _toAdd.constBegin(); iter != _toAdd.constEnd(); iter++) {
+      if(config()->bufferList().contains(*iter))
+       continue;
+      config()->requestAddBuffer(*iter, numBuffers);
+    }
+    for(iter = _toTempRemove.constBegin(); iter != _toTempRemove.constEnd(); iter++) {
+      if(config()->temporarilyRemovedBuffers().contains(*iter))
+        continue;
+      config()->requestRemoveBuffer(*iter);
+    }
+    for(iter = _toRemove.constBegin(); iter != _toRemove.constEnd(); iter++) {
+      if(config()->removedBuffers().contains(*iter))
+        continue;
+      config()->requestRemoveBufferPermanently(*iter);
+    }
+  }
+  _toAdd.clear();
+  _toTempRemove.clear();
+  _toRemove.clear();
+
+  invalidate();
+}
+
+
 Qt::ItemFlags BufferViewFilter::flags(const QModelIndex &index) const {
-  Qt::ItemFlags flags = mapToSource(index).flags();
-  if(_config && index == QModelIndex() || index.parent() == QModelIndex())
-    flags |= Qt::ItemIsDropEnabled;
+  QModelIndex source_index = mapToSource(index);
+  Qt::ItemFlags flags = sourceModel()->flags(source_index);
+  if(config()) {
+    NetworkModel::ItemType itemType = (NetworkModel::ItemType)sourceModel()->data(source_index, NetworkModel::ItemTypeRole).toInt();
+    BufferInfo::Type bufferType = (BufferInfo::Type)sourceModel()->data(source_index, NetworkModel::BufferTypeRole).toInt();
+    if(source_index == QModelIndex() || itemType == NetworkModel::NetworkItemType) {
+      flags |= Qt::ItemIsDropEnabled;
+    } else if(_editMode) {
+      flags |= Qt::ItemIsUserCheckable | Qt::ItemIsTristate;
+    }
+
+    // prohibit dragging of most items. and most drop places
+    // only query to query is allowed for merging
+    if(bufferType != BufferInfo::QueryBuffer) {
+      ClientBufferViewConfig *clientConf = qobject_cast<ClientBufferViewConfig *>(config());
+      if(clientConf && clientConf->isLocked()) {
+       flags &= ~(Qt::ItemIsDropEnabled | Qt::ItemIsDragEnabled);
+      }
+    }
+  }
   return flags;
 }
 
@@ -80,8 +196,9 @@ bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action
     return QSortFilterProxyModel::dropMimeData(data, action, row, column, parent);
 
   NetworkId droppedNetworkId;
-  if(parent.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType)
-    droppedNetworkId = parent.data(NetworkModel::NetworkIdRole).value<NetworkId>();
+  QModelIndex source_parent = mapToSource(parent);
+  if(sourceModel()->data(source_parent, NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType)
+    droppedNetworkId = sourceModel()->data(source_parent, NetworkModel::NetworkIdRole).value<NetworkId>();
 
   QList< QPair<NetworkId, BufferId> > bufferList = NetworkModel::mimeDataToBufferList(data);
   BufferId bufferId;
@@ -93,11 +210,18 @@ bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action
     if(droppedNetworkId == networkId) {
       if(row < 0)
        row = 0;
+
       if(row < rowCount(parent)) {
-       BufferId beforeBufferId = parent.child(row, 0).data(NetworkModel::BufferIdRole).value<BufferId>();
+       QModelIndex source_child = mapToSource(index(row, 0, parent));
+       BufferId beforeBufferId = sourceModel()->data(source_child, NetworkModel::BufferIdRole).value<BufferId>();
        pos = config()->bufferList().indexOf(beforeBufferId);
+       if(_sortOrder == Qt::DescendingOrder)
+         pos++;
       } else {
-       pos = config()->bufferList().count();
+       if(_sortOrder == Qt::AscendingOrder)
+         pos = config()->bufferList().count();
+       else
+         pos = 0;
       }
 
       if(config()->bufferList().contains(bufferId)) {
@@ -115,10 +239,15 @@ bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action
   return true;
 }
 
-void BufferViewFilter::addBuffer(const BufferId &bufferId) {
-  if(config()->bufferList().contains(bufferId))
+void BufferViewFilter::sort(int column, Qt::SortOrder order) {
+  _sortOrder = order;
+  QSortFilterProxyModel::sort(column, order);
+}
+
+void BufferViewFilter::addBuffer(const BufferId &bufferId) const {
+  if(!config() || config()->bufferList().contains(bufferId))
     return;
-  
+
   int pos = config()->bufferList().count();
   bool lt;
   for(int i = 0; i < config()->bufferList().count(); i++) {
@@ -126,7 +255,7 @@ void BufferViewFilter::addBuffer(const BufferId &bufferId) {
       lt = bufferIdLessThan(bufferId, config()->bufferList()[i]);
     else
       lt = bufferId < config()->bufferList()[i];
-    
+
     if(lt) {
       pos = i;
       break;
@@ -135,32 +264,49 @@ void BufferViewFilter::addBuffer(const BufferId &bufferId) {
   config()->requestAddBuffer(bufferId, pos);
 }
 
-void BufferViewFilter::removeBuffer(const QModelIndex &index) {
+bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const {
+  // no config -> "all buffers" -> accept everything
   if(!config())
-    return;
-  
-  BufferId bufferId = data(index, NetworkModel::BufferIdRole).value<BufferId>();
-  config()->requestRemoveBuffer(bufferId);
-}
+    return true;
 
+  BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value<BufferId>();
+  Q_ASSERT(bufferId.isValid());
 
-bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const {
-  if(!_config)
-    return true;
+  int activityLevel = sourceModel()->data(source_bufferIndex, NetworkModel::BufferActivityRole).toInt();
+
+  if(!config()->bufferList().contains(bufferId) && !_editMode) {
+    // add the buffer if...
+    if(config()->isInitialized()
+       && !config()->removedBuffers().contains(bufferId) // it hasn't been manually removed and either
+       && ((config()->addNewBuffersAutomatically() && !config()->temporarilyRemovedBuffers().contains(bufferId)) // is totally unknown to us (a new buffer)...
+          || (config()->temporarilyRemovedBuffers().contains(bufferId) && activityLevel > BufferInfo::OtherActivity))) { // or was just temporarily hidden and has a new message waiting for us.
+      addBuffer(bufferId);
+    }
+    // note: adding the buffer to the valid list does not temper with the following filters ("show only channels" and stuff)
+    return false;
+  }
 
-  if(!(_config->allowedBufferTypes() & (BufferInfo::Type)source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt()))
+  if(config()->networkId().isValid() && config()->networkId() != sourceModel()->data(source_bufferIndex, NetworkModel::NetworkIdRole).value<NetworkId>())
     return false;
 
-  if(_config->hideInactiveBuffers() && !source_bufferIndex.data(NetworkModel::ItemActiveRole).toBool())
+  int allowedBufferTypes = config()->allowedBufferTypes();
+  if(!config()->networkId().isValid())
+    allowedBufferTypes &= ~BufferInfo::StatusBuffer;
+  if(!(allowedBufferTypes & sourceModel()->data(source_bufferIndex, NetworkModel::BufferTypeRole).toInt()))
     return false;
 
-  if(_config->minimumActivity() > source_bufferIndex.data(NetworkModel::BufferActivityRole).toInt()) {
-    if(!Client::bufferModel()->standardSelectionModel()->isSelected(source_bufferIndex))
-      return false;
-  }
+  // the following dynamic filters may not trigger if the buffer is currently selected.
+  QModelIndex currentIndex = Client::bufferModel()->standardSelectionModel()->currentIndex();
+  if(bufferId == Client::bufferModel()->data(currentIndex, NetworkModel::BufferIdRole).value<BufferId>())
+    return true;
 
-  BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value<BufferId>();
-  return _config->bufferList().contains(bufferId);
+  if(config()->hideInactiveBuffers() && !sourceModel()->data(source_bufferIndex, NetworkModel::ItemActiveRole).toBool() && activityLevel <= BufferInfo::OtherActivity)
+    return false;
+
+  if(config()->minimumActivity() > activityLevel)
+    return false;
+
+  return true;
 }
 
 bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) const {
@@ -176,27 +322,34 @@ bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) cons
 
 bool BufferViewFilter::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const {
   QModelIndex child = sourceModel()->index(source_row, 0, source_parent);
-  
+
   if(!child.isValid()) {
     qWarning() << "filterAcceptsRow has been called with an invalid Child";
     return false;
   }
 
-  if(source_parent == QModelIndex())
+  NetworkModel::ItemType childType = (NetworkModel::ItemType)sourceModel()->data(child, NetworkModel::ItemTypeRole).toInt();
+  switch(childType) {
+  case NetworkModel::NetworkItemType:
     return filterAcceptNetwork(child);
-  else
+  case NetworkModel::BufferItemType:
     return filterAcceptBuffer(child);
+  default:
+    return false;
+  }
 }
 
 bool BufferViewFilter::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const {
-  int itemType = sourceModel()->data(source_left, NetworkModel::ItemTypeRole).toInt();
+  int leftItemType = sourceModel()->data(source_left, NetworkModel::ItemTypeRole).toInt();
+  int rightItemType = sourceModel()->data(source_right, NetworkModel::ItemTypeRole).toInt();
+  int itemType = leftItemType & rightItemType;
   switch(itemType) {
   case NetworkModel::NetworkItemType:
     return networkLessThan(source_left, source_right);
   case NetworkModel::BufferItemType:
     return bufferLessThan(source_left, source_right);
   default:
-    return QSortFilterProxyModel::lessThan(source_left, source_right);    
+    return QSortFilterProxyModel::lessThan(source_left, source_right);
   }
 }
 
@@ -204,72 +357,160 @@ bool BufferViewFilter::bufferLessThan(const QModelIndex &source_left, const QMod
   BufferId leftBufferId = sourceModel()->data(source_left, NetworkModel::BufferIdRole).value<BufferId>();
   BufferId rightBufferId = sourceModel()->data(source_right, NetworkModel::BufferIdRole).value<BufferId>();
   if(config()) {
-    return config()->bufferList().indexOf(leftBufferId) < config()->bufferList().indexOf(rightBufferId);
+    int leftPos = config()->bufferList().indexOf(leftBufferId);
+    int rightPos = config()->bufferList().indexOf(rightBufferId);
+    if(leftPos == -1 && rightPos == -1)
+      return QSortFilterProxyModel::lessThan(source_left, source_right);
+    if(leftPos == -1 || rightPos == -1)
+      return !(leftPos < rightPos);
+    return leftPos < rightPos;
   } else
-    return leftBufferId < rightBufferId;
+    return bufferIdLessThan(leftBufferId, rightBufferId);
 }
 
 bool BufferViewFilter::networkLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const {
   NetworkId leftNetworkId = sourceModel()->data(source_left, NetworkModel::NetworkIdRole).value<NetworkId>();
   NetworkId rightNetworkId = sourceModel()->data(source_right, NetworkModel::NetworkIdRole).value<NetworkId>();
 
-  if(config() && config()->sortAlphabetically())
-    return QSortFilterProxyModel::lessThan(source_left, source_right);
-  else
-    return leftNetworkId < rightNetworkId;
+  return QSortFilterProxyModel::lessThan(source_left, source_right);
 }
 
 QVariant BufferViewFilter::data(const QModelIndex &index, int role) const {
-  if(role == Qt::ForegroundRole)
-    return foreground(index);
-  else
+  switch(role) {
+  case Qt::DecorationRole:
+    return icon(index);
+  case Qt::CheckStateRole:
+    return checkedState(index);
+  default:
     return QSortFilterProxyModel::data(index, role);
+  }
 }
 
-QVariant BufferViewFilter::foreground(const QModelIndex &index) const {
-  UiSettings s("QtUi/Colors");
-  QVariant inactiveActivity = s.value("inactiveActivityFG", QVariant(QColor(Qt::gray)));
-  QVariant noActivity = s.value("noActivityFG", QVariant(QColor(Qt::black)));
-  QVariant highlightActivity = s.value("highlightActivityFG", QVariant(QColor(Qt::magenta)));
-  QVariant newMessageActivity = s.value("newMessageActivityFG", QVariant(QColor(Qt::green)));
-  QVariant otherActivity = s.value("otherActivityFG", QVariant(QColor(Qt::darkGreen)));
+QVariant BufferViewFilter::icon(const QModelIndex &index) const {
+  if(!_showUserStateIcons || (config() && config()->disableDecoration()))
+    return QVariant();
 
-  if(!index.data(NetworkModel::ItemActiveRole).toBool())
-    return inactiveActivity;
+  if(index.column() != 0)
+    return QVariant();
 
-  Buffer::ActivityLevel activity = (Buffer::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
+  QModelIndex source_index = mapToSource(index);
+  NetworkModel::ItemType itemType = (NetworkModel::ItemType)sourceModel()->data(source_index, NetworkModel::ItemTypeRole).toInt();
+  BufferInfo::Type bufferType = (BufferInfo::Type)sourceModel()->data(source_index, NetworkModel::BufferTypeRole).toInt();
+  bool isActive = sourceModel()->data(source_index, NetworkModel::ItemActiveRole).toBool();
 
-  if(activity & Buffer::Highlight)
-    return highlightActivity;
-  if(activity & Buffer::NewMessage)
-    return newMessageActivity;
-  if(activity & Buffer::OtherActivity)
-    return otherActivity;
+  if(itemType != NetworkModel::BufferItemType)
+    return QVariant();
 
-  return noActivity;
+  switch(bufferType) {
+  case BufferInfo::ChannelBuffer:
+    if(isActive)
+      return _channelJoinedIcon;
+    else
+      return _channelPartedIcon;
+  case BufferInfo::QueryBuffer:
+    if(!isActive)
+      return _userOfflineIcon;
+    if(sourceModel()->data(source_index, NetworkModel::UserAwayRole).toBool())
+      return _userAwayIcon;
+    else
+      return _userOnlineIcon;
+  default:
+    return QVariant();
+  }
+}
+
+QVariant BufferViewFilter::checkedState(const QModelIndex &index) const {
+  if(!_editMode || !config())
+    return QVariant();
+
+  QModelIndex source_index = mapToSource(index);
+  if(source_index == QModelIndex() || sourceModel()->data(source_index, NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType)
+    return QVariant();
+
+  BufferId bufferId = sourceModel()->data(source_index, NetworkModel::BufferIdRole).value<BufferId>();
+  if(_toAdd.contains(bufferId))
+    return Qt::Checked;
+
+  if(_toTempRemove.contains(bufferId))
+    return Qt::PartiallyChecked;
+
+  if(_toRemove.contains(bufferId))
+    return Qt::Unchecked;
+
+  if(config()->bufferList().contains(bufferId))
+    return Qt::Checked;
+
+  if(config()->temporarilyRemovedBuffers().contains(bufferId))
+    return Qt::PartiallyChecked;
 
+  return Qt::Unchecked;
 }
 
-void BufferViewFilter::source_rowsInserted(const QModelIndex &parent, int start, int end) {
-  if(parent.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
-    return;
+bool BufferViewFilter::setData(const QModelIndex &index, const QVariant &value, int role) {
+  switch(role) {
+  case Qt::CheckStateRole:
+    return setCheckedState(index, Qt::CheckState(value.toInt()));
+  default:
+    return QSortFilterProxyModel::setData(index, value, role);
+  }
+}
 
-  if(!config() || !config()->addNewBuffersAutomatically())
-    return;
+bool BufferViewFilter::setCheckedState(const QModelIndex &index, Qt::CheckState state) {
+  QModelIndex source_index = mapToSource(index);
+  BufferId bufferId = sourceModel()->data(source_index, NetworkModel::BufferIdRole).value<BufferId>();
+  if(!bufferId.isValid())
+    return false;
 
-  for(int row = start; row <= end; row++) {
-    addBuffer(parent.child(row, 0).data(NetworkModel::BufferIdRole).value<BufferId>());
+  switch(state) {
+  case Qt::Unchecked:
+    _toAdd.remove(bufferId);
+    _toTempRemove.remove(bufferId);
+    _toRemove << bufferId;
+    break;
+  case Qt::PartiallyChecked:
+    _toAdd.remove(bufferId);
+    _toTempRemove << bufferId;
+    _toRemove.remove(bufferId);
+    break;
+  case Qt::Checked:
+    _toAdd << bufferId;
+    _toTempRemove.remove(bufferId);
+    _toRemove.remove(bufferId);
+    break;
+  default:
+    return false;
   }
+  emit dataChanged(index, index);
+  return true;
+}
+
+void BufferViewFilter::checkPreviousCurrentForRemoval(const QModelIndex &current, const QModelIndex &previous) {
+  Q_UNUSED(current);
+  if(previous.isValid())
+    QCoreApplication::postEvent(this, new CheckRemovalEvent(previous));
+}
+
+void BufferViewFilter::customEvent(QEvent *event) {
+  if(event->type() != QEvent::User)
+    return;
+
+  CheckRemovalEvent *removalEvent = static_cast<CheckRemovalEvent *>(event);
+  checkItemForRemoval(removalEvent->index);
+
+  event->accept();
 }
 
-// ******************************
-//  Helper
-// ******************************
-bool bufferIdLessThan(const BufferId &left, const BufferId &right) {
+void BufferViewFilter::checkItemsForRemoval(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
+  QModelIndex source_topLeft = mapToSource(topLeft);
+  QModelIndex source_bottomRight = mapToSource(bottomRight);
+  emit _dataChanged(source_topLeft, source_bottomRight);
+}
+
+bool BufferViewFilter::bufferIdLessThan(const BufferId &left, const BufferId &right) {
   Q_CHECK_PTR(Client::networkModel());
   if(!Client::networkModel())
     return true;
-  
+
   QModelIndex leftIndex = Client::networkModel()->bufferIndex(left);
   QModelIndex rightIndex = Client::networkModel()->bufferIndex(right);
 
@@ -279,6 +520,6 @@ bool bufferIdLessThan(const BufferId &left, const BufferId &right) {
   if(leftType != rightType)
     return leftType < rightType;
   else
-    return Client::networkModel()->data(leftIndex, Qt::DisplayRole).toString() < Client::networkModel()->data(rightIndex, Qt::DisplayRole).toString();
+    return QString::compare(Client::networkModel()->data(leftIndex, Qt::DisplayRole).toString(), Client::networkModel()->data(rightIndex, Qt::DisplayRole).toString(), Qt::CaseInsensitive) < 0;
 }