X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=ecaf7e948f2f971429b8c4f1718b882794453dbe;hp=ed530edb947d6a19b248a4d34cc66e013590ba0f;hb=119c23602ed1aa956d756ad6f56adb05cad1f815;hpb=a1bcca1c86e88406a0c5495b08731e6b11dd987e diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index ed530edb..ecaf7e94 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-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,77 +20,60 @@ #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), - _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(storeExpandedState(const QModelIndex &))); + connect(this, SIGNAL(expanded(const QModelIndex &)), SLOT(storeExpandedState(const QModelIndex &))); setSelectionMode(QAbstractItemView::ExtendedSelection); + + 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(); + header()->hide(); // nobody seems to use this anyway + setAnimated(true); + // FIXME This is to workaround bug #663 + setUniformRowHeights(true); + #ifndef QT_NO_DRAGANDDROP setDragEnabled(true); setAcceptDrops(true); @@ -99,21 +82,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 @@ -126,8 +109,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 +120,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) { @@ -152,6 +134,7 @@ void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig * if(model()) { disconnect(this, 0, model(), 0); + disconnect(model(), 0, this, 0); } if(!model_) { @@ -159,6 +142,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 +150,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); } @@ -189,20 +173,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); } } } @@ -214,7 +201,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 +213,46 @@ void BufferView::keyPressEvent(QKeyEvent *event) { QTreeView::keyPressEvent(event); } +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; @@ -241,7 +268,9 @@ void BufferView::removeSelectedBuffers(bool permanently) { continue; removedRows << bufferId; - + } + + foreach(BufferId bufferId, removedRows) { if(permanently) config()->requestRemoveBufferPermanently(bufferId); else @@ -249,265 +278,158 @@ void BufferView::removeSelectedBuffers(bool permanently) { } } -void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) { +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); - } - } - - // update selection to current one - MappedSelectionModel *mappedSelectionModel = qobject_cast(selectionModel()); - if(!config() || !mappedSelectionModel) - return; - - mappedSelectionModel->mappedSetCurrentIndex(Client::bufferModel()->standardSelectionModel()->currentIndex(), QItemSelectionModel::Current); - mappedSelectionModel->mappedSelect(Client::bufferModel()->standardSelectionModel()->selection(), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows); -} - -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; + if(model()->rowCount(networkIdx) == 0) + continue; - for(int i = topLeft.row(); i <= bottomRight.row(); i++) { - QModelIndex networkIdx = topLeft.sibling(topLeft.row(), 0); - if(model()->rowCount(networkIdx) == 0) + networkId = model()->data(networkIdx, NetworkModel::NetworkIdRole).value(); + if(!networkId.isValid()) continue; - bool isActive = networkIdx.data(NetworkModel::ItemActiveRole).toBool(); -#ifdef SPUTDEV - if(isExpanded(networkIdx) != isActive) setExpanded(networkIdx, true); -#else - if(isExpanded(networkIdx) != isActive) setExpanded(networkIdx, isActive); -#endif + setExpandedState(networkIdx); } -} - -void BufferView::toggleHeader(bool checked) { - QAction *action = qobject_cast(sender()); - header()->setSectionHidden((action->property("column")).toInt(), !checked); + if(config()) { + // update selection to current one + Client::bufferModel()->synchronizeView(this); + } } -bool BufferView::checkRequirements(const QModelIndex &index, ItemActiveStates requiredActiveState) { - if(!index.isValid()) - return false; +void BufferView::storeExpandedState(const QModelIndex &networkIdx) { + NetworkId networkId = model()->data(networkIdx, NetworkModel::NetworkIdRole).value(); -// NetworkModel::itemTypes itemType = static_cast(index.data(NetworkModel::ItemTypeRole).toInt()); -// if(!(itemType & validItemTypes)) -// return false; + int oldState = 0; + if(isExpanded(networkIdx)) + oldState |= WasExpanded; + if(model()->data(networkIdx, NetworkModel::ItemActiveRole).toBool()) + oldState |= WasActive; - ItemActiveStates isActive = index.data(NetworkModel::ItemActiveRole).toBool() - ? ActiveState - : InactiveState; + _expandedState[networkId] = oldState; +} - if(!(isActive & requiredActiveState)) - return false; +void BufferView::setExpandedState(const QModelIndex &networkIdx) { + if(model()->data(networkIdx, NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType) + return; - return true; -} + if(model()->rowCount(networkIdx) == 0) + return; -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); + 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); } -} -void BufferView::addItemToMenu(QAction &action, QMenu &menu, bool condition) { - if(condition) { - menu.addAction(&action); - action.setVisible(true); - } else { - action.setVisible(false); + 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); -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); - } -} + // 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; -void BufferView::addSeparatorToMenu(QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) { - if(checkRequirements(index, requiredActiveState)) { - menu.addSeparator(); + for(int i = topLeft.row(); i <= bottomRight.row(); i++) { + QModelIndex networkIdx = topLeft.sibling(i, 0); + setExpandedState(networkIdx); } } -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::toggleHeader(bool checked) { + QAction *action = qobject_cast(sender()); + header()->setSectionHidden((action->property("column")).toInt(), !checked); } -//void BufferView::showContextMenu(const QPoint &pos) { void BufferView::contextMenuEvent(QContextMenuEvent *event) { QModelIndex index = indexAt(event->pos()); if(!index.isValid()) - return; + index = rootIndex(); - 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(index.isValid()) { + addActionsToMenu(&contextMenu, index); } - 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)); - } - } -#endif - return; - } + addFilterActions(&contextMenu, index); - if(result == &_joinBufferAction) { - BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value(); - Client::instance()->userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName())); - return; - } + if(!contextMenu.actions().isEmpty()) + contextMenu.exec(QCursor::pos()); +} - if(result == &_partBufferAction) { - BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value(); - Client::instance()->userInput(bufferInfo, QString("/PART %1").arg(bufferInfo.bufferName())); - return; - } - - if(result == &_hideBufferTemporarilyAction) { - removeSelectedBuffers(); - return; - } +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); - if(result == &_hideBufferPermanentlyAction) { - removeSelectedBuffers(true); - return; - } + GraphicalUi::contextMenuActionProvider()->addActions(contextMenu, indexList, 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()); +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); + } } - return; } +} +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)) + if(ItemViewSettings().mouseWheelChangesBuffer() == (bool)(event->modifiers() & Qt::AltModifier)) return QTreeView::wheelEvent(event); int rowDelta = ( event->delta() > 0 ) ? -1 : 1; @@ -530,13 +452,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(); @@ -551,6 +472,58 @@ 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 // ============================== @@ -563,15 +536,26 @@ BufferViewDock::BufferViewDock(BufferViewConfig *config, QWidget *parent) connect(config, SIGNAL(bufferViewNameSet(const QString &)), this, SLOT(bufferViewRenamed(const QString &))); } -BufferViewDock::BufferViewDock(QWidget *parent) - : QDockWidget(tr("All Buffers"), parent) -{ - setObjectName("BufferViewDock--1"); - toggleViewAction()->setData((int)-1); - setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea); -} - void BufferViewDock::bufferViewRenamed(const QString &newName) { setWindowTitle(newName); 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(); +}