X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=c4529cbf9e4b2bb1986f54c4b932bab4cd1132af;hp=d83f696a7efef555e6d4fa8083fc6a5f58cc38e1;hb=aa40491595ffec54ba340a9850d99dc14d920eb3;hpb=923ab935b9e2936d2512ef9344811e9bb2f436f3

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index d83f696a..c4529cbf 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -26,6 +26,8 @@
 
 #include "uisettings.h"
 
+#include "global.h"
+
 /*****************************************
 * The TreeView showing the Buffers
 *****************************************/
@@ -115,9 +117,10 @@ void BufferView::keyPressEvent(QKeyEvent *event) {
 // ensure that newly inserted network nodes are expanded per default
 void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) {
   QTreeView::rowsInserted(parent, start, end);
-  if(model()->rowCount(parent) == 1 && parent.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType && parent.data(NetworkModel::ItemActiveRole) == true) {
+  if(model()->rowCount(parent) == 1 && parent.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType
+     && (Global::SPUTDEV || parent.data(NetworkModel::ItemActiveRole) == true)) {
     // without updating the parent the expand will have no effect... Qt Bug?
-    update(parent); 
+    update(parent);
     expand(parent);
   }
 }
@@ -136,12 +139,16 @@ void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bott
       continue;
 
     bool isActive = networkIdx.data(NetworkModel::ItemActiveRole).toBool();
-    if(isExpanded(networkIdx) != isActive)
-      setExpanded(networkIdx, isActive);
+    if(Global::SPUTDEV) {
+      if(isExpanded(networkIdx) != isActive) setExpanded(networkIdx, true);
+    } else {
+      if(isExpanded(networkIdx) != isActive)
+        setExpanded(networkIdx, isActive);
+    }
   }
 }
 
-			     
+
 void BufferView::toggleHeader(bool checked) {
   QAction *action = qobject_cast<QAction *>(sender());
   header()->setSectionHidden((action->property("column")).toInt(), !checked);
@@ -153,6 +160,7 @@ void BufferView::showContextMenu(const QPoint &pos) {
   QMenu contextMenu(this);
   QAction *connectNetAction = new QAction(tr("Connect"), this);
   QAction *disconnectNetAction = new QAction(tr("Disconnect"), this);
+  QAction *joinChannelAction = new QAction(tr("Join Channel"), this);
 
   QAction *joinBufferAction = new QAction(tr("Join"), this);
   QAction *partBufferAction = new QAction(tr("Part"), this);
@@ -182,6 +190,8 @@ void BufferView::showContextMenu(const QPoint &pos) {
   if(index.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType) {
     if(index.data(NetworkModel::ItemActiveRole).toBool()) {
       contextMenu.addAction(disconnectNetAction);
+      contextMenu.addSeparator();
+      contextMenu.addAction(joinChannelAction);
     } else {
       contextMenu.addAction(connectNetAction);
     }
@@ -204,6 +214,7 @@ void BufferView::showContextMenu(const QPoint &pos) {
         removeBufferAction->setEnabled(false);
         removeBufferAction->setToolTip("To delete the buffer, part the channel first.");
         joinBufferAction->setVisible(false);
+        whoBufferAction->setVisible(false);
       } else {
         partBufferAction->setVisible(false);
       }
@@ -222,6 +233,18 @@ void BufferView::showContextMenu(const QPoint &pos) {
     else 
       network->requestDisconnect();
   } else
+  if(result == joinChannelAction) {
+    bool ok;
+    QString channelName = QInputDialog::getText(this, tr("Join Channel"), 
+                                                tr("Input channel name:"),QLineEdit::Normal,
+                                                QDir::home().dirName(), &ok);
+    if (ok && !channelName.isEmpty()) {
+      BufferInfo bufferInfo = index.child(0,0).data(NetworkModel::BufferInfoRole).value<BufferInfo>();
+      if(bufferInfo.isValid()) {
+        Client::instance()->userInput(bufferInfo, QString("/J %1").arg(channelName));
+      }
+    }
+  } else
   if(result == joinBufferAction) {
     Client::instance()->userInput(bufferInfo, QString("/JOIN %1").arg(channelname));
   } else
@@ -242,37 +265,37 @@ 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() ) )
+void BufferView::wheelEvent(QWheelEvent* event) {
+  if(UiSettings().value("MouseWheelChangesBuffers", QVariant(true)).toBool() == (bool)(event->modifiers() & Qt::AltModifier))
+    return QTreeView::wheelEvent(event);
+
+  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() );
+      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 );
+	  resultingIndex = aunt.child( model()->rowCount( aunt ) - 1, 0 );
         else
-            resultingIndex = aunt.child( 0, 0 );
+	  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);
-  }
+	  return;
+      }
+  selectionModel()->setCurrentIndex( resultingIndex, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows );
+  selectionModel()->select( resultingIndex, QItemSelectionModel::ClearAndSelect );
+  
 }
 
 
 QSize BufferView::sizeHint() const {
+  return QSize(120, 50);
+  
   if(!model())
     return QTreeView::sizeHint();