X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=d93a617220fcad118b7a3b35856d593e2c6ddbac;hb=f091c08e33f4cc2ed63afebab0ae90f2dad55139;hp=de2ced7b403970c7e8bb7047a52c00f69ec9a0d1;hpb=39920494900e7d321677dee5e14f63408e07bcd0;p=quassel.git

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index de2ced7b..d93a6172 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -30,8 +30,6 @@
 
 #include "uisettings.h"
 
-#include "global.h"
-
 #include <QAction>
 #include <QFlags>
 #include <QHeaderView>
@@ -67,7 +65,6 @@ BufferView::BufferView(QWidget *parent)
     _hideModeAction(tr("Mode Events"), this)
 
 {
-  // currently no events can be hidden -> disable actions
   _hideJoinAction.setCheckable(true);
   _hidePartAction.setCheckable(true);
   _hideKillAction.setCheckable(true);
@@ -80,6 +77,11 @@ BufferView::BufferView(QWidget *parent)
   _hideQuitAction.setEnabled(false);
   _hideModeAction.setEnabled(false);
 
+  showChannelList.setIcon(QIcon(":/16x16/actions/oxygen/16x16/actions/format-list-unordered.png"));
+
+  connect(this, SIGNAL(collapsed(const QModelIndex &)), this, SLOT(on_collapse(const QModelIndex &)));
+  connect(this, SIGNAL(expanded(const QModelIndex &)), this, SLOT(on_expand(const QModelIndex &)));
+
   setSelectionMode(QAbstractItemView::ExtendedSelection);
 }
 
@@ -111,10 +113,7 @@ void BufferView::init() {
 
 void BufferView::setModel(QAbstractItemModel *model) {
   delete selectionModel();
-  if(QTreeView::model()) {
-    disconnect(QTreeView::model(), SIGNAL(layoutChanged()), this, SLOT(layoutChanged()));
-  }
-  
+
   QTreeView::setModel(model);
   init();
   // remove old Actions
@@ -127,8 +126,6 @@ void BufferView::setModel(QAbstractItemModel *model) {
   if(!model)
     return;
 
-  connect(model, SIGNAL(layoutChanged()), this, SLOT(layoutChanged()));
-  
   QString sectionName;
   QAction *showSection;
   for(int i = 1; i < model->columnCount(); i++) {
@@ -140,7 +137,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) {
@@ -153,6 +150,7 @@ void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *
 
   if(model()) {
     disconnect(this, 0, model(), 0);
+    disconnect(model(), 0, this, 0);
   }
 
   if(!model_) {
@@ -160,6 +158,7 @@ void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *
   } else {
     BufferViewFilter *filter = new BufferViewFilter(model_, config);
     setModel(filter);
+    connect(filter, SIGNAL(configChanged()), this, SLOT(on_configChanged()));
   }
   setConfig(config);
 }
@@ -168,7 +167,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) {
@@ -180,7 +179,7 @@ void BufferView::setSelectionModel(QItemSelectionModel *selectionModel) {
 void BufferView::setConfig(BufferViewConfig *config) {
   if(_config == config)
     return;
-  
+
   if(_config) {
     disconnect(_config, 0, this, 0);
   }
@@ -215,7 +214,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()));
 }
 
@@ -242,7 +241,7 @@ void BufferView::removeSelectedBuffers(bool permanently) {
       continue;
 
     removedRows << bufferId;
-    
+
     if(permanently)
       config()->requestRemoveBufferPermanently(bufferId);
     else
@@ -256,7 +255,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);
@@ -264,17 +263,33 @@ void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) {
   }
 }
 
-void BufferView::layoutChanged() {
+void BufferView::on_configChanged() {
   Q_ASSERT(model());
 
-  // expand all active networks
+  // expand all active networks... collapse inactive ones... unless manually changed
   QModelIndex networkIdx;
+  NetworkId networkId;
   for(int row = 0; row < model()->rowCount(); row++) {
     networkIdx = model()->index(row, 0);
-    if(model()->rowCount(networkIdx) > 0 && model()->data(networkIdx, NetworkModel::ItemActiveRole) == true) {
-      update(networkIdx);
+    if(model()->rowCount(networkIdx) ==  0)
+      continue;
+
+    networkId = model()->data(networkIdx, NetworkModel::NetworkIdRole).value<NetworkId>();
+    if(!networkId.isValid())
+      continue;
+
+    update(networkIdx);
+
+    bool expandNetwork = false;
+    if(_expandedState.contains(networkId))
+      expandNetwork = _expandedState[networkId];
+    else
+      expandNetwork = model()->data(networkIdx, NetworkModel::ItemActiveRole).toBool();
+
+    if(expandNetwork)
       expand(networkIdx);
-    }
+    else
+      collapse(networkIdx);
   }
 
   // update selection to current one
@@ -286,17 +301,28 @@ void BufferView::layoutChanged() {
   mappedSelectionModel->mappedSelect(Client::bufferModel()->standardSelectionModel()->selection(), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
 }
 
+void BufferView::on_collapse(const QModelIndex &index) {
+  storeExpandedState(index.data(NetworkModel::NetworkIdRole).value<NetworkId>(), false);
+}
+
+void BufferView::on_expand(const QModelIndex &index) {
+  storeExpandedState(index.data(NetworkModel::NetworkIdRole).value<NetworkId>(), true);
+}
+
+void BufferView::storeExpandedState(NetworkId networkId, bool expanded) {
+  _expandedState[networkId] = expanded;
+}
+
 void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
-  qDebug() << "dataChanged()";
   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;
 
@@ -309,7 +335,6 @@ void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bott
   }
 }
 
-
 void BufferView::toggleHeader(bool checked) {
   QAction *action = qobject_cast<QAction *>(sender());
   header()->setSectionHidden((action->property("column")).toInt(), !checked);
@@ -319,10 +344,6 @@ bool BufferView::checkRequirements(const QModelIndex &index, ItemActiveStates re
   if(!index.isValid())
     return false;
 
-//   NetworkModel::itemTypes itemType = static_cast<NetworkModel::itemTypes>(index.data(NetworkModel::ItemTypeRole).toInt());
-//   if(!(itemType & validItemTypes))
-//     return false;
-
   ItemActiveStates isActive = index.data(NetworkModel::ItemActiveRole).toBool()
     ? ActiveState
     : InactiveState;
@@ -378,9 +399,10 @@ QMenu *BufferView::createHideEventsSubMenu(QMenu &menu) {
   return hideEventsMenu;
 }
 
-//void BufferView::showContextMenu(const QPoint &pos) {
 void BufferView::contextMenuEvent(QContextMenuEvent *event) {
   QModelIndex index = indexAt(event->pos());
+  if(!index.isValid())
+    index = rootIndex();
   if(!index.isValid())
     return;
 
@@ -397,18 +419,18 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) {
       connectionStateIcon = QIcon(":/22x22/actions/gear");
     }
   }
-  
+
   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;
@@ -441,11 +463,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();
@@ -464,10 +486,6 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) {
     QString channelName = QInputDialog::getText(this, tr("Join Channel"), tr("Input channel name:"), QLineEdit::Normal, QString(), &ok);
     if(ok && !channelName.isEmpty()) {
       Client::instance()->userInput(BufferInfo::fakeStatusBuffer(index.data(NetworkModel::NetworkIdRole).value<NetworkId>()), QString("/J %1").arg(channelName));
-//       BufferInfo bufferInfo = index.child(0,0).data(NetworkModel::BufferInfoRole).value<BufferInfo>();
-//       if(bufferInfo.isValid()) {
-//         Client::instance()->userInput(bufferInfo, QString("/J %1").arg(channelName));
-//       }
     }
 #endif
     return;
@@ -484,7 +502,7 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) {
     Client::instance()->userInput(bufferInfo, QString("/PART"));
     return;
   }
-  
+
   if(result == &_hideBufferTemporarilyAction) {
     removeSelectedBuffers();
     return;
@@ -533,13 +551,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();