X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=c84f31897a482c74823a33ab73916a74c4ad19b3;hb=6c9aab4e16880ee24738a48ea95f9d3bf09caa0f;hp=3362c53c6c7e952d6dc0fdbbea5d4606cf2dbff6;hpb=512aaff2677379080f349e46535743824ef5bb57;p=quassel.git diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index 3362c53c..c84f3189 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -48,13 +48,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), @@ -158,8 +160,6 @@ 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 &))); } setConfig(config); } @@ -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); } } @@ -258,11 +271,9 @@ void BufferView::layoutChanged() { QModelIndex networkIdx; for(int row = 0; row < model()->rowCount(); row++) { networkIdx = model()->index(row, 0); - update(networkIdx); if(model()->rowCount(networkIdx) > 0 && model()->data(networkIdx, NetworkModel::ItemActiveRole) == true) { + update(networkIdx); expand(networkIdx); - } else { - collapse(networkIdx); } } @@ -299,7 +310,7 @@ void BufferView::toggleHeader(bool checked) { header()->setSectionHidden((action->property("column")).toInt(), !checked); } -bool BufferView::checkRequirements(const QModelIndex &index, itemActiveStates requiredActiveState) { +bool BufferView::checkRequirements(const QModelIndex &index, ItemActiveStates requiredActiveState) { if(!index.isValid()) return false; @@ -307,9 +318,9 @@ bool BufferView::checkRequirements(const QModelIndex &index, itemActiveStates re // if(!(itemType & validItemTypes)) // return false; - itemActiveStates isActive = index.data(NetworkModel::ItemActiveRole).toBool() - ? activeState - : inactiveState; + ItemActiveStates isActive = index.data(NetworkModel::ItemActiveRole).toBool() + ? ActiveState + : InactiveState; if(!(isActive & requiredActiveState)) return false; @@ -317,7 +328,7 @@ bool BufferView::checkRequirements(const QModelIndex &index, itemActiveStates re return true; } -void BufferView::addItemToMenu(QAction &action, QMenu &menu, const QModelIndex &index, itemActiveStates requiredActiveState) { +void BufferView::addItemToMenu(QAction &action, QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) { if(checkRequirements(index, requiredActiveState)) { menu.addAction(&action); action.setVisible(true); @@ -336,7 +347,7 @@ void BufferView::addItemToMenu(QAction &action, QMenu &menu, bool condition) { } -void BufferView::addItemToMenu(QMenu &subMenu, QMenu &menu, const QModelIndex &index, itemActiveStates requiredActiveState) { +void BufferView::addItemToMenu(QMenu &subMenu, QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) { if(checkRequirements(index, requiredActiveState)) { menu.addMenu(&subMenu); subMenu.setVisible(true); @@ -345,7 +356,7 @@ void BufferView::addItemToMenu(QMenu &subMenu, QMenu &menu, const QModelIndex &i } } -void BufferView::addSeparatorToMenu(QMenu &menu, const QModelIndex &index, itemActiveStates requiredActiveState) { +void BufferView::addSeparatorToMenu(QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) { if(checkRequirements(index, requiredActiveState)) { menu.addSeparator(); } @@ -387,32 +398,37 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) { 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); - addSeparatorToMenu(contextMenu, index, activeState); - addItemToMenu(_joinChannelAction, contextMenu, index, activeState); + addItemToMenu(showChannelList, contextMenu, index, ActiveState); + addItemToMenu(_disconnectNetAction, contextMenu, index, ActiveState); + addItemToMenu(_connectNetAction, contextMenu, index, InactiveState); + addSeparatorToMenu(contextMenu, index, ActiveState); + addItemToMenu(_joinChannelAction, contextMenu, index, ActiveState); break; case NetworkModel::BufferItemType: { BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value(); switch(bufferInfo.type()) { case BufferInfo::ChannelBuffer: - addItemToMenu(_joinBufferAction, contextMenu, index, inactiveState); - addItemToMenu(_partBufferAction, contextMenu, index, activeState); - addItemToMenu(_hideBufferAction, contextMenu, (bool)config()); - addItemToMenu(_removeBufferAction, contextMenu, index, inactiveState); + addItemToMenu(_joinBufferAction, contextMenu, index, InactiveState); + addItemToMenu(_partBufferAction, contextMenu, index, ActiveState); + 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; } } @@ -442,10 +458,11 @@ 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)); +// BufferInfo bufferInfo = index.child(0,0).data(NetworkModel::BufferInfoRole).value(); +// if(bufferInfo.isValid()) { +// Client::instance()->userInput(bufferInfo, QString("/J %1").arg(channelName)); +// } } #endif return; @@ -459,15 +476,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?"),