X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=9ab553c0309efc3b31de14c84cce933ce337d518;hb=9cad7696cf0ef2f58c231c7b1eaaae0c16d0273d;hp=c11c6adf07ecc0d69fdb15e3e376a1cc439f6416;hpb=72d23cc04e32bfc166720f9b7ecaf4f53e63ec5e;p=quassel.git diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index c11c6adf..9ab553c0 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 @@ -48,6 +48,7 @@ // 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), @@ -59,25 +60,25 @@ BufferView::BufferView(QWidget *parent) _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(tr("Joins"), this), + _hidePartAction(tr("Parts"), this), + _hideQuitAction(tr("Quits"), this), + _hideNickAction(tr("Nick Changes"), this), + _hideModeAction(tr("Mode"), this), + _hideDayChangeAction(tr("Day Change"), this) { - // currently no events can be hidden -> disable actions _hideJoinAction.setCheckable(true); _hidePartAction.setCheckable(true); - _hideKillAction.setCheckable(true); _hideQuitAction.setCheckable(true); + _hideNickAction.setCheckable(true); _hideModeAction.setCheckable(true); - _hideJoinAction.setEnabled(false); - _hidePartAction.setEnabled(false); + _hideDayChangeAction.setCheckable(true); _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 &))); setSelectionMode(QAbstractItemView::ExtendedSelection); } @@ -99,21 +100,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 @@ -126,8 +125,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 +136,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 +149,7 @@ void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig * if(model()) { disconnect(this, 0, model(), 0); + disconnect(model(), 0, this, 0); } if(!model_) { @@ -159,6 +157,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); } @@ -167,7 +166,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) { @@ -179,7 +178,7 @@ void BufferView::setSelectionModel(QItemSelectionModel *selectionModel) { void BufferView::setConfig(BufferViewConfig *config) { if(_config == config) return; - + if(_config) { disconnect(_config, 0, this, 0); } @@ -214,7 +213,7 @@ void BufferView::joinChannel(const QModelIndex &index) { return; BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value(); - + Client::userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName())); } @@ -241,7 +240,7 @@ void BufferView::removeSelectedBuffers(bool permanently) { continue; removedRows << bufferId; - + if(permanently) config()->requestRemoveBufferPermanently(bufferId); else @@ -255,7 +254,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 +262,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 +300,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,7 +334,6 @@ 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); @@ -319,10 +343,6 @@ bool BufferView::checkRequirements(const QModelIndex &index, ItemActiveStates re if(!index.isValid()) return false; -// NetworkModel::itemTypes itemType = static_cast(index.data(NetworkModel::ItemTypeRole).toInt()); -// if(!(itemType & validItemTypes)) -// return false; - ItemActiveStates isActive = index.data(NetworkModel::ItemActiveRole).toBool() ? ActiveState : InactiveState; @@ -367,46 +387,57 @@ 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); + _hideNickAction.setChecked(filter & Message::Nick); + _hideModeAction.setChecked(filter & Message::Mode); + _hideDayChangeAction.setChecked(filter & Message::DayChange); + QMenu *hideEventsMenu = menu.addMenu(tr("Hide Events")); hideEventsMenu->addAction(&_hideJoinAction); hideEventsMenu->addAction(&_hidePartAction); - hideEventsMenu->addAction(&_hideKillAction); hideEventsMenu->addAction(&_hideQuitAction); + hideEventsMenu->addAction(&_hideNickAction); hideEventsMenu->addAction(&_hideModeAction); + hideEventsMenu->addAction(&_hideDayChangeAction); return hideEventsMenu; } -//void BufferView::showContextMenu(const QPoint &pos) { void BufferView::contextMenuEvent(QContextMenuEvent *event) { QModelIndex index = indexAt(event->pos()); + if(!index.isValid()) + index = rootIndex(); if(!index.isValid()) return; 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)); _disconnectNetAction.setIcon(connectionStateIcon); _connectNetAction.setIcon(connectionStateIcon); - addItemToMenu(_disconnectNetAction, contextMenu, index, ActiveState); - addItemToMenu(_connectNetAction, contextMenu, index, InactiveState); + 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; @@ -420,14 +451,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()); @@ -439,11 +470,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(); @@ -461,10 +492,7 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) { 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)); - } + Client::instance()->userInput(BufferInfo::fakeStatusBuffer(index.data(NetworkModel::NetworkIdRole).value()), QString("/J %1").arg(channelName)); } #endif return; @@ -481,7 +509,7 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) { Client::instance()->userInput(bufferInfo, QString("/PART")); return; } - + if(result == &_hideBufferTemporarilyAction) { removeSelectedBuffers(); return; @@ -504,6 +532,36 @@ 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 == &_hideNickAction) { + BufferId bufferId = index.data(NetworkModel::BufferIdRole).value(); + BufferSettings(bufferId).filterMessage(Message::Nick, _hideNickAction.isChecked()); + return; + } + if(result == &_hideModeAction) { + BufferId bufferId = index.data(NetworkModel::BufferIdRole).value(); + BufferSettings(bufferId).filterMessage(Message::Mode, _hideModeAction.isChecked()); + return; + } + if(result == &_hideDayChangeAction) { + BufferId bufferId = index.data(NetworkModel::BufferIdRole).value(); + BufferSettings(bufferId).filterMessage(Message::DayChange, _hideDayChangeAction.isChecked()); + return; + } } void BufferView::wheelEvent(QWheelEvent* event) { @@ -530,13 +588,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();