X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=f5ae444725a00de6b55b64e4a5a8dcf912b50168;hp=e02549c6b6c1a6be36cc476c026fb6cbf0c1990e;hb=ac654fdeeece68d64561920479f064ad3c237e26;hpb=a14eac175cceda16f50cb4519182f819cf7f6b23

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index e02549c6..f5ae4447 100644
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-2013 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,309 +15,572 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "bufferviewfilter.h"
 
-#include <QCoreApplication>
+#include <QApplication>
+#include <QPalette>
+#include <QBrush>
 
+#include "bufferinfo.h"
 #include "buffermodel.h"
+#include "buffersettings.h"
 #include "client.h"
+#include "clientbufferviewconfig.h"
+#include "graphicalui.h"
+#include "iconloader.h"
 #include "networkmodel.h"
+#include "uistyle.h"
 
-#include "uisettings.h"
-
-class CheckRemovalEvent : public QEvent {
+class CheckRemovalEvent : public QEvent
+{
 public:
-  CheckRemovalEvent(const QModelIndex &source_index) : QEvent(QEvent::User), index(source_index) {};
-  QPersistentModelIndex index;
+    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)
+    : QSortFilterProxyModel(model),
+    _config(0),
+    _sortOrder(Qt::AscendingOrder),
+    _showServerQueries(false),
+    _editMode(false),
+    _enableEditMode(tr("Show / Hide Chats"), this)
 {
-  setConfig(config);
-  setSourceModel(model);
-  connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(source_rowsInserted(const QModelIndex &, int, int)));
-			
-  setDynamicSortFilter(true);
+    setConfig(config);
+    setSourceModel(model);
 
-  loadColors();
+    setDynamicSortFilter(true);
 
-  connect(this, SIGNAL(_dataChanged(const QModelIndex &, const QModelIndex &)),
-	  this, SLOT(_q_sourceDataChanged(QModelIndex,QModelIndex)));
-}
+    connect(this, SIGNAL(_dataChanged(const QModelIndex &, const QModelIndex &)),
+        this, SLOT(_q_sourceDataChanged(QModelIndex, QModelIndex)));
 
-void BufferViewFilter::loadColors() {
-  UiSettings s("QtUi/Colors");
-  _FgColorInactiveActivity = s.value("inactiveActivityFG", QVariant(QColor(Qt::gray))).value<QColor>();
-  _FgColorNoActivity = s.value("noActivityFG", QVariant(QColor(Qt::black))).value<QColor>();
-  _FgColorHighlightActivity = s.value("highlightActivityFG", QVariant(QColor(Qt::magenta))).value<QColor>();
-  _FgColorNewMessageActivity = s.value("newMessageActivityFG", QVariant(QColor(Qt::green))).value<QColor>();
-  _FgColorOtherActivity = s.value("otherActivityFG", QVariant(QColor(Qt::darkGreen))).value<QColor>();
+    _enableEditMode.setCheckable(true);
+    _enableEditMode.setChecked(_editMode);
+    connect(&_enableEditMode, SIGNAL(toggled(bool)), this, SLOT(enableEditMode(bool)));
+
+    BufferSettings defaultSettings;
+    defaultSettings.notify("ServerNoticesTarget", this, SLOT(showServerQueriesChanged()));
+    showServerQueriesChanged();
 }
 
-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()));
-  }
-  invalidate();
+
+void BufferViewFilter::setConfig(BufferViewConfig *config)
+{
+    if (_config == config)
+        return;
+
+    if (_config) {
+        disconnect(_config, 0, this, 0);
+    }
+
+    _config = config;
+
+    if (!config) {
+        invalidate();
+        setObjectName("");
+        return;
+    }
+
+    if (config->isInitialized()) {
+        configInitialized();
+    }
+    else {
+        // we use a queued connection here since manipulating the connection list of a sending object
+        // doesn't seem to be such a good idea while executing a connected slots.
+        connect(config, SIGNAL(initDone()), this, SLOT(configInitialized()), Qt::QueuedConnection);
+        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;
-  return flags;
+
+void BufferViewFilter::configInitialized()
+{
+    if (!config())
+        return;
+
+//   connect(config(), SIGNAL(bufferViewNameSet(const QString &)), this, SLOT(invalidate()));
+    connect(config(), SIGNAL(configChanged()), 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();
 }
 
-bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) {
-  if(!config() || !NetworkModel::mimeContainsBufferList(data))
-    return QSortFilterProxyModel::dropMimeData(data, action, row, column, parent);
-
-  NetworkId droppedNetworkId;
-  if(parent.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType)
-    droppedNetworkId = parent.data(NetworkModel::NetworkIdRole).value<NetworkId>();
-
-  QList< QPair<NetworkId, BufferId> > bufferList = NetworkModel::mimeDataToBufferList(data);
-  BufferId bufferId;
-  NetworkId networkId;
-  int pos;
-  for(int i = 0; i < bufferList.count(); i++) {
-    networkId = bufferList[i].first;
-    bufferId = bufferList[i].second;
-    if(droppedNetworkId == networkId) {
-      if(row < 0)
-	row = 0;
-      if(row < rowCount(parent)) {
-	BufferId beforeBufferId = parent.child(row, 0).data(NetworkModel::BufferIdRole).value<BufferId>();
-	pos = config()->bufferList().indexOf(beforeBufferId);
-      } else {
-	pos = config()->bufferList().count();
-      }
-
-      if(config()->bufferList().contains(bufferId)) {
-	if(config()->bufferList().indexOf(bufferId) < pos)
-	  pos--;
-	config()->requestMoveBuffer(bufferId, pos);
-      } else {
-	config()->requestAddBuffer(bufferId, pos);
-      }
-
-    } else {
-      addBuffer(bufferId);
+
+void BufferViewFilter::showServerQueriesChanged()
+{
+    BufferSettings bufferSettings;
+
+    bool showQueries = (bufferSettings.serverNoticesTarget() & BufferSettings::DefaultBuffer);
+    if (_showServerQueries != showQueries) {
+        _showServerQueries = showQueries;
+        invalidate();
     }
-  }
-  return true;
 }
 
-void BufferViewFilter::addBuffer(const BufferId &bufferId) {
-  if(!config() || config()->bufferList().contains(bufferId))
-    return;
-  
-  int pos = config()->bufferList().count();
-  bool lt;
-  for(int i = 0; i < config()->bufferList().count(); i++) {
-    if(config() && config()->sortAlphabetically())
-      lt = bufferIdLessThan(bufferId, config()->bufferList()[i]);
-    else
-      lt = bufferId < config()->bufferList()[i];
-    
-    if(lt) {
-      pos = i;
-      break;
+
+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;
     }
-  }
-  config()->requestAddBuffer(bufferId, pos);
+    _editMode = enable;
+
+    if (!config())
+        return;
+
+    if (enable == false) {
+        addBuffers(QList<BufferId>::fromSet(_toAdd));
+        QSet<BufferId>::const_iterator iter;
+        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();
 }
 
-void BufferViewFilter::removeBuffer(const QModelIndex &index) {
-  if(!config() || !index.isValid() || index.data(NetworkModel::ItemTypeRole) != NetworkModel::BufferItemType)
-    return;
 
-  BufferId bufferId = data(index, NetworkModel::BufferIdRole).value<BufferId>();
-  config()->requestRemoveBuffer(bufferId);
+Qt::ItemFlags BufferViewFilter::flags(const QModelIndex &index) const
+{
+    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;
 }
 
 
-bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const {
-  BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value<BufferId>();
-  Q_ASSERT(bufferId.isValid());
-  if(!_config)
+bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent)
+{
+    if (!config() || !NetworkModel::mimeContainsBufferList(data))
+        return QSortFilterProxyModel::dropMimeData(data, action, row, column, parent);
+
+    NetworkId droppedNetworkId;
+    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;
+    NetworkId networkId;
+    int pos;
+    for (int i = 0; i < bufferList.count(); i++) {
+        networkId = bufferList[i].first;
+        bufferId = bufferList[i].second;
+        if (droppedNetworkId == networkId) {
+            if (row < 0)
+                row = 0;
+
+            if (row < rowCount(parent)) {
+                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 {
+                if (_sortOrder == Qt::AscendingOrder)
+                    pos = config()->bufferList().count();
+                else
+                    pos = 0;
+            }
+
+            if (config()->bufferList().contains(bufferId) && !config()->sortAlphabetically()) {
+                if (config()->bufferList().indexOf(bufferId) < pos)
+                    pos--;
+                ClientBufferViewConfig *clientConf = qobject_cast<ClientBufferViewConfig *>(config());
+                if (!clientConf || !clientConf->isLocked())
+                    config()->requestMoveBuffer(bufferId, pos);
+            }
+            else {
+                config()->requestAddBuffer(bufferId, pos);
+            }
+        }
+        else {
+            addBuffer(bufferId);
+        }
+    }
     return true;
-  
-  if(config()->networkId().isValid() && config()->networkId() != sourceModel()->data(source_bufferIndex, NetworkModel::NetworkIdRole).value<NetworkId>())
-    return false;
+}
 
-  if(!(_config->allowedBufferTypes() & (BufferInfo::Type)source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt()))
-    return false;
 
-  if(_config->hideInactiveBuffers() && !source_bufferIndex.data(NetworkModel::ItemActiveRole).toBool())
-    return false;
+void BufferViewFilter::sort(int column, Qt::SortOrder order)
+{
+    _sortOrder = order;
+    QSortFilterProxyModel::sort(column, order);
+}
 
-  if(_config->minimumActivity() > source_bufferIndex.data(NetworkModel::BufferActivityRole).toInt()) {
-    if(bufferId != Client::bufferModel()->standardSelectionModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>())
-      return false;
-  }
 
-  return _config->bufferList().contains(bufferId);
+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++) {
+        if (config() && config()->sortAlphabetically())
+            lt = bufferIdLessThan(bufferId, config()->bufferList()[i]);
+        else
+            lt = bufferId < config()->bufferList()[i];
+
+        if (lt) {
+            pos = i;
+            break;
+        }
+    }
+    config()->requestAddBuffer(bufferId, pos);
 }
 
-bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) const {
-  if(!config())
-    return true;
 
-  if(!config()->networkId().isValid()) {
+void BufferViewFilter::addBuffers(const QList<BufferId> &bufferIds) const
+{
+    if (!config())
+        return;
+
+    QList<BufferId> bufferList = config()->bufferList();
+    foreach(BufferId bufferId, bufferIds) {
+        if (bufferList.contains(bufferId))
+            continue;
+
+        int pos = bufferList.count();
+        bool lt;
+        for (int i = 0; i < bufferList.count(); i++) {
+            if (config() && config()->sortAlphabetically())
+                lt = bufferIdLessThan(bufferId, bufferList[i]);
+            else
+                lt = bufferId < config()->bufferList()[i];
+
+            if (lt) {
+                pos = i;
+                bufferList.insert(pos, bufferId);
+                break;
+            }
+        }
+        config()->requestAddBuffer(bufferId, pos);
+    }
+}
+
+
+bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const
+{
+    // no config -> "all buffers" -> accept everything
+    if (!config())
+        return true;
+
+    BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value<BufferId>();
+    Q_ASSERT(bufferId.isValid());
+
+    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()->networkId().isValid() && config()->networkId() != sourceModel()->data(source_bufferIndex, NetworkModel::NetworkIdRole).value<NetworkId>())
+        return false;
+
+    int allowedBufferTypes = config()->allowedBufferTypes();
+    if (!config()->networkId().isValid())
+        allowedBufferTypes &= ~BufferInfo::StatusBuffer;
+    int bufferType = sourceModel()->data(source_bufferIndex, NetworkModel::BufferTypeRole).toInt();
+    if (!(allowedBufferTypes & bufferType))
+        return false;
+
+    if (bufferType & BufferInfo::QueryBuffer && !_showServerQueries && sourceModel()->data(source_bufferIndex, Qt::DisplayRole).toString().contains('.')) {
+        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;
+
+    if (config()->hideInactiveBuffers() && !sourceModel()->data(source_bufferIndex, NetworkModel::ItemActiveRole).toBool() && activityLevel <= BufferInfo::OtherActivity)
+        return false;
+
+    if (config()->minimumActivity() > activityLevel)
+        return false;
+
     return true;
-  } else {
-    return config()->networkId() == sourceModel()->data(source_index, NetworkModel::NetworkIdRole).value<NetworkId>();
-  }
 }
 
-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.isValid())
-    return filterAcceptNetwork(child);
-  else
-    return filterAcceptBuffer(child);
+
+bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) const
+{
+    if (!config())
+        return true;
+
+    if (!config()->networkId().isValid()) {
+        return true;
+    }
+    else {
+        return config()->networkId() == sourceModel()->data(source_index, NetworkModel::NetworkIdRole).value<NetworkId>();
+    }
 }
 
-bool BufferViewFilter::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const {
-  int itemType = sourceModel()->data(source_left, NetworkModel::ItemTypeRole).toInt();
-  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);    
-  }
+
+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;
+    }
+
+    NetworkModel::ItemType childType = (NetworkModel::ItemType)sourceModel()->data(child, NetworkModel::ItemTypeRole).toInt();
+    switch (childType) {
+    case NetworkModel::NetworkItemType:
+        return filterAcceptNetwork(child);
+    case NetworkModel::BufferItemType:
+        return filterAcceptBuffer(child);
+    default:
+        return false;
+    }
 }
 
-bool BufferViewFilter::bufferLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const {
-  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);
-  } else
-    return bufferIdLessThan(leftBufferId, rightBufferId);
+
+bool BufferViewFilter::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const
+{
+    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);
+    }
+}
+
+
+bool BufferViewFilter::bufferLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const
+{
+    BufferId leftBufferId = sourceModel()->data(source_left, NetworkModel::BufferIdRole).value<BufferId>();
+    BufferId rightBufferId = sourceModel()->data(source_right, NetworkModel::BufferIdRole).value<BufferId>();
+    if (config()) {
+        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 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())
+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>();
+
     return QSortFilterProxyModel::lessThan(source_left, source_right);
-  else
-    return leftNetworkId < rightNetworkId;
 }
 
-QVariant BufferViewFilter::data(const QModelIndex &index, int role) const {
-  if(role == Qt::ForegroundRole)
-    return foreground(index);
-  else
-    return QSortFilterProxyModel::data(index, role);
+
+QVariant BufferViewFilter::data(const QModelIndex &index, int role) const
+{
+    switch (role) {
+    case Qt::FontRole:
+    case Qt::ForegroundRole:
+    case Qt::BackgroundRole:
+    case Qt::DecorationRole:
+        if ((config() && config()->disableDecoration()))
+            return QVariant();
+        return GraphicalUi::uiStyle()->bufferViewItemData(mapToSource(index), role);
+    case Qt::CheckStateRole:
+        return checkedState(index);
+    default:
+        return QSortFilterProxyModel::data(index, role);
+    }
 }
 
-QVariant BufferViewFilter::foreground(const QModelIndex &index) const {
-  if(!index.data(NetworkModel::ItemActiveRole).toBool())
-    return _FgColorInactiveActivity;
 
-  Buffer::ActivityLevel activity = (Buffer::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
+QVariant BufferViewFilter::checkedState(const QModelIndex &index) const
+{
+    if (!_editMode || !config())
+        return QVariant();
 
-  if(activity & Buffer::Highlight)
-    return _FgColorHighlightActivity;
-  if(activity & Buffer::NewMessage)
-    return _FgColorNewMessageActivity;
-  if(activity & Buffer::OtherActivity)
-    return _FgColorOtherActivity;
+    QModelIndex source_index = mapToSource(index);
+    if (source_index == QModelIndex() || sourceModel()->data(source_index, NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType)
+        return QVariant();
 
-  return _FgColorNoActivity;
-}
+    BufferId bufferId = sourceModel()->data(source_index, NetworkModel::BufferIdRole).value<BufferId>();
+    if (_toAdd.contains(bufferId))
+        return Qt::Checked;
+
+    if (_toTempRemove.contains(bufferId))
+        return Qt::PartiallyChecked;
 
-void BufferViewFilter::source_rowsInserted(const QModelIndex &parent, int start, int end) {
-  if(parent.data(NetworkModel::ItemTypeRole) != NetworkModel::BufferItemType)
-    return;
+    if (_toRemove.contains(bufferId))
+        return Qt::Unchecked;
 
-  if(!config() || !config()->addNewBuffersAutomatically())
-    return;
+    if (config()->bufferList().contains(bufferId))
+        return Qt::Checked;
 
-  QModelIndex child;
-  for(int row = start; row <= end; row++) {
-    child = sourceModel()->index(row, 0, parent);
-    addBuffer(sourceModel()->data(child, NetworkModel::BufferIdRole).value<BufferId>());
-  }
+    if (config()->temporarilyRemovedBuffers().contains(bufferId))
+        return Qt::PartiallyChecked;
+
+    return Qt::Unchecked;
 }
 
-void BufferViewFilter::checkPreviousCurrentForRemoval(const QModelIndex &current, const QModelIndex &previous) {
-  Q_UNUSED(current);
-  if(previous.isValid())
-    QCoreApplication::postEvent(this, new CheckRemovalEvent(previous));
+
+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);
+    }
 }
 
-void BufferViewFilter::customEvent(QEvent *event) {
-  if(event->type() != QEvent::User)
-    return;
-  
-  CheckRemovalEvent *removalEvent = static_cast<CheckRemovalEvent *>(event);
-  checkItemForRemoval(removalEvent->index);
-  
-  event->accept();
+
+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;
+
+    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::checkItemsForRemoval(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
-  QModelIndex source_topLeft = mapToSource(topLeft);
-  QModelIndex source_bottomRight = mapToSource(bottomRight);
-  emit _dataChanged(source_topLeft, source_bottomRight);
+
+void BufferViewFilter::checkPreviousCurrentForRemoval(const QModelIndex &current, const QModelIndex &previous)
+{
+    Q_UNUSED(current);
+    if (previous.isValid())
+        QCoreApplication::postEvent(this, new CheckRemovalEvent(previous));
 }
 
-// ******************************
-//  Helper
-// ******************************
-bool 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);
 
-  int leftType = Client::networkModel()->data(leftIndex, NetworkModel::BufferTypeRole).toInt();
-  int rightType = Client::networkModel()->data(rightIndex, NetworkModel::BufferTypeRole).toInt();
+void BufferViewFilter::customEvent(QEvent *event)
+{
+    if (event->type() != QEvent::User)
+        return;
+
+    CheckRemovalEvent *removalEvent = static_cast<CheckRemovalEvent *>(event);
+    checkItemForRemoval(removalEvent->index);
 
-  if(leftType != rightType)
-    return leftType < rightType;
-  else
-    return QString::compare(Client::networkModel()->data(leftIndex, Qt::DisplayRole).toString(), Client::networkModel()->data(rightIndex, Qt::DisplayRole).toString(), Qt::CaseInsensitive) < 0;
+    event->accept();
 }
 
+
+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);
+
+    int leftType = Client::networkModel()->data(leftIndex, NetworkModel::BufferTypeRole).toInt();
+    int rightType = Client::networkModel()->data(rightIndex, NetworkModel::BufferTypeRole).toInt();
+
+    if (leftType != rightType)
+        return leftType < rightType;
+    else
+        return QString::compare(Client::networkModel()->data(leftIndex, Qt::DisplayRole).toString(), Client::networkModel()->data(rightIndex, Qt::DisplayRole).toString(), Qt::CaseInsensitive) < 0;
+}