X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=0ebfdea0ea15e76bf0589ad587cae70a24594f5b;hp=4ac92f3d363b2210875307144ed9a7b84c343735;hb=620882e248fafe97a736e545d8e3eb72569a078b;hpb=c19a8e707391d74a80e9e7d4ef46f496284d9f49

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 4ac92f3d..0ebfdea0 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -24,6 +24,8 @@
 #include "networkmodel.h"
 #include "network.h"
 
+#include "uisettings.h"
+
 /*****************************************
 * The TreeView showing the Buffers
 *****************************************/
@@ -76,7 +78,7 @@ void BufferView::setModel(QAbstractItemModel *model) {
 
   QString sectionName;
   QAction *showSection;
-  for(int i = 0; i < model->columnCount(); i++) {
+  for(int i = 1; i < model->columnCount(); i++) {
     sectionName = (model->headerData(i, Qt::Horizontal, Qt::DisplayRole)).toString();
     showSection = new QAction(sectionName, header());
     showSection->setCheckable(true);
@@ -118,15 +120,6 @@ void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) {
     update(parent); 
     expand(parent);
   }
-
-
-  // select newly inserted buffers
-  if(parent.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
-    return;
-
-  QModelIndex newCurrent = parent.child(end, 0);
-  selectionModel()->setCurrentIndex(newCurrent, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
-  selectionModel()->select(newCurrent, QItemSelectionModel::ClearAndSelect);
 }
 
 void BufferView::toggleHeader(bool checked) {
@@ -229,3 +222,32 @@ void BufferView::showContextMenu(const QPoint &pos) {
   }
 }
 
+void BufferView::wheelEvent(QWheelEvent* event)
+{
+  UiSettings s;
+  if(s.value("MouseWheelChangesBuffers",QVariant(true)).toBool()) {
+    int rowDelta = ( event->delta() > 0 ) ? -1 : 1;
+    QModelIndex currentIndex = selectionModel()->currentIndex();
+    QModelIndex resultingIndex;
+    if( model()->hasIndex(  currentIndex.row() + rowDelta, currentIndex.column(), currentIndex.parent() ) )
+    {
+        resultingIndex = currentIndex.sibling( currentIndex.row() + rowDelta, currentIndex.column() );
+    }
+    else //if we scroll into a the parent node...
+    {
+        QModelIndex parent = currentIndex.parent();
+        QModelIndex aunt = parent.sibling( parent.row() + rowDelta, parent.column() );
+        if( rowDelta == -1 )
+            resultingIndex = aunt.child( model()->rowCount( aunt ) - 1, 0 );
+        else
+            resultingIndex = aunt.child( 0, 0 );
+        if( !resultingIndex.isValid() )
+            return;
+    }
+    selectionModel()->setCurrentIndex( resultingIndex, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows );
+    selectionModel()->select( resultingIndex, QItemSelectionModel::ClearAndSelect );
+  } else {
+    QAbstractScrollArea::wheelEvent(event);
+  }
+}
+