X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=6a73e7f4b221c792f39bea225c9c52bedf5dfe77;hb=10c6dbcf23305cc57e2f577600a289cfc0b12c2a;hp=396922da8be07450bea36fc57e38bf4af03a0336;hpb=d1b2699b8a77947f1b7dd67841c6ecb4ea1fce1e;p=quassel.git

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index 396922da..6a73e7f4 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 {
@@ -98,11 +105,12 @@ void BufferViewFilter::configInitialized() {
   disconnect(config(), SIGNAL(initDone()), this, SLOT(configInitialized()));
 
   invalidate();
+  emit configChanged();
 }
 
 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;
 }
@@ -125,11 +133,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)) {
@@ -147,6 +161,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;