X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=5e3f7263694793e94ed4d7646af1400fee316e89;hp=78d8bae0cdd215f12e531c18d1f1709b47acc75d;hb=610cf75dbef35c6f90bd9657f3fae56a6067de08;hpb=d52b78268ad6ab09f896508a94dd7be47a720153 diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index 78d8bae0..5e3f7263 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -18,38 +18,40 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include +#include +#include +#include +#include +#include +#include + #include "bufferview.h" +#include "action.h" #include "buffermodel.h" #include "bufferviewfilter.h" +#include "buffersettings.h" #include "buffersyncer.h" #include "client.h" +#include "iconloader.h" #include "mappedselectionmodel.h" #include "network.h" #include "networkmodel.h" - +#include "networkmodelactionprovider.h" +#include "quasselui.h" #include "uisettings.h" -#include "global.h" - -#include -#include -#include -#include -#include -#include -#include - /***************************************** * The TreeView showing the Buffers *****************************************/ // Please be carefull when reimplementing methods which are used to inform the view about changes to the data // to be on the safe side: call QTreeView's method aswell BufferView::BufferView(QWidget *parent) : QTreeView(parent) { - setContextMenuPolicy(Qt::CustomContextMenu); + connect(this, SIGNAL(collapsed(const QModelIndex &)), SLOT(on_collapse(const QModelIndex &))); + connect(this, SIGNAL(expanded(const QModelIndex &)), SLOT(on_expand(const QModelIndex &))); - connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), - this, SLOT(showContextMenu(const QPoint &))); + setSelectionMode(QAbstractItemView::ExtendedSelection); } void BufferView::init() { @@ -69,21 +71,19 @@ void BufferView::init() { setSortingEnabled(true); sortByColumn(0, Qt::AscendingOrder); -#ifndef Q_WS_QWS - // this is a workaround to not join channels automatically... we need a saner way to navigate for qtopia anyway though, - // such as mark first, activate at second click... - connect(this, SIGNAL(activated(QModelIndex)), this, SLOT(joinChannel(QModelIndex))); + + // activated() fails on X11 and Qtopia at least +#if defined Q_WS_QWS or defined Q_WS_X11 + connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(joinChannel(QModelIndex))); #else - connect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(joinChannel(QModelIndex))); // Qtopia uses single click for activation + // afaik this is better on Mac and Windows + connect(this, SIGNAL(activated(QModelIndex)), SLOT(joinChannel(QModelIndex))); #endif } 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 @@ -96,8 +96,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++) { @@ -109,7 +107,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) { @@ -122,6 +120,7 @@ void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig * if(model()) { disconnect(this, 0, model(), 0); + disconnect(model(), 0, this, 0); } if(!model_) { @@ -129,15 +128,28 @@ 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); } +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; - + if(_config) { disconnect(_config, 0, this, 0); } @@ -160,7 +172,7 @@ void BufferView::setRootIndexForNetworkId(const NetworkId &networkId) { for(int i = 0; i < networkCount; i++) { child = model()->index(i, 0); if(networkId == model()->data(child, NetworkModel::NetworkIdRole).value()) - setRootIndex(child); + setRootIndex(child); } } } @@ -172,28 +184,48 @@ void BufferView::joinChannel(const QModelIndex &index) { return; BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value(); - + Client::userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName())); } 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()) { - emit removeBuffer(index); - } + removeSelectedBuffers(); } QTreeView::keyPressEvent(event); } +void BufferView::removeSelectedBuffers(bool permanently) { + if(!config()) + return; + + BufferId bufferId; + QSet removedRows; + foreach(QModelIndex index, selectionModel()->selectedIndexes()) { + 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); + } +} + void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) { QTreeView::rowsInserted(parent, start, 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); @@ -201,19 +233,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 @@ -225,16 +271,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; @@ -247,124 +305,40 @@ 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); } -void BufferView::showContextMenu(const QPoint &pos) { - QModelIndex index = indexAt(pos); - if(!index.isValid()) return; +void BufferView::contextMenuEvent(QContextMenuEvent *event) { + QModelIndex index = indexAt(event->pos()); + if(!index.isValid()) + index = rootIndex(); + 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 *joinBufferAction = new QAction(tr("Join"), this); - QAction *partBufferAction = new QAction(tr("Part"), this); - QAction *removeBufferAction = new QAction(tr("Delete buffer"), this); - - QMenu *hideEventsMenu = new QMenu(tr("Hide Events"), this); - QAction *hideJoinAction = hideEventsMenu->addAction(tr("Join Events")); - QAction *hidePartAction = hideEventsMenu->addAction(tr("Part Events")); - QAction *hideKillAction = hideEventsMenu->addAction(tr("Kill Events")); - QAction *hideQuitAction = hideEventsMenu->addAction(tr("Quit Events")); - QAction *hideModeAction = hideEventsMenu->addAction(tr("Mode Events")); - hideJoinAction->setCheckable(true); - hidePartAction->setCheckable(true); - hideKillAction->setCheckable(true); - hideQuitAction->setCheckable(true); - hideModeAction->setCheckable(true); - hideJoinAction->setEnabled(false); - hidePartAction->setEnabled(false); - hideKillAction->setEnabled(false); - hideQuitAction->setEnabled(false); - hideModeAction->setEnabled(false); - - QAction *ignoreListAction = new QAction(tr("Ignore list"), this); - ignoreListAction->setEnabled(false); - QAction *whoBufferAction = new QAction(tr("WHO"), this); - - if(index.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType) { - if(index.data(NetworkModel::ItemActiveRole).toBool()) { - contextMenu.addAction(disconnectNetAction); - contextMenu.addSeparator(); - contextMenu.addAction(joinChannelAction); - } else { - contextMenu.addAction(connectNetAction); - } - } + addActionsToMenu(&contextMenu, index); + if(!contextMenu.actions().isEmpty()) + contextMenu.exec(QCursor::pos()); - BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value(); - QString channelname = index.sibling(index.row(), 0).data().toString(); - - if(index.data(NetworkModel::ItemTypeRole) == NetworkModel::BufferItemType) { - if(bufferInfo.type() != BufferInfo::ChannelBuffer && bufferInfo.type() != BufferInfo::QueryBuffer) return; - contextMenu.addAction(joinBufferAction); - contextMenu.addAction(partBufferAction); - contextMenu.addAction(removeBufferAction); - contextMenu.addMenu(hideEventsMenu); - contextMenu.addAction(ignoreListAction); - contextMenu.addAction(whoBufferAction); - - if(bufferInfo.type() == BufferInfo::ChannelBuffer) { - if(index.data(NetworkModel::ItemActiveRole).toBool()) { - removeBufferAction->setEnabled(false); - removeBufferAction->setToolTip("To delete the buffer, part the channel first."); - joinBufferAction->setVisible(false); - whoBufferAction->setVisible(false); - } else { - partBufferAction->setVisible(false); - } - } else { - joinBufferAction->setVisible(false); - partBufferAction->setVisible(false); - } - } +} - QAction *result = contextMenu.exec(QCursor::pos()); - if(result == connectNetAction || result == disconnectNetAction) { - const Network *network = Client::network(index.data(NetworkModel::NetworkIdRole).value()); - if(!network) return; - if(network->connectionState() == Network::Disconnected) - network->requestConnect(); - else - network->requestDisconnect(); - } else - if(result == joinChannelAction) { - // FIXME no QInputDialog in Qtopia -#ifndef Q_WS_QWS - bool ok; - QString channelName = QInputDialog::getText(this, tr("Join Channel"), - tr("Input channel name:"),QLineEdit::Normal, - QDir::home().dirName(), &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)); - } - } -#endif - } else - if(result == joinBufferAction) { - Client::instance()->userInput(bufferInfo, QString("/JOIN %1").arg(channelname)); - } else - if(result == partBufferAction) { - Client::instance()->userInput(bufferInfo, QString("/PART %1").arg(channelname)); - } 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()), - QMessageBox::Yes|QMessageBox::No, QMessageBox::No); - if(res == QMessageBox::Yes) { - Client::removeBuffer(bufferInfo.bufferId()); - } - } else - if(result == whoBufferAction) { - Client::instance()->userInput(bufferInfo, QString("/WHO %1").arg(channelname)); +void BufferView::addActionsToMenu(QMenu *contextMenu, const QModelIndex &index) { + Client::mainUi()->actionProvider()->addActions(contextMenu, index, this, "menuActionTriggered", (bool)config()); +} + +void BufferView::menuActionTriggered(QAction *result) { + NetworkModelActionProvider::ActionType type = (NetworkModelActionProvider::ActionType)result->data().toInt(); + switch(type) { + case NetworkModelActionProvider::HideBufferTemporarily: + removeSelectedBuffers(); + break; + case NetworkModelActionProvider::HideBufferPermanently: + removeSelectedBuffers(true); + break; + default: + return; } } @@ -392,13 +366,12 @@ 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();