X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=7c4e6c5ef5a250c7b18b2dd78689460ec79daef0;hp=c11c6adf07ecc0d69fdb15e3e376a1cc439f6416;hb=09fea00d02da49748b6a040752759eab16ccd392;hpb=72d23cc04e32bfc166720f9b7ecaf4f53e63ec5e diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index c11c6adf..7c4e6c5e 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -20,26 +20,62 @@ #include "bufferview.h" +#include +#include +#include +#include +#include +#include +#include +#include + +#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" +bool TristateDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) { + if(event->type() != QEvent::MouseButtonRelease) + return QStyledItemDelegate::editorEvent(event, model, option, index); + + if(!(model->flags(index) & Qt::ItemIsUserCheckable)) + return QStyledItemDelegate::editorEvent(event, model, option, index); + + QVariant value = index.data(Qt::CheckStateRole); + if(!value.isValid()) + return QStyledItemDelegate::editorEvent(event, model, option, index); + + QStyleOptionViewItemV4 viewOpt(option); + initStyleOption(&viewOpt, index); + + QRect checkRect = viewOpt.widget->style()->subElementRect(QStyle::SE_ItemViewItemCheckIndicator, &viewOpt, viewOpt.widget); + QMouseEvent *me = static_cast(event); + + if(me->button() != Qt::LeftButton || !checkRect.contains(me->pos())) + return QStyledItemDelegate::editorEvent(event, model, option, index); + + Qt::CheckState state = static_cast(value.toInt()); + if(state == Qt::Unchecked) + state = Qt::PartiallyChecked; + else if(state == Qt::PartiallyChecked) + state = Qt::Checked; + else + state = Qt::Unchecked; + model->setData(index, state, Qt::CheckStateRole); + return true; +} + + -#include -#include -#include -#include -#include -#include -#include -#include /***************************************** * The TreeView showing the Buffers @@ -47,46 +83,24 @@ // 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), - _connectNetAction(tr("Connect"), this), - _disconnectNetAction(tr("Disconnect"), this), - _joinChannelAction(tr("Join Channel"), this), - - _joinBufferAction(tr("Join"), this), - _partBufferAction(tr("Part"), this), - _hideBufferTemporarilyAction(tr("Hide buffers"), this), - _hideBufferPermanentlyAction(tr("Hide buffers permanently"), this), - _removeBufferAction(tr("Delete buffer"), this), - _ignoreListAction(tr("Ignore list"), this), - - _hideJoinAction(tr("Join Events"), this), - _hidePartAction(tr("Part Events"), this), - _hideKillAction(tr("Kill Events"), this), - _hideQuitAction(tr("Quit Events"), this), - _hideModeAction(tr("Mode Events"), this) - + : QTreeView(parent) { - // currently no events can be hidden -> disable actions - _hideJoinAction.setCheckable(true); - _hidePartAction.setCheckable(true); - _hideKillAction.setCheckable(true); - _hideQuitAction.setCheckable(true); - _hideModeAction.setCheckable(true); - _hideJoinAction.setEnabled(false); - _hidePartAction.setEnabled(false); - _ignoreListAction.setEnabled(false); - _hideKillAction.setEnabled(false); - _hideQuitAction.setEnabled(false); - _hideModeAction.setEnabled(false); + connect(this, SIGNAL(collapsed(const QModelIndex &)), SLOT(on_collapse(const QModelIndex &))); + connect(this, SIGNAL(expanded(const QModelIndex &)), SLOT(on_expand(const QModelIndex &))); setSelectionMode(QAbstractItemView::ExtendedSelection); + + QAbstractItemDelegate *oldDelegate = itemDelegate(); + TristateDelegate *tristateDelegate = new TristateDelegate(this); + setItemDelegate(tristateDelegate); + delete oldDelegate; } void BufferView::init() { - setIndentation(10); header()->setContextMenuPolicy(Qt::ActionsContextMenu); hideColumn(1); hideColumn(2); + setIndentation(5); expandAll(); setAnimated(true); @@ -99,21 +113,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 || 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 @@ -126,8 +138,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++) { @@ -139,7 +149,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) { @@ -152,6 +162,7 @@ void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig * if(model()) { disconnect(this, 0, model(), 0); + disconnect(model(), 0, this, 0); } if(!model_) { @@ -159,6 +170,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); } @@ -166,20 +178,20 @@ void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig * void BufferView::setSelectionModel(QItemSelectionModel *selectionModel) { if(QTreeView::selectionModel()) disconnect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)), - model(), SIGNAL(checkPreviousCurrentForRemoval(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))); + filter, SLOT(checkPreviousCurrentForRemoval(QModelIndex, QModelIndex))); } } void BufferView::setConfig(BufferViewConfig *config) { if(_config == config) return; - + if(_config) { disconnect(_config, 0, this, 0); } @@ -202,7 +214,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); } } } @@ -214,7 +226,7 @@ void BufferView::joinChannel(const QModelIndex &index) { return; BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value(); - + Client::userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName())); } @@ -226,6 +238,37 @@ void BufferView::keyPressEvent(QKeyEvent *event) { QTreeView::keyPressEvent(event); } +void BufferView::dropEvent(QDropEvent *event) { + QList< QPair > bufferList = Client::networkModel()->mimeDataToBufferList(event->mimeData()); + + if(bufferList.count() != 1) + return QTreeView::dropEvent(event); + + NetworkId networkId = bufferList[0].first; + BufferId bufferId2 = bufferList[0].second; + + QModelIndex index = indexAt(event->pos()); + if(index.data(NetworkModel::ItemTypeRole) != NetworkModel::BufferItemType) + return; + + if(index.data(NetworkModel::BufferTypeRole) != BufferInfo::QueryBuffer) + return; + + if(index.data(NetworkModel::NetworkIdRole).value() != networkId) + return; + + BufferId bufferId1 = index.data(NetworkModel::BufferIdRole).value(); + if(bufferId1 == bufferId2) + return; + + int res = QMessageBox::question(0, tr("Merge buffers permanently?"), + tr("Do you want to merge the buffer \"%1\" permanently into buffer \"%2\"?\n This cannot be reversed!").arg(Client::networkModel()->bufferName(bufferId2)).arg(Client::networkModel()->bufferName(bufferId1)), + QMessageBox::Yes|QMessageBox::No, QMessageBox::No); + if(res == QMessageBox::Yes) { + Client::mergeBuffersPermanently(bufferId1, bufferId2); + } +} + void BufferView::removeSelectedBuffers(bool permanently) { if(!config()) return; @@ -241,7 +284,7 @@ void BufferView::removeSelectedBuffers(bool permanently) { continue; removedRows << bufferId; - + if(permanently) config()->requestRemoveBufferPermanently(bufferId); else @@ -255,7 +298,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); @@ -263,19 +306,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 @@ -287,16 +344,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; @@ -309,201 +378,57 @@ 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); } -bool BufferView::checkRequirements(const QModelIndex &index, ItemActiveStates requiredActiveState) { +void BufferView::contextMenuEvent(QContextMenuEvent *event) { + QModelIndex index = indexAt(event->pos()); if(!index.isValid()) - return false; + index = rootIndex(); -// NetworkModel::itemTypes itemType = static_cast(index.data(NetworkModel::ItemTypeRole).toInt()); -// if(!(itemType & validItemTypes)) -// return false; - - ItemActiveStates isActive = index.data(NetworkModel::ItemActiveRole).toBool() - ? ActiveState - : InactiveState; - - if(!(isActive & requiredActiveState)) - return false; - - return true; -} - -void BufferView::addItemToMenu(QAction &action, QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) { - if(checkRequirements(index, requiredActiveState)) { - menu.addAction(&action); - action.setVisible(true); - } else { - action.setVisible(false); - } -} + QMenu contextMenu(this); -void BufferView::addItemToMenu(QAction &action, QMenu &menu, bool condition) { - if(condition) { - menu.addAction(&action); - action.setVisible(true); - } else { - action.setVisible(false); + if(index.isValid()) { + addActionsToMenu(&contextMenu, index); } -} + addFilterActions(&contextMenu, index); -void BufferView::addItemToMenu(QMenu &subMenu, QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) { - if(checkRequirements(index, requiredActiveState)) { - menu.addMenu(&subMenu); - subMenu.setVisible(true); - } else { - subMenu.setVisible(false); - } -} - -void BufferView::addSeparatorToMenu(QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) { - if(checkRequirements(index, requiredActiveState)) { - menu.addSeparator(); - } + if(!contextMenu.actions().isEmpty()) + contextMenu.exec(QCursor::pos()); } -QMenu *BufferView::createHideEventsSubMenu(QMenu &menu) { - // QMenu *hideEventsMenu = new QMenu(tr("Hide Events"), &menu); - QMenu *hideEventsMenu = menu.addMenu(tr("Hide Events")); - hideEventsMenu->addAction(&_hideJoinAction); - hideEventsMenu->addAction(&_hidePartAction); - hideEventsMenu->addAction(&_hideKillAction); - hideEventsMenu->addAction(&_hideQuitAction); - hideEventsMenu->addAction(&_hideModeAction); - return hideEventsMenu; +void BufferView::addActionsToMenu(QMenu *contextMenu, const QModelIndex &index) { + Client::mainUi()->actionProvider()->addActions(contextMenu, index, this, "menuActionTriggered", (bool)config()); } -//void BufferView::showContextMenu(const QPoint &pos) { -void BufferView::contextMenuEvent(QContextMenuEvent *event) { - QModelIndex index = indexAt(event->pos()); - if(!index.isValid()) - return; - - const Network *network = Client::network(index.data(NetworkModel::NetworkIdRole).value()); - Q_CHECK_PTR(network); - - QIcon connectionStateIcon; - if(network) { - if(network->connectionState() == Network::Initialized) { - connectionStateIcon = QIcon(":/22x22/actions/network-connect"); - } else if(network->connectionState() == Network::Disconnected) { - connectionStateIcon = QIcon(":/22x22/actions/network-disconnect"); - } else { - connectionStateIcon = QIcon(":/22x22/actions/gear"); - } - } - - QMenu contextMenu(this); - NetworkModel::itemType itemType = static_cast(index.data(NetworkModel::ItemTypeRole).toInt()); - - switch(itemType) { - case NetworkModel::NetworkItemType: - _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); - 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(_hideBufferTemporarilyAction, contextMenu, (bool)config()); - addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config()); - addItemToMenu(_removeBufferAction, contextMenu, index, InactiveState); - createHideEventsSubMenu(contextMenu); - addItemToMenu(_ignoreListAction, contextMenu); - break; - case BufferInfo::QueryBuffer: - addItemToMenu(_hideBufferTemporarilyAction, contextMenu, (bool)config()); - addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config()); - addItemToMenu(_removeBufferAction, contextMenu); - createHideEventsSubMenu(contextMenu); - break; - default: - addItemToMenu(_hideBufferTemporarilyAction, contextMenu, (bool)config()); - addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config()); - break; - } - } - break; - default: - return; - } - - if(contextMenu.actions().isEmpty()) - return; - QAction *result = contextMenu.exec(QCursor::pos()); - - // Handle Result - if(network && result == &_connectNetAction) { - network->requestConnect(); - return; - } - - if(network && result == &_disconnectNetAction) { - network->requestDisconnect(); - return; - } - - 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, 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)); +void BufferView::addFilterActions(QMenu *contextMenu, const QModelIndex &index) { + BufferViewFilter *filter = qobject_cast(model()); + if(filter) { + QList filterActions = filter->actions(index); + if(!filterActions.isEmpty()) { + contextMenu->addSeparator(); + foreach(QAction *action, filterActions) { + contextMenu->addAction(action); } } -#endif - return; - } - - if(result == &_joinBufferAction) { - BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value(); - Client::instance()->userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName())); - return; - } - - if(result == &_partBufferAction) { - BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value(); - Client::instance()->userInput(bufferInfo, QString("/PART")); - return; - } - - 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?"), - 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()); - } - return; +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; } - } void BufferView::wheelEvent(QWheelEvent* event) { @@ -530,13 +455,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();