X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=0fa57cd7cfadddbb88ecf8b65cceda6b3a1c05d4;hb=d72d4b76d95dc686d524d78c9c68507b7637b5cf;hp=5dcb7e8cd9cd876a692e5842dfbf1d2c354d059a;hpb=72f1a93311815cc637358f52046a4cf311bbd9f4;p=quassel.git

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index 5dcb7e8c..0fa57cd7 100644
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -39,7 +39,8 @@ public:
 *****************************************/
 BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *config)
   : QSortFilterProxyModel(model),
-    _config(0)
+    _config(0),
+    _sortOrder(Qt::AscendingOrder)
 {
   setConfig(config);
   setSourceModel(model);
@@ -70,6 +71,12 @@ void BufferViewFilter::setConfig(BufferViewConfig *config) {
   }
 
   _config = config;
+
+  if(!config) {
+    invalidate();
+    return;
+  }
+
   if(config->isInitialized()) {
     configInitialized();
   } else {
@@ -93,6 +100,7 @@ void BufferViewFilter::configInitialized() {
   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()));
 
@@ -101,7 +109,7 @@ void BufferViewFilter::configInitialized() {
 
 Qt::ItemFlags BufferViewFilter::flags(const QModelIndex &index) const {
   Qt::ItemFlags flags = mapToSource(index).flags();
-  if(_config && index == QModelIndex() || index.parent() == QModelIndex())
+  if(_config && (index == QModelIndex() || index.parent() == QModelIndex()))
     flags |= Qt::ItemIsDropEnabled;
   return flags;
 }
@@ -124,11 +132,17 @@ 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>();
 	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)) {
@@ -146,6 +160,11 @@ bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action
   return true;
 }
 
+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;
@@ -180,10 +199,10 @@ bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex)
     // 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)...
-	   || activityLevel > Buffer::OtherActivity)) { // or was just temporarily hidden and has a new message waiting for us.
+	   || (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 filters ("show only channels" and stuff)
+    // note: adding the buffer to the valid list does not temper with the following filters ("show only channels" and stuff)
     return false;
   }