X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=5f33df45ae892cc58e075974c765d2c093d1eb87;hp=d2893a8f88c453f621c32eec5a9c02a87dd8f63e;hb=f429bd6dfbea50ad4690875f1466a920f7a3b509;hpb=609835c5efa606b9eb63739d50c750dba47c1668

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index d2893a8f..5f33df45 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -24,14 +24,13 @@
 #include "bufferviewfilter.h"
 #include "buffersyncer.h"
 #include "client.h"
+#include "iconloader.h"
 #include "mappedselectionmodel.h"
 #include "network.h"
 #include "networkmodel.h"
 
 #include "uisettings.h"
 
-#include "global.h"
-
 #include <QAction>
 #include <QFlags>
 #include <QHeaderView>
@@ -79,6 +78,8 @@ BufferView::BufferView(QWidget *parent)
   _hideQuitAction.setEnabled(false);
   _hideModeAction.setEnabled(false);
 
+  showChannelList.setIcon(SmallIcon("format-list-unordered"));
+
   connect(this, SIGNAL(collapsed(const QModelIndex &)), this, SLOT(on_collapse(const QModelIndex &)));
   connect(this, SIGNAL(expanded(const QModelIndex &)), this, SLOT(on_expand(const QModelIndex &)));
 
@@ -113,7 +114,7 @@ void BufferView::init() {
 
 void BufferView::setModel(QAbstractItemModel *model) {
   delete selectionModel();
-  
+
   QTreeView::setModel(model);
   init();
   // remove old Actions
@@ -137,7 +138,7 @@ void BufferView::setModel(QAbstractItemModel *model) {
     connect(showSection, SIGNAL(toggled(bool)), this, SLOT(toggleHeader(bool)));
     header()->addAction(showSection);
   }
-  
+
 }
 
 void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *config) {
@@ -167,7 +168,7 @@ void BufferView::setSelectionModel(QItemSelectionModel *selectionModel) {
   if(QTreeView::selectionModel())
     disconnect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
 	       model(), SIGNAL(checkPreviousCurrentForRemoval(QModelIndex, QModelIndex)));
-    
+
   QTreeView::setSelectionModel(selectionModel);
   BufferViewFilter *filter = qobject_cast<BufferViewFilter *>(model());
   if(filter) {
@@ -179,7 +180,7 @@ void BufferView::setSelectionModel(QItemSelectionModel *selectionModel) {
 void BufferView::setConfig(BufferViewConfig *config) {
   if(_config == config)
     return;
-  
+
   if(_config) {
     disconnect(_config, 0, this, 0);
   }
@@ -214,7 +215,7 @@ void BufferView::joinChannel(const QModelIndex &index) {
     return;
 
   BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
-  
+
   Client::userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName()));
 }
 
@@ -241,7 +242,7 @@ void BufferView::removeSelectedBuffers(bool permanently) {
       continue;
 
     removedRows << bufferId;
-    
+
     if(permanently)
       config()->requestRemoveBufferPermanently(bufferId);
     else
@@ -255,7 +256,7 @@ void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) {
   // ensure that newly inserted network nodes are expanded per default
   if(parent.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
     return;
-  
+
   if(model()->rowCount(parent) == 1 && parent.data(NetworkModel::ItemActiveRole) == true) {
     // without updating the parent the expand will have no effect... Qt Bug?
     update(parent);
@@ -315,14 +316,14 @@ void BufferView::storeExpandedState(NetworkId networkId, bool expanded) {
 
 void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
   QTreeView::dataChanged(topLeft, bottomRight);
-  
+
   // determine how many items have been changed and if any of them is a networkitem
   // which just swichted from active to inactive or vice versa
   if(topLeft.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
     return;
 
   for(int i = topLeft.row(); i <= bottomRight.row(); i++) {
-    QModelIndex networkIdx = topLeft.sibling(topLeft.row(), 0);
+    QModelIndex networkIdx = topLeft.sibling(i, 0);
     if(model()->rowCount(networkIdx) == 0)
       continue;
 
@@ -401,34 +402,36 @@ QMenu *BufferView::createHideEventsSubMenu(QMenu &menu) {
 
 void BufferView::contextMenuEvent(QContextMenuEvent *event) {
   QModelIndex index = indexAt(event->pos());
+  if(!index.isValid())
+    index = rootIndex();
   if(!index.isValid())
     return;
 
   const Network *network = Client::network(index.data(NetworkModel::NetworkIdRole).value<NetworkId>());
   Q_CHECK_PTR(network);
 
-  QIcon connectionStateIcon;
+  QPixmap connectionStateIcon;
   if(network) {
     if(network->connectionState() == Network::Initialized) {
-      connectionStateIcon = QIcon(":/22x22/actions/network-connect");
+      connectionStateIcon = SmallIcon("network-connect");
     } else if(network->connectionState() == Network::Disconnected) {
-      connectionStateIcon = QIcon(":/22x22/actions/network-disconnect");
+      connectionStateIcon = SmallIcon("network-disconnect");
     } else {
-      connectionStateIcon = QIcon(":/22x22/actions/gear");
+      connectionStateIcon = SmallIcon("network-wired");  // FIXME network-connecting
     }
   }
-  
+
   QMenu contextMenu(this);
   NetworkModel::itemType itemType = static_cast<NetworkModel::itemType>(index.data(NetworkModel::ItemTypeRole).toInt());
-  
+
   switch(itemType) {
   case NetworkModel::NetworkItemType:
     showChannelList.setData(index.data(NetworkModel::NetworkIdRole));
     _disconnectNetAction.setIcon(connectionStateIcon);
     _connectNetAction.setIcon(connectionStateIcon);
     addItemToMenu(showChannelList, contextMenu, index, ActiveState);
-    addItemToMenu(_disconnectNetAction, contextMenu, index, ActiveState);
-    addItemToMenu(_connectNetAction, contextMenu, index, InactiveState);
+    addItemToMenu(_disconnectNetAction, contextMenu, network->connectionState() != Network::Disconnected);
+    addItemToMenu(_connectNetAction, contextMenu, network->connectionState() == Network::Disconnected);
     addSeparatorToMenu(contextMenu, index, ActiveState);
     addItemToMenu(_joinChannelAction, contextMenu, index, ActiveState);
     break;
@@ -461,11 +464,11 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) {
   default:
     return;
   }
-  
+
   if(contextMenu.actions().isEmpty())
     return;
   QAction *result = contextMenu.exec(QCursor::pos());
-  
+
   // Handle Result
   if(network && result == &_connectNetAction) {
     network->requestConnect();
@@ -500,7 +503,7 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) {
     Client::instance()->userInput(bufferInfo, QString("/PART"));
     return;
   }
-  
+
   if(result == &_hideBufferTemporarilyAction) {
     removeSelectedBuffers();
     return;
@@ -549,13 +552,13 @@ void BufferView::wheelEvent(QWheelEvent* event) {
       }
   selectionModel()->setCurrentIndex( resultingIndex, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows );
   selectionModel()->select( resultingIndex, QItemSelectionModel::ClearAndSelect );
-  
+
 }
 
 
 QSize BufferView::sizeHint() const {
   return QTreeView::sizeHint();
-  
+
   if(!model())
     return QTreeView::sizeHint();