X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=eadf8f7739f157130cba350597e0a5e17b5ca68a;hp=5f33df45ae892cc58e075974c765d2c093d1eb87;hb=a7a8099ce2a9d8d25f963a8d297db498ecbc26a5;hpb=f429bd6dfbea50ad4690875f1466a920f7a3b509 diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index 5f33df45..eadf8f77 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -18,70 +18,38 @@ * 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 -#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), - 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), - _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) - -{ - _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); - - 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 &))); +BufferView::BufferView(QWidget *parent) : QTreeView(parent) { + 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); } @@ -103,12 +71,13 @@ 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 } @@ -167,13 +136,13 @@ 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))); } } @@ -203,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); } } } @@ -341,65 +310,6 @@ void BufferView::toggleHeader(bool checked) { header()->setSectionHidden((action->property("column")).toInt(), !checked); } -bool BufferView::checkRequirements(const QModelIndex &index, ItemActiveStates requiredActiveState) { - if(!index.isValid()) - 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); - } -} - -void BufferView::addItemToMenu(QAction &action, QMenu &menu, bool condition) { - if(condition) { - menu.addAction(&action); - action.setVisible(true); - } else { - action.setVisible(false); - } -} - - -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(); - } -} - -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::contextMenuEvent(QContextMenuEvent *event) { QModelIndex index = indexAt(event->pos()); if(!index.isValid()) @@ -407,125 +317,29 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) { if(!index.isValid()) return; - const Network *network = Client::network(index.data(NetworkModel::NetworkIdRole).value()); - Q_CHECK_PTR(network); - - QPixmap connectionStateIcon; - if(network) { - if(network->connectionState() == Network::Initialized) { - connectionStateIcon = SmallIcon("network-connect"); - } else if(network->connectionState() == Network::Disconnected) { - connectionStateIcon = SmallIcon("network-disconnect"); - } else { - 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(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; - 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; - } + addActionsToMenu(&contextMenu, index); + if(!contextMenu.actions().isEmpty()) + contextMenu.exec(QCursor::pos()); - 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()) { - Client::instance()->userInput(BufferInfo::fakeStatusBuffer(index.data(NetworkModel::NetworkIdRole).value()), QString("/J %1").arg(channelName)); - } -#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; - } +void BufferView::addActionsToMenu(QMenu *contextMenu, const QModelIndex &index) { + Client::mainUi()->actionProvider()->addActions(contextMenu, index, this, "menuActionTriggered", (bool)config()); +} - 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) { @@ -555,7 +369,6 @@ void BufferView::wheelEvent(QWheelEvent* event) { } - QSize BufferView::sizeHint() const { return QTreeView::sizeHint();