X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=0adf8ebb53338cdfb672bb9625ceeec7c2fb839f;hp=bae2522d88a1bee5518f801747bd3e2505fc2231;hb=d07c7f8e2de851adefcee45049bb1bb19682d0c6;hpb=8010224cf5bfe5685dc2cf535e8dc1ec19c4c364

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index bae2522d..0adf8ebb 100644
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -20,139 +20,245 @@
 
 #include "bufferviewfilter.h"
 
-#include <QColor>
+#include <QCoreApplication>
 
+#include "buffermodel.h"
+#include "client.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, const Modes &filtermode, const QList<NetworkId> &nets)
+BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *config)
   : QSortFilterProxyModel(model),
-    mode(filtermode),
-    networks(QSet<NetworkId>::fromList(nets))
+    _config(0)
 {
+  setConfig(config);
   setSourceModel(model);
-  setSortCaseSensitivity(Qt::CaseInsensitive);
+			
+  setDynamicSortFilter(true);
+
+  loadColors();
+
+  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>();
+}
+
+void BufferViewFilter::setConfig(BufferViewConfig *config) {
+  if(_config == config)
+    return;
+  
+  if(_config) {
+    disconnect(_config, 0, this, 0);
+  }
+
+  _config = config;
+  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()));
+
+  invalidate();
 }
 
 Qt::ItemFlags BufferViewFilter::flags(const QModelIndex &index) const {
   Qt::ItemFlags flags = mapToSource(index).flags();
-  if(mode & FullCustom) {
-    if(index == QModelIndex() || index.parent() == QModelIndex())
-      flags |= Qt::ItemIsDropEnabled;
-  }
+  if(_config && (index == QModelIndex() || index.parent() == QModelIndex()))
+    flags |= Qt::ItemIsDropEnabled;
   return flags;
 }
 
 bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) {
-  // drops have to occur in the open field
-  if(parent != QModelIndex())
+  if(!config() || !NetworkModel::mimeContainsBufferList(data))
     return QSortFilterProxyModel::dropMimeData(data, action, row, column, parent);
 
-  if(!NetworkModel::mimeContainsBufferList(data))
-    return false;
+  NetworkId droppedNetworkId;
+  if(parent.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType)
+    droppedNetworkId = parent.data(NetworkModel::NetworkIdRole).value<NetworkId>();
 
   QList< QPair<NetworkId, BufferId> > bufferList = NetworkModel::mimeDataToBufferList(data);
-
-  NetworkId netId;
   BufferId bufferId;
+  NetworkId networkId;
+  int pos;
   for(int i = 0; i < bufferList.count(); i++) {
-    netId = bufferList[i].first;
+    networkId = bufferList[i].first;
     bufferId = bufferList[i].second;
-    if(!networks.contains(netId)) {
-      networks << netId;
+    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);
     }
-    addBuffer(bufferId);
   }
   return true;
 }
 
-void BufferViewFilter::addBuffer(const BufferId &bufferuid) {
-  if(!buffers.contains(bufferuid)) {
-    buffers << bufferuid;
-    invalidateFilter();
-  }
-}
-
-void BufferViewFilter::removeBuffer(const QModelIndex &index) {
-  if(!(mode & FullCustom))
-    return; // only custom buffers can be customized... obviously... :)
+void BufferViewFilter::addBuffer(const BufferId &bufferId) const {
+  if(!config() || config()->bufferList().contains(bufferId))
+    return;
   
-  if(index.parent() == QModelIndex())
-    return; // only child elements can be deleted
-
-  bool lastBuffer = (rowCount(index.parent()) == 1);
-  NetworkId netId = index.data(NetworkModel::NetworkIdRole).value<NetworkId>();
-  BufferId bufferuid = index.data(NetworkModel::BufferIdRole).value<BufferId>();
-
-  if(buffers.contains(bufferuid)) {
-    buffers.remove(bufferuid);
+  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(lastBuffer) {
-      networks.remove(netId);
-      Q_ASSERT(!networks.contains(netId));
+    if(lt) {
+      pos = i;
+      break;
     }
-
-    invalidateFilter();
   }
-  
+  config()->requestAddBuffer(bufferId, pos);
 }
 
-
 bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const {
-  BufferInfo::Type bufferType = (BufferInfo::Type) source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt();
-  
-  if((mode & NoChannels) && bufferType == BufferInfo::ChannelBuffer)
+  // 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 = source_bufferIndex.data(NetworkModel::BufferActivityRole).toInt();
+
+  if(!config()->bufferList().contains(bufferId)) {
+    // 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 > Buffer::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((mode & NoQueries) && bufferType == BufferInfo::QueryBuffer)
+  }
+  
+  if(config()->networkId().isValid() && config()->networkId() != sourceModel()->data(source_bufferIndex, NetworkModel::NetworkIdRole).value<NetworkId>())
     return false;
-  if((mode & NoServers) && bufferType == BufferInfo::StatusBuffer)
+
+  if(!(config()->allowedBufferTypes() & (BufferInfo::Type)source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt()))
     return false;
 
-//   bool isActive = source_bufferIndex.data(NetworkModel::BufferActiveRole).toBool();
-//   if((mode & NoActive) && isActive)
-//     return false;
-//   if((mode & NoInactive) && !isActive)
-//     return false;
+  if(config()->hideInactiveBuffers() && !source_bufferIndex.data(NetworkModel::ItemActiveRole).toBool())
+    return false;
 
-  if((mode & FullCustom)) {
-    BufferId bufferuid = source_bufferIndex.data(NetworkModel::BufferIdRole).value<BufferId>();
-    return buffers.contains(bufferuid);
+  if(config()->minimumActivity() > activityLevel) {
+    if(bufferId != Client::bufferModel()->standardSelectionModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>())
+      return false;
   }
-    
+
   return true;
 }
 
 bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) const {
-  NetworkId net = source_index.data(NetworkModel::NetworkIdRole).value<NetworkId>();
-  return !((mode & (SomeNets | FullCustom)) && !networks.contains(net));
+  if(!config())
+    return true;
+
+  if(!config()->networkId().isValid()) {
+    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()) {
-    qDebug() << "filterAcceptsRow has been called with an invalid Child";
+    qWarning() << "filterAcceptsRow has been called with an invalid Child";
     return false;
   }
 
-  if(source_parent == QModelIndex())
+  if(!source_parent.isValid())
     return filterAcceptNetwork(child);
   else
     return filterAcceptBuffer(child);
 }
 
-bool BufferViewFilter::lessThan(const QModelIndex &left, const QModelIndex &right) const {
-  int lefttype = left.data(NetworkModel::BufferTypeRole).toInt();
-  int righttype = right.data(NetworkModel::BufferTypeRole).toInt();
+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::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::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(lefttype != righttype)
-    return lefttype < righttype;
+  if(config() && config()->sortAlphabetically())
+    return QSortFilterProxyModel::lessThan(source_left, source_right);
   else
-    return QSortFilterProxyModel::lessThan(left, right);
+    return leftNetworkId < rightNetworkId;
 }
 
 QVariant BufferViewFilter::data(const QModelIndex &index, int role) const {
@@ -163,27 +269,60 @@ QVariant BufferViewFilter::data(const QModelIndex &index, int role) const {
 }
 
 QVariant BufferViewFilter::foreground(const QModelIndex &index) const {
-  UiSettings s("QtUi/Colors");
-  QVariant inactiveActivity = s.value("inactiveActivity", QVariant(QColor(Qt::gray)));
-  QVariant noActivity = s.value("noActivity", QVariant(QColor(Qt::black)));
-  QVariant highlightActivity = s.value("highlightActivity", QVariant(QColor(Qt::magenta)));
-  QVariant newMessageActivity = s.value("newMessageActivity", QVariant(QColor(Qt::green)));
-  QVariant otherActivity = s.value("otherActivity", QVariant(QColor(Qt::darkGreen)));
-
   if(!index.data(NetworkModel::ItemActiveRole).toBool())
-    return inactiveActivity.value<QColor>();
+    return _FgColorInactiveActivity;
 
   Buffer::ActivityLevel activity = (Buffer::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
 
   if(activity & Buffer::Highlight)
-    return highlightActivity.value<QColor>();
+    return _FgColorHighlightActivity;
   if(activity & Buffer::NewMessage)
-    return newMessageActivity.value<QColor>();
+    return _FgColorNewMessageActivity;
   if(activity & Buffer::OtherActivity)
-    return otherActivity.value<QColor>();
+    return _FgColorOtherActivity;
+
+  return _FgColorNoActivity;
+}
+
+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;
   
-  return noActivity.value<QColor>();
+  CheckRemovalEvent *removalEvent = static_cast<CheckRemovalEvent *>(event);
+  checkItemForRemoval(removalEvent->index);
   
-  // FIXME:: make colors configurable;
+  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);
 }
+
+// ******************************
+//  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();
+
+  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;
+}
+