X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=8751c93e4b4c81053baa249b821cdce7b36be6c5;hp=936c06369e37e96357a612bd7dfb32416dbcdbde;hb=0a82bb8c3fe72240b6fa03fd1018289465abf7f1;hpb=e561e02a8d2f1f009559d17c7b1c66cb6f4e2a5a diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index 936c0636..8751c93e 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -22,16 +22,16 @@ #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 "uisettings.h" -#include "global.h" - #include #include #include @@ -62,24 +62,17 @@ BufferView::BufferView(QWidget *parent) _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(QIcon(":/16x16/actions/oxygen/16x16/actions/format-list-unordered.png")); + 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 &))); @@ -104,18 +97,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(); - + QTreeView::setModel(model); init(); // remove old Actions @@ -139,7 +133,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) { @@ -169,7 +163,7 @@ 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) { @@ -181,7 +175,7 @@ void BufferView::setSelectionModel(QItemSelectionModel *selectionModel) { void BufferView::setConfig(BufferViewConfig *config) { if(_config == config) return; - + if(_config) { disconnect(_config, 0, this, 0); } @@ -216,7 +210,7 @@ void BufferView::joinChannel(const QModelIndex &index) { return; BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value(); - + Client::userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName())); } @@ -243,7 +237,7 @@ void BufferView::removeSelectedBuffers(bool permanently) { continue; removedRows << bufferId; - + if(permanently) config()->requestRemoveBufferPermanently(bufferId); else @@ -257,7 +251,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); @@ -317,7 +311,7 @@ void BufferView::storeExpandedState(NetworkId networkId, bool 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) @@ -390,12 +384,16 @@ void BufferView::addSeparatorToMenu(QMenu &menu, const QModelIndex &index, ItemA } } -QMenu *BufferView::createHideEventsSubMenu(QMenu &menu) { - // QMenu *hideEventsMenu = new QMenu(tr("Hide Events"), &menu); +QMenu *BufferView::createHideEventsSubMenu(QMenu &menu, BufferId bufferId) { + int filter = BufferSettings(bufferId).messageFilter(); + _hideJoinAction.setChecked(filter & Message::Join); + _hidePartAction.setChecked(filter & Message::Part); + _hideQuitAction.setChecked(filter & Message::Quit); + _hideModeAction.setChecked(filter & Message::Mode); + QMenu *hideEventsMenu = menu.addMenu(tr("Hide Events")); hideEventsMenu->addAction(&_hideJoinAction); hideEventsMenu->addAction(&_hidePartAction); - hideEventsMenu->addAction(&_hideKillAction); hideEventsMenu->addAction(&_hideQuitAction); hideEventsMenu->addAction(&_hideModeAction); return hideEventsMenu; @@ -411,20 +409,20 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) { const Network *network = Client::network(index.data(NetworkModel::NetworkIdRole).value()); Q_CHECK_PTR(network); - QIcon connectionStateIcon; + QPixmap connectionStateIcon; if(network) { if(network->connectionState() == Network::Initialized) { - connectionStateIcon = QIcon(":/22x22/actions/network-connect"); + connectionStateIcon = SmallIcon("network-connect"); } else if(network->connectionState() == Network::Disconnected) { - connectionStateIcon = QIcon(":/22x22/actions/network-disconnect"); + connectionStateIcon = SmallIcon("network-disconnect"); } else { - connectionStateIcon = QIcon(":/22x22/actions/gear"); + 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)); @@ -446,14 +444,14 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) { addItemToMenu(_hideBufferTemporarilyAction, contextMenu, (bool)config()); addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config()); addItemToMenu(_removeBufferAction, contextMenu, index, InactiveState); - createHideEventsSubMenu(contextMenu); + createHideEventsSubMenu(contextMenu, bufferInfo.bufferId()); addItemToMenu(_ignoreListAction, contextMenu); break; case BufferInfo::QueryBuffer: addItemToMenu(_hideBufferTemporarilyAction, contextMenu, (bool)config()); addItemToMenu(_hideBufferPermanentlyAction, contextMenu, (bool)config()); addItemToMenu(_removeBufferAction, contextMenu); - createHideEventsSubMenu(contextMenu); + createHideEventsSubMenu(contextMenu, bufferInfo.bufferId()); break; default: addItemToMenu(_hideBufferTemporarilyAction, contextMenu, (bool)config()); @@ -465,11 +463,11 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) { default: return; } - + if(contextMenu.actions().isEmpty()) return; QAction *result = contextMenu.exec(QCursor::pos()); - + // Handle Result if(network && result == &_connectNetAction) { network->requestConnect(); @@ -504,7 +502,7 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) { Client::instance()->userInput(bufferInfo, QString("/PART")); return; } - + if(result == &_hideBufferTemporarilyAction) { removeSelectedBuffers(); return; @@ -527,6 +525,27 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) { return; } + if(result == & _hideJoinAction) { + BufferId bufferId = index.data(NetworkModel::BufferIdRole).value(); + BufferSettings(bufferId).filterMessage(Message::Join, _hideJoinAction.isChecked()); + return; + } + if(result == &_hidePartAction) { + BufferId bufferId = index.data(NetworkModel::BufferIdRole).value(); + BufferSettings(bufferId).filterMessage(Message::Part, _hidePartAction.isChecked()); + return; + } + if(result == &_hideQuitAction) { + BufferId bufferId = index.data(NetworkModel::BufferIdRole).value(); + BufferSettings(bufferId).filterMessage(Message::Quit, _hideQuitAction.isChecked()); + return; + } + if(result == &_hideModeAction) { + BufferId bufferId = index.data(NetworkModel::BufferIdRole).value(); + BufferSettings(bufferId).filterMessage(Message::Mode, _hideModeAction.isChecked()); + return; + } + } void BufferView::wheelEvent(QWheelEvent* event) { @@ -553,13 +572,13 @@ 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();