From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Wed, 11 Mar 2009 18:18:06 +0000 (+0100)
Subject: fixes #609 - bufferview not correctly sorted
X-Git-Tag: 0.5-rc1~309
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=bbff8b7b37e35f61279b1e8b06a97969fe87f2a6

fixes #609 - bufferview not correctly sorted
---

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index cd89a9fa..5b58ee56 100644
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -141,13 +141,8 @@ void BufferViewFilter::enableEditMode(bool enable) {
     return;
 
   if(enable == false) {
-    int numBuffers = config()->bufferList().count();
+    addBuffers(QList<BufferId>::fromSet(_toAdd));
     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;
@@ -224,10 +219,12 @@ bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action
 	  pos = 0;
       }
 
-      if(config()->bufferList().contains(bufferId)) {
+      if(config()->bufferList().contains(bufferId) && !config()->sortAlphabetically()) {
 	if(config()->bufferList().indexOf(bufferId) < pos)
 	  pos--;
-	config()->requestMoveBuffer(bufferId, pos);
+	ClientBufferViewConfig *clientConf = qobject_cast<ClientBufferViewConfig *>(config());
+	if(!clientConf || !clientConf->isLocked())
+	  config()->requestMoveBuffer(bufferId, pos);
       } else {
 	config()->requestAddBuffer(bufferId, pos);
       }
@@ -264,6 +261,33 @@ void BufferViewFilter::addBuffer(const BufferId &bufferId) const {
   config()->requestAddBuffer(bufferId, pos);
 }
 
+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())
diff --git a/src/uisupport/bufferviewfilter.h b/src/uisupport/bufferviewfilter.h
index 5bacfaf0..ba3778a4 100644
--- a/src/uisupport/bufferviewfilter.h
+++ b/src/uisupport/bufferviewfilter.h
@@ -111,7 +111,8 @@ private:
 
   bool filterAcceptBuffer(const QModelIndex &) const;
   bool filterAcceptNetwork(const QModelIndex &) const;
-  void addBuffer(const BufferId &) const;
+  void addBuffer(const BufferId &bufferId) const;
+  void addBuffers(const QList<BufferId> &bufferIds) const;
   static bool bufferIdLessThan(const BufferId &, const BufferId &);
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(BufferViewFilter::Modes)