X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=6cf3e502160ad69993a76ced48dd2be4b4f16851;hp=3043b83c944876839d9da01cb6c2274c9c64dc10;hb=d1192c9aeef46d5d995c728812740b765cb98b28;hpb=47f8eca0275b02a19a36f098faaea0a3bf25460c

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 3043b83c..6cf3e502 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -136,9 +136,8 @@ void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bott
       continue;
 
     bool isActive = networkIdx.data(NetworkModel::ItemActiveRole).toBool();
-    if(isExpanded(networkIdx) != isActive) {
+    if(isExpanded(networkIdx) != isActive)
       setExpanded(networkIdx, isActive);
-    }
   }
 }
 
@@ -154,6 +153,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);
@@ -183,6 +183,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);
     }
@@ -205,6 +207,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);
       }
@@ -223,6 +226,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
@@ -276,7 +291,10 @@ void BufferView::wheelEvent(QWheelEvent* event)
 QSize BufferView::sizeHint() const {
   if(!model())
     return QTreeView::sizeHint();
-  
+
+  if(model()->rowCount() == 0)
+    return QSize(120, 50);
+
   int columnSize = 0;
   for(int i = 0; i < model()->columnCount(); i++) {
     if(!isColumnHidden(i))