X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=5f33df45ae892cc58e075974c765d2c093d1eb87;hp=7f690e17152c6e75521c9941084c9298ca4ed05d;hb=f429bd6dfbea50ad4690875f1466a920f7a3b509;hpb=d94f8e007a9ec408f63e4d5795af465d0f9aafb0 diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index 7f690e17..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 #include #include @@ -48,13 +47,15 @@ // to be on the safe side: call QTreeView's method aswell BufferView::BufferView(QWidget *parent) : QTreeView(parent), + showChannelList(tr("Show Channel List"), this), _connectNetAction(tr("Connect"), this), _disconnectNetAction(tr("Disconnect"), this), _joinChannelAction(tr("Join Channel"), this), _joinBufferAction(tr("Join"), this), _partBufferAction(tr("Part"), this), - _hideBufferAction(tr("Hide selected buffers"), this), + _hideBufferTemporarilyAction(tr("Hide buffers"), this), + _hideBufferPermanentlyAction(tr("Hide buffers permanently"), this), _removeBufferAction(tr("Delete buffer"), this), _ignoreListAction(tr("Ignore list"), this), @@ -65,7 +66,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); @@ -78,6 +78,11 @@ 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 &))); + setSelectionMode(QAbstractItemView::ExtendedSelection); } @@ -109,10 +114,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 @@ -125,8 +127,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++) { @@ -138,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) { @@ -151,6 +151,7 @@ void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig * if(model()) { disconnect(this, 0, model(), 0); + disconnect(model(), 0, this, 0); } if(!model_) { @@ -158,8 +159,7 @@ void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig * } else { BufferViewFilter *filter = new BufferViewFilter(model_, config); setModel(filter); - connect(this, SIGNAL(removeBuffer(const QModelIndex &)), - filter, SLOT(removeBuffer(const QModelIndex &))); + connect(filter, SIGNAL(configChanged()), this, SLOT(on_configChanged())); } setConfig(config); } @@ -168,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(model()); if(filter) { @@ -180,7 +180,7 @@ void BufferView::setSelectionModel(QItemSelectionModel *selectionModel) { void BufferView::setConfig(BufferViewConfig *config) { if(_config == config) return; - + if(_config) { disconnect(_config, 0, this, 0); } @@ -215,7 +215,7 @@ void BufferView::joinChannel(const QModelIndex &index) { return; BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value(); - + Client::userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName())); } @@ -227,13 +227,26 @@ void BufferView::keyPressEvent(QKeyEvent *event) { QTreeView::keyPressEvent(event); } -void BufferView::removeSelectedBuffers() { - QSet removedRows; +void BufferView::removeSelectedBuffers(bool permanently) { + if(!config()) + return; + + BufferId bufferId; + QSet removedRows; foreach(QModelIndex index, selectionModel()->selectedIndexes()) { - if(index.data(NetworkModel::ItemTypeRole) == NetworkModel::BufferItemType && !removedRows.contains(index.row())) { - removedRows << index.row(); - emit removeBuffer(index); - } + if(index.data(NetworkModel::ItemTypeRole) != NetworkModel::BufferItemType) + continue; + + bufferId = index.data(NetworkModel::BufferIdRole).value(); + if(removedRows.contains(bufferId)) + continue; + + removedRows << bufferId; + + if(permanently) + config()->requestRemoveBufferPermanently(bufferId); + else + config()->requestRemoveBuffer(bufferId); } } @@ -243,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); @@ -251,19 +264,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) + continue; + + networkId = model()->data(networkIdx, NetworkModel::NetworkIdRole).value(); + if(!networkId.isValid()) + continue; + update(networkIdx); - if(model()->rowCount(networkIdx) > 0 && model()->data(networkIdx, NetworkModel::ItemActiveRole) == true) { + + bool expandNetwork = false; + if(_expandedState.contains(networkId)) + expandNetwork = _expandedState[networkId]; + else + expandNetwork = model()->data(networkIdx, NetworkModel::ItemActiveRole).toBool(); + + if(expandNetwork) expand(networkIdx); - } else { + else collapse(networkIdx); - } } // update selection to current one @@ -275,16 +302,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(), false); +} + +void BufferView::on_expand(const QModelIndex &index) { + storeExpandedState(index.data(NetworkModel::NetworkIdRole).value(), true); +} + +void BufferView::storeExpandedState(NetworkId networkId, bool expanded) { + _expandedState[networkId] = 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; @@ -297,7 +336,6 @@ void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bott } } - void BufferView::toggleHeader(bool checked) { QAction *action = qobject_cast(sender()); header()->setSectionHidden((action->property("column")).toInt(), !checked); @@ -307,10 +345,6 @@ bool BufferView::checkRequirements(const QModelIndex &index, ItemActiveStates re if(!index.isValid()) return false; -// NetworkModel::itemTypes itemType = static_cast(index.data(NetworkModel::ItemTypeRole).toInt()); -// if(!(itemType & validItemTypes)) -// return false; - ItemActiveStates isActive = index.data(NetworkModel::ItemActiveRole).toBool() ? ActiveState : InactiveState; @@ -366,35 +400,38 @@ 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; const Network *network = Client::network(index.data(NetworkModel::NetworkIdRole).value()); 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(index.data(NetworkModel::ItemTypeRole).toInt()); - + switch(itemType) { case NetworkModel::NetworkItemType: + showChannelList.setData(index.data(NetworkModel::NetworkIdRole)); _disconnectNetAction.setIcon(connectionStateIcon); _connectNetAction.setIcon(connectionStateIcon); - addItemToMenu(_disconnectNetAction, contextMenu, index, ActiveState); - addItemToMenu(_connectNetAction, contextMenu, index, InactiveState); + addItemToMenu(showChannelList, contextMenu, index, ActiveState); + addItemToMenu(_disconnectNetAction, contextMenu, network->connectionState() != Network::Disconnected); + addItemToMenu(_connectNetAction, contextMenu, network->connectionState() == Network::Disconnected); addSeparatorToMenu(contextMenu, index, ActiveState); addItemToMenu(_joinChannelAction, contextMenu, index, ActiveState); break; @@ -405,18 +442,21 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) { case BufferInfo::ChannelBuffer: addItemToMenu(_joinBufferAction, contextMenu, index, InactiveState); addItemToMenu(_partBufferAction, contextMenu, index, ActiveState); - addItemToMenu(_hideBufferAction, contextMenu, (bool)config()); + addItemToMenu(_hideBufferTemporarilyAction, contextMenu, (bool)config()); + addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config()); addItemToMenu(_removeBufferAction, contextMenu, index, InactiveState); createHideEventsSubMenu(contextMenu); addItemToMenu(_ignoreListAction, contextMenu); break; case BufferInfo::QueryBuffer: - addItemToMenu(_hideBufferAction, contextMenu, (bool)config()); + addItemToMenu(_hideBufferTemporarilyAction, contextMenu, (bool)config()); + addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config()); addItemToMenu(_removeBufferAction, contextMenu); createHideEventsSubMenu(contextMenu); break; default: - addItemToMenu(_hideBufferAction, contextMenu, (bool)config()); + addItemToMenu(_hideBufferTemporarilyAction, contextMenu, (bool)config()); + addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config()); break; } } @@ -424,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(); @@ -446,10 +486,7 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) { bool ok; QString channelName = QInputDialog::getText(this, tr("Join Channel"), tr("Input channel name:"), QLineEdit::Normal, QString(), &ok); if(ok && !channelName.isEmpty()) { - BufferInfo bufferInfo = index.child(0,0).data(NetworkModel::BufferInfoRole).value(); - if(bufferInfo.isValid()) { - Client::instance()->userInput(bufferInfo, QString("/J %1").arg(channelName)); - } + Client::instance()->userInput(BufferInfo::fakeStatusBuffer(index.data(NetworkModel::NetworkIdRole).value()), QString("/J %1").arg(channelName)); } #endif return; @@ -463,15 +500,20 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) { if(result == &_partBufferAction) { BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value(); - Client::instance()->userInput(bufferInfo, QString("/PART %1").arg(bufferInfo.bufferName())); + Client::instance()->userInput(bufferInfo, QString("/PART")); return; } - - if(result == &_hideBufferAction) { + + if(result == &_hideBufferTemporarilyAction) { removeSelectedBuffers(); return; } + if(result == &_hideBufferPermanentlyAction) { + removeSelectedBuffers(true); + return; + } + if(result == &_removeBufferAction) { BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value(); int res = QMessageBox::question(this, tr("Remove buffer permanently?"), @@ -510,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();