X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=18289284fe3b90817c79eb5047441f1c65151be1;hp=180db0da1c658a6af9384ce0a926872fc44ed571;hb=3ff1ec5b699a38e4a03deec4ea9576fade54cbbe;hpb=29b3fd2d4ee33d8bc72ef28982e5a6e963892991 diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index 180db0da..18289284 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-2010 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,46 +20,62 @@ #include "bufferview.h" -#include "buffermodel.h" -#include "bufferviewfilter.h" -#include "buffersyncer.h" -#include "client.h" -#include "mappedselectionmodel.h" -#include "network.h" -#include "networkmodel.h" - -#include "uisettings.h" - -#include "global.h" - +#include #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 "contextmenuactionprovider.h" +#include "graphicalui.h" +#include "network.h" +#include "networkmodel.h" +#include "contextmenuactionprovider.h" /***************************************** * 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); +BufferView::BufferView(QWidget *parent) + : QTreeView(parent) +{ + connect(this, SIGNAL(collapsed(const QModelIndex &)), SLOT(storeExpandedState(const QModelIndex &))); + connect(this, SIGNAL(expanded(const QModelIndex &)), SLOT(storeExpandedState(const QModelIndex &))); + + setSelectionMode(QAbstractItemView::ExtendedSelection); - connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), - this, SLOT(showContextMenu(const QPoint &))); + QAbstractItemDelegate *oldDelegate = itemDelegate(); + BufferViewDelegate *tristateDelegate = new BufferViewDelegate(this); + setItemDelegate(tristateDelegate); + delete oldDelegate; } void BufferView::init() { - setIndentation(10); header()->setContextMenuPolicy(Qt::ActionsContextMenu); hideColumn(1); hideColumn(2); + setIndentation(10); + expandAll(); - setAnimated(true); + header()->hide(); // nobody seems to use this anyway + + // breaks with Qt 4.8 + if(QString("4.8.0") > qVersion()) // FIXME breaks with Qt versions >= 4.10! + setAnimated(true); + + // FIXME This is to workaround bug #663 + setUniformRowHeights(true); #ifndef QT_NO_DRAGANDDROP setDragEnabled(true); @@ -69,21 +85,21 @@ 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 + disconnect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(joinChannel(QModelIndex))); + 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 + disconnect(this, SIGNAL(activated(QModelIndex)), this, SLOT(joinChannel(QModelIndex))); + 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 +112,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 +123,8 @@ void BufferView::setModel(QAbstractItemModel *model) { connect(showSection, SIGNAL(toggled(bool)), this, SLOT(toggleHeader(bool))); header()->addAction(showSection); } - + + connect(model, SIGNAL(layoutChanged()), this, SLOT(on_layoutChanged())); } void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *config) { @@ -122,6 +137,7 @@ void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig * if(model()) { disconnect(this, 0, model(), 0); + disconnect(model(), 0, this, 0); } if(!model_) { @@ -129,8 +145,7 @@ 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); } @@ -138,20 +153,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); } @@ -161,20 +176,23 @@ void BufferView::setConfig(BufferViewConfig *config) { connect(config, SIGNAL(networkIdSet(const NetworkId &)), this, SLOT(setRootIndexForNetworkId(const NetworkId &))); setRootIndexForNetworkId(config->networkId()); } else { + setIndentation(10); setRootIndex(QModelIndex()); } } void BufferView::setRootIndexForNetworkId(const NetworkId &networkId) { if(!networkId.isValid() || !model()) { + setIndentation(10); setRootIndex(QModelIndex()); } else { + setIndentation(5); int networkCount = model()->rowCount(); QModelIndex child; for(int i = 0; i < networkCount; i++) { child = model()->index(i, 0); if(networkId == model()->data(child, NetworkModel::NetworkIdRole).value()) - setRootIndex(child); + setRootIndex(child); } } } @@ -186,229 +204,310 @@ 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) && !selectionModel()->selectedIndexes().isEmpty()) { + if(event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete) { event->accept(); - QModelIndex index = selectionModel()->selectedIndexes().first(); - if(index.isValid() && index.data(NetworkModel::ItemTypeRole) == NetworkModel::BufferItemType) { - emit removeBuffer(index); - } + removeSelectedBuffers(); } QTreeView::keyPressEvent(event); } -void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) { +void BufferView::dropEvent(QDropEvent *event) { + QModelIndex index = indexAt(event->pos()); + + QRect indexRect = visualRect(index); + QPoint cursorPos = event->pos(); + + // check if we're really _on_ the item and not indicating a move to just above or below the item + const int margin = 2; + if(cursorPos.y() - indexRect.top() < margin + || indexRect.bottom() - cursorPos.y() < margin) + return QTreeView::dropEvent(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; + + if(index.data(NetworkModel::ItemTypeRole) != NetworkModel::BufferItemType) + return QTreeView::dropEvent(event); + + if(index.data(NetworkModel::BufferTypeRole) != BufferInfo::QueryBuffer) + return QTreeView::dropEvent(event); + + if(index.data(NetworkModel::NetworkIdRole).value() != networkId) + return QTreeView::dropEvent(event); + + BufferId bufferId1 = index.data(NetworkModel::BufferIdRole).value(); + if(bufferId1 == bufferId2) + return QTreeView::dropEvent(event); + + 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; + + 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; + } + + foreach(BufferId bufferId, removedRows) { + 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); - expand(parent); + + setExpandedState(parent); +} + +void BufferView::on_layoutChanged() { + int numNets = model()->rowCount(QModelIndex()); + for(int row = 0; row < numNets; row++) { + QModelIndex networkIdx = model()->index(row, 0, QModelIndex()); + setExpandedState(networkIdx); } } -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); - update(networkIdx); - if(model()->rowCount(networkIdx) > 0 && model()->data(networkIdx, NetworkModel::ItemActiveRole) == true) { - expand(networkIdx); - } else { - collapse(networkIdx); - } + if(model()->rowCount(networkIdx) == 0) + continue; + + networkId = model()->data(networkIdx, NetworkModel::NetworkIdRole).value(); + if(!networkId.isValid()) + continue; + + setExpandedState(networkIdx); } - // update selection to current one - MappedSelectionModel *mappedSelectionModel = qobject_cast(selectionModel()); - if(!config() || !mappedSelectionModel) + if(config()) { + // update selection to current one + Client::bufferModel()->synchronizeView(this); + } +} + +void BufferView::storeExpandedState(const QModelIndex &networkIdx) { + NetworkId networkId = model()->data(networkIdx, NetworkModel::NetworkIdRole).value(); + + int oldState = 0; + if(isExpanded(networkIdx)) + oldState |= WasExpanded; + if(model()->data(networkIdx, NetworkModel::ItemActiveRole).toBool()) + oldState |= WasActive; + + _expandedState[networkId] = oldState; +} + +void BufferView::setExpandedState(const QModelIndex &networkIdx) { + if(model()->data(networkIdx, NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType) return; - mappedSelectionModel->mappedSetCurrentIndex(Client::bufferModel()->standardSelectionModel()->currentIndex(), QItemSelectionModel::Current); - mappedSelectionModel->mappedSelect(Client::bufferModel()->standardSelectionModel()->selection(), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows); + if(model()->rowCount(networkIdx) == 0) + return; + + NetworkId networkId = model()->data(networkIdx, NetworkModel::NetworkIdRole).value(); + + bool networkActive = model()->data(networkIdx, NetworkModel::ItemActiveRole).toBool(); + bool expandNetwork = networkActive; + if(_expandedState.contains(networkId)) { + int oldState = _expandedState[networkId]; + if((bool)(oldState & WasActive) == networkActive) + expandNetwork = (bool)(oldState & WasExpanded); + } + + if(expandNetwork != isExpanded(networkIdx)) { + update(networkIdx); + setExpanded(networkIdx, expandNetwork); + } + storeExpandedState(networkIdx); // this call is needed to keep track of the isActive state } 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); - if(model()->rowCount(networkIdx) == 0) - continue; - - bool isActive = networkIdx.data(NetworkModel::ItemActiveRole).toBool(); - if(isExpanded(networkIdx) != isActive) setExpanded(networkIdx, isActive); + QModelIndex networkIdx = topLeft.sibling(i, 0); + setExpandedState(networkIdx); } } - 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(); + 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); - } + + if(index.isValid()) { + addActionsToMenu(&contextMenu, index); } - 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); + addFilterActions(&contextMenu, index); + + if(!contextMenu.actions().isEmpty()) + contextMenu.exec(QCursor::pos()); +} + +void BufferView::addActionsToMenu(QMenu *contextMenu, const QModelIndex &index) { + QModelIndexList indexList = selectedIndexes(); + // make sure the item we clicked on is first + indexList.removeAll(index); + indexList.prepend(index); + + GraphicalUi::contextMenuActionProvider()->addActions(contextMenu, indexList, this, "menuActionTriggered", (bool)config()); +} + +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); } - } 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::menuActionTriggered(QAction *result) { + ContextMenuActionProvider::ActionType type = (ContextMenuActionProvider::ActionType)result->data().toInt(); + switch(type) { + case ContextMenuActionProvider::HideBufferTemporarily: + removeSelectedBuffers(); + break; + case ContextMenuActionProvider::HideBufferPermanently: + removeSelectedBuffers(true); + break; + default: + return; } } -void BufferView::wheelEvent(QWheelEvent* event) { - if(UiSettings().value("MouseWheelChangesBuffers", QVariant(true)).toBool() == (bool)(event->modifiers() & Qt::AltModifier)) - return QTreeView::wheelEvent(event); +void BufferView::nextBuffer() { + changeBuffer(Forward); +} - int rowDelta = ( event->delta() > 0 ) ? -1 : 1; +void BufferView::previousBuffer() { + changeBuffer(Backward); +} + +void BufferView::changeBuffer(Direction direction) { QModelIndex currentIndex = selectionModel()->currentIndex(); QModelIndex resultingIndex; - if( model()->hasIndex( currentIndex.row() + rowDelta, currentIndex.column(), currentIndex.parent() ) ) - { - resultingIndex = currentIndex.sibling( currentIndex.row() + rowDelta, currentIndex.column() ); + + if(currentIndex.parent().isValid()) { + //If we are a child node just switch among siblings unless it's the first/last child + resultingIndex = currentIndex.sibling(currentIndex.row() + direction, 0); + + if(!resultingIndex.isValid()) { + QModelIndex parent = currentIndex.parent(); + if(direction == Backward) + resultingIndex = parent; + else + resultingIndex = parent.sibling(parent.row() + direction, 0); } - else //if we scroll into a the parent node... - { - QModelIndex parent = currentIndex.parent(); - QModelIndex aunt = parent.sibling( parent.row() + rowDelta, parent.column() ); - if( rowDelta == -1 ) - resultingIndex = aunt.child( model()->rowCount( aunt ) - 1, 0 ); - else - resultingIndex = aunt.child( 0, 0 ); - if( !resultingIndex.isValid() ) - return; - } + } else { + //If we have a toplevel node, try and get an adjacent child + if(direction == Backward) { + QModelIndex newParent = currentIndex.sibling(currentIndex.row() - 1, 0); + if(model()->hasChildren(newParent)) + resultingIndex = newParent.child(model()->rowCount(newParent) - 1, 0); + else + resultingIndex = newParent; + } else { + if(model()->hasChildren(currentIndex)) + resultingIndex = currentIndex.child(0, 0); + else + resultingIndex = currentIndex.sibling(currentIndex.row() + 1, 0); + } + } + + if(!resultingIndex.isValid()) + return; + selectionModel()->setCurrentIndex( resultingIndex, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows ); selectionModel()->select( resultingIndex, QItemSelectionModel::ClearAndSelect ); - } +void BufferView::wheelEvent(QWheelEvent* event) { + if(ItemViewSettings().mouseWheelChangesBuffer() == (bool)(event->modifiers() & Qt::AltModifier)) + return QTreeView::wheelEvent(event); + + int rowDelta = ( event->delta() > 0 ) ? -1 : 1; + changeBuffer((Direction)rowDelta); +} + +void BufferView::hideCurrentBuffer() { + QModelIndex index = selectionModel()->currentIndex(); + if(index.data(NetworkModel::ItemTypeRole) != NetworkModel::BufferItemType) + return; + + BufferId bufferId = index.data(NetworkModel::BufferIdRole).value(); + + //The check above means we won't be looking at a network, which should always be the first row, so we can just go backwards. + changeBuffer(Backward); + + /*if(removedRows.contains(bufferId)) + continue; + + removedRows << bufferId;*/ + /*if(permanently) + config()->requestRemoveBufferPermanently(bufferId); + else*/ + config()->requestRemoveBuffer(bufferId); +} QSize BufferView::sizeHint() const { return QTreeView::sizeHint(); - + if(!model()) return QTreeView::sizeHint(); @@ -423,27 +522,110 @@ QSize BufferView::sizeHint() const { return QSize(columnSize, 50); } + +// **************************************** +// BufferViewDelgate +// **************************************** +class ColorsChangedEvent : public QEvent { +public: + ColorsChangedEvent() : QEvent(QEvent::User) {}; +}; + +BufferViewDelegate::BufferViewDelegate(QObject *parent) + : QStyledItemDelegate(parent) +{ +} + +void BufferViewDelegate::customEvent(QEvent *event) { + if(event->type() != QEvent::User) + return; + + event->accept(); +} + +bool BufferViewDelegate::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; +} + // ============================== // BufferView Dock // ============================== BufferViewDock::BufferViewDock(BufferViewConfig *config, QWidget *parent) - : QDockWidget(config->bufferViewName(), parent) + : QDockWidget(parent), + _active(false), + _title(config->bufferViewName()) { setObjectName("BufferViewDock-" + QString::number(config->bufferViewId())); toggleViewAction()->setData(config->bufferViewId()); setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea); connect(config, SIGNAL(bufferViewNameSet(const QString &)), this, SLOT(bufferViewRenamed(const QString &))); + updateTitle(); } -BufferViewDock::BufferViewDock(QWidget *parent) - : QDockWidget(tr("All Buffers"), parent) -{ - setObjectName("BufferViewDock--1"); - toggleViewAction()->setData((int)-1); - setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea); +void BufferViewDock::updateTitle() { + QString title = _title; + if(isActive()) + title.prepend(QString::fromUtf8("• ")); + setWindowTitle(title); +} + +void BufferViewDock::setActive(bool active) { + if(active != isActive()) { + _active = active; + updateTitle(); + if(active) + raise(); // for tabbed docks + } } void BufferViewDock::bufferViewRenamed(const QString &newName) { - setWindowTitle(newName); + _title = newName; + updateTitle(); toggleViewAction()->setText(newName); } + +int BufferViewDock::bufferViewId() const { + BufferView *view = bufferView(); + if(!view) + return 0; + + if(view->config()) + return view->config()->bufferViewId(); + else + return 0; +} + +BufferViewConfig *BufferViewDock::config() const { + BufferView *view = bufferView(); + if(!view) + return 0; + else + return view->config(); +}