X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=c0e85ad0ebff612e64a2a04ddf04e4c9fa3b2629;hp=598686eceefdb2f299748deef2fd574eb29e5061;hb=823477acf579a0c3333d61fbf6400ad49155da5c;hpb=f2e4609f070221a010eef8be98524c5ce88d228b diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index 598686ec..c0e85ad0 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -20,9 +20,11 @@ #include "bufferview.h" +#include "buffermodel.h" #include "bufferviewfilter.h" #include "buffersyncer.h" #include "client.h" +#include "mappedselectionmodel.h" #include "network.h" #include "networkmodel.h" @@ -37,6 +39,7 @@ #include #include #include +#include /***************************************** * The TreeView showing the Buffers @@ -48,6 +51,8 @@ BufferView::BufferView(QWidget *parent) : QTreeView(parent) { connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(showContextMenu(const QPoint &))); + + setSelectionMode(QAbstractItemView::ExtendedSelection); } void BufferView::init() { @@ -78,11 +83,12 @@ 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(); - if(!model) - return; - // remove old Actions QList oldactions = header()->actions(); foreach(QAction *action, oldactions) { @@ -90,6 +96,11 @@ void BufferView::setModel(QAbstractItemModel *model) { action->deleteLater(); } + if(!model) + return; + + connect(model, SIGNAL(layoutChanged()), this, SLOT(layoutChanged())); + QString sectionName; QAction *showSection; for(int i = 1; i < model->columnCount(); i++) { @@ -121,11 +132,25 @@ 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(this, SIGNAL(removeBuffer(const QModelIndex &)), + filter, SLOT(removeBuffer(const QModelIndex &))); } setConfig(config); } +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) { + connect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)), + filter, SLOT(checkPreviousCurrentForRemoval(QModelIndex, QModelIndex))); + } +} + void BufferView::setConfig(BufferViewConfig *config) { if(_config == config) return; @@ -171,25 +196,59 @@ void BufferView::joinChannel(const QModelIndex &index) { void BufferView::keyPressEvent(QKeyEvent *event) { if(event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete) { event->accept(); - QModelIndex index = selectionModel()->selectedIndexes().first(); - if(index.isValid()) { + removeSelectedBuffers(); + } + QTreeView::keyPressEvent(event); +} + +void BufferView::removeSelectedBuffers() { + QSet removedRows; + foreach(QModelIndex index, selectionModel()->selectedIndexes()) { + if(index.data(NetworkModel::ItemTypeRole) == NetworkModel::BufferItemType && !removedRows.contains(index.row())) { + removedRows << index.row(); emit removeBuffer(index); } } - QTreeView::keyPressEvent(event); } -// ensure that newly inserted network nodes are expanded per default void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) { QTreeView::rowsInserted(parent, start, end); - if(model()->rowCount(parent) == 1 && parent.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType - && parent.data(NetworkModel::ItemActiveRole) == true) { + + // 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); expand(parent); } } +void BufferView::layoutChanged() { + Q_ASSERT(model()); + + // expand all active networks + 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) { + expand(networkIdx); + } else { + collapse(networkIdx); + } + } + + // update selection to current one + MappedSelectionModel *mappedSelectionModel = qobject_cast(selectionModel()); + if(!config() || !mappedSelectionModel) + return; + + mappedSelectionModel->mappedSetCurrentIndex(Client::bufferModel()->standardSelectionModel()->currentIndex(), QItemSelectionModel::Current); + mappedSelectionModel->mappedSelect(Client::bufferModel()->standardSelectionModel()->selection(), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows); +} + void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) { QTreeView::dataChanged(topLeft, bottomRight); @@ -218,15 +277,17 @@ void BufferView::showContextMenu(const QPoint &pos) { QModelIndex index = indexAt(pos); if(!index.isValid()) return; 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 *connectNetAction = contextMenu.addAction(tr("Connect")); + QAction *disconnectNetAction = contextMenu.addAction(tr("Disconnect")); + QAction *joinChannelAction = contextMenu.addAction(tr("Join Channel")); - QAction *joinBufferAction = new QAction(tr("Join"), this); - QAction *partBufferAction = new QAction(tr("Part"), this); - QAction *removeBufferAction = new QAction(tr("Delete buffer"), this); + QAction *joinBufferAction = contextMenu.addAction(tr("Join")); + QAction *partBufferAction = contextMenu.addAction(tr("Part")); + QAction *hideBufferAction = contextMenu.addAction(tr("Remove buffers")); + hideBufferAction->setToolTip(tr("Removes the selected buffers from a custom view but leaves the buffer itself untouched")); + QAction *removeBufferAction = contextMenu.addAction(tr("Delete buffer")); - QMenu *hideEventsMenu = new QMenu(tr("Hide Events"), this); + QMenu *hideEventsMenu = contextMenu.addMenu(tr("Hide Events")); QAction *hideJoinAction = hideEventsMenu->addAction(tr("Join Events")); QAction *hidePartAction = hideEventsMenu->addAction(tr("Part Events")); QAction *hideKillAction = hideEventsMenu->addAction(tr("Kill Events")); @@ -264,6 +325,8 @@ void BufferView::showContextMenu(const QPoint &pos) { if(bufferInfo.type() != BufferInfo::ChannelBuffer && bufferInfo.type() != BufferInfo::QueryBuffer) return; contextMenu.addAction(joinBufferAction); contextMenu.addAction(partBufferAction); + if(config()) + contextMenu.addAction(hideBufferAction); contextMenu.addAction(removeBufferAction); contextMenu.addMenu(hideEventsMenu); contextMenu.addAction(ignoreListAction); @@ -308,14 +371,13 @@ void BufferView::showContextMenu(const QPoint &pos) { } } #endif - } else - if(result == joinBufferAction) { + } else if(result == joinBufferAction) { Client::instance()->userInput(bufferInfo, QString("/JOIN %1").arg(channelname)); - } else - if(result == partBufferAction) { + } else if(result == partBufferAction) { Client::instance()->userInput(bufferInfo, QString("/PART %1").arg(channelname)); - } else - if(result == removeBufferAction) { + } else if(result == hideBufferAction) { + removeSelectedBuffers(); + } else if(result == removeBufferAction) { int res = QMessageBox::question(this, tr("Remove buffer permanently?"), tr("Do you want to delete the buffer \"%1\" permanently? This will delete all related data, including all backlog " "data, from the core's database!").arg(bufferInfo.bufferName()),