From 09fea00d02da49748b6a040752759eab16ccd392 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Thu, 1 Jan 2009 20:41:25 +0100 Subject: [PATCH] Introducing an edit mode to the bufferviews. Switch to edit mode via context menu. You'll now see all available buffers for that view. A tristate checkbox indicates if the buffer is not in the view (unchecked), is only temporarily removed (partially checked), or visible (checked). --- src/uisupport/bufferview.cpp | 74 ++++++++++++++-- src/uisupport/bufferview.h | 15 ++++ src/uisupport/bufferviewfilter.cpp | 136 +++++++++++++++++++++++++++-- src/uisupport/bufferviewfilter.h | 14 +++ 4 files changed, 225 insertions(+), 14 deletions(-) diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index c8834341..7c4e6c5e 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -18,6 +18,9 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include "bufferview.h" + +#include #include #include #include @@ -26,8 +29,6 @@ #include #include -#include "bufferview.h" - #include "action.h" #include "buffermodel.h" #include "bufferviewfilter.h" @@ -42,23 +43,64 @@ #include "quasselui.h" #include "uisettings.h" +bool TristateDelegate::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; +} + + + + /***************************************** * 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) { +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); + + QAbstractItemDelegate *oldDelegate = itemDelegate(); + TristateDelegate *tristateDelegate = new TristateDelegate(this); + setItemDelegate(tristateDelegate); + delete oldDelegate; } void BufferView::init() { - setIndentation(10); header()->setContextMenuPolicy(Qt::ActionsContextMenu); hideColumn(1); hideColumn(2); + setIndentation(5); expandAll(); setAnimated(true); @@ -345,20 +387,36 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) { QModelIndex index = indexAt(event->pos()); if(!index.isValid()) index = rootIndex(); - if(!index.isValid()) - return; QMenu contextMenu(this); - addActionsToMenu(&contextMenu, index); + + if(index.isValid()) { + addActionsToMenu(&contextMenu, index); + } + + addFilterActions(&contextMenu, index); + if(!contextMenu.actions().isEmpty()) contextMenu.exec(QCursor::pos()); - } void BufferView::addActionsToMenu(QMenu *contextMenu, const QModelIndex &index) { Client::mainUi()->actionProvider()->addActions(contextMenu, index, 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); + } + } + } +} + void BufferView::menuActionTriggered(QAction *result) { NetworkModelActionProvider::ActionType type = (NetworkModelActionProvider::ActionType)result->data().toInt(); switch(type) { diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h index 032cd0fe..6bbca4ef 100644 --- a/src/uisupport/bufferview.h +++ b/src/uisupport/bufferview.h @@ -51,6 +51,7 @@ public: inline BufferViewConfig *config() { return _config; } void addActionsToMenu(QMenu *menu, const QModelIndex &index); + void addFilterActions(QMenu *contextMenu, const QModelIndex &index); public slots: void setRootIndexForNetworkId(const NetworkId &networkId); @@ -86,6 +87,20 @@ private: void storeExpandedState(NetworkId networkId, bool expanded); }; +// ****************************** +// TristateDelgate +// ****************************** +#include + +class TristateDelegate : public QStyledItemDelegate { + Q_OBJECT + +public: + TristateDelegate(QObject *parent = 0) : QStyledItemDelegate(parent) {} + bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index); +}; + + // ============================== // BufferView Dock // ============================== diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp index 060150a4..7c85dfd8 100644 --- a/src/uisupport/bufferviewfilter.cpp +++ b/src/uisupport/bufferviewfilter.cpp @@ -48,7 +48,9 @@ BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig * _sortOrder(Qt::AscendingOrder), _userOfflineIcon(SmallIcon("user-offline")), _userAwayIcon(SmallIcon("user-away")), - _userOnlineIcon(SmallIcon("user-online")) + _userOnlineIcon(SmallIcon("user-online")), + _editMode(false), + _enableEditMode(tr("Edit Mode"), this) { setConfig(config); setSourceModel(model); @@ -60,6 +62,10 @@ BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig * connect(this, SIGNAL(_dataChanged(const QModelIndex &, const QModelIndex &)), this, SLOT(_q_sourceDataChanged(QModelIndex,QModelIndex))); + _enableEditMode.setCheckable(true); + _enableEditMode.setChecked(_editMode); + connect(&_enableEditMode, SIGNAL(toggled(bool)), this, SLOT(enableEditMode(bool))); + BufferSettings bufferSettings; _showUserStateIcons = bufferSettings.showUserStateIcons(); bufferSettings.notify("ShowUserStateIcons", this, SLOT(showUserStateIconsChanged())); @@ -125,10 +131,58 @@ void BufferViewFilter::configInitialized() { emit configChanged(); } +QList BufferViewFilter::actions(const QModelIndex &index) { + Q_UNUSED(index) + QList actionList; + actionList << &_enableEditMode; + return actionList; +} + +void BufferViewFilter::enableEditMode(bool enable) { + if(_editMode == enable) { + return; + } + _editMode = enable; + + if(!config()) + return; + + if(enable == false) { + int numBuffers = config()->bufferList().count(); + QSet::const_iterator iter; + for(iter = _toAdd.constBegin(); iter != _toAdd.constEnd(); iter++) { + if(config()->bufferList().contains(*iter)) + continue; + config()->requestAddBuffer(*iter, numBuffers); + } + for(iter = _toTempRemove.constBegin(); iter != _toTempRemove.constEnd(); iter++) { + if(config()->temporarilyRemovedBuffers().contains(*iter)) + continue; + config()->requestRemoveBuffer(*iter); + } + for(iter = _toRemove.constBegin(); iter != _toRemove.constEnd(); iter++) { + if(config()->removedBuffers().contains(*iter)) + continue; + config()->requestRemoveBufferPermanently(*iter); + } + } + _toAdd.clear(); + _toTempRemove.clear(); + _toRemove.clear(); + + invalidate(); +} + + Qt::ItemFlags BufferViewFilter::flags(const QModelIndex &index) const { Qt::ItemFlags flags = mapToSource(index).flags(); - if(_config && (index == QModelIndex() || index.parent() == QModelIndex())) - flags |= Qt::ItemIsDropEnabled; + if(_config) { + if(index == QModelIndex() || index.parent() == QModelIndex()) { + flags |= Qt::ItemIsDropEnabled; + } else if(_editMode) { + flags |= Qt::ItemIsUserCheckable | Qt::ItemIsTristate; + } + } return flags; } @@ -213,7 +267,7 @@ bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) int activityLevel = source_bufferIndex.data(NetworkModel::BufferActivityRole).toInt(); - if(!config()->bufferList().contains(bufferId)) { + if(!config()->bufferList().contains(bufferId) && !_editMode) { // add the buffer if... if(config()->isInitialized() && !config()->removedBuffers().contains(bufferId) // it hasn't been manually removed and either && ((config()->addNewBuffersAutomatically() && !config()->temporarilyRemovedBuffers().contains(bufferId)) // is totally unknown to us (a new buffer)... @@ -269,7 +323,9 @@ bool BufferViewFilter::filterAcceptsRow(int source_row, const QModelIndex &sourc } bool BufferViewFilter::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const { - int itemType = source_left.data(NetworkModel::ItemTypeRole).toInt(); + int leftItemType = source_left.data(NetworkModel::ItemTypeRole).toInt(); + int rightItemType = source_right.data(NetworkModel::ItemTypeRole).toInt(); + int itemType = leftItemType & rightItemType; switch(itemType) { case NetworkModel::NetworkItemType: return networkLessThan(source_left, source_right); @@ -284,7 +340,13 @@ bool BufferViewFilter::bufferLessThan(const QModelIndex &source_left, const QMod BufferId leftBufferId = source_left.data(NetworkModel::BufferIdRole).value(); BufferId rightBufferId = source_right.data(NetworkModel::BufferIdRole).value(); if(config()) { - return config()->bufferList().indexOf(leftBufferId) < config()->bufferList().indexOf(rightBufferId); + int leftPos = config()->bufferList().indexOf(leftBufferId); + int rightPos = config()->bufferList().indexOf(rightBufferId); + if(leftPos == -1 && rightPos == -1) + return QSortFilterProxyModel::lessThan(source_left, source_right); + if(leftPos == -1 || rightPos == -1) + return !(leftPos < rightPos); + return leftPos < rightPos; } else return bufferIdLessThan(leftBufferId, rightBufferId); } @@ -305,6 +367,8 @@ QVariant BufferViewFilter::data(const QModelIndex &index, int role) const { return icon(index); case Qt::ForegroundRole: return foreground(index); + case Qt::CheckStateRole: + return checkedState(index); default: return QSortFilterProxyModel::data(index, role); } @@ -350,6 +414,66 @@ QVariant BufferViewFilter::foreground(const QModelIndex &index) const { return _FgColorNoActivity; } +QVariant BufferViewFilter::checkedState(const QModelIndex &index) const { + if(!_editMode || !config()) + return QVariant(); + + BufferId bufferId = index.data(NetworkModel::BufferIdRole).value(); + if(_toAdd.contains(bufferId)) + return Qt::Checked; + + if(_toTempRemove.contains(bufferId)) + return Qt::PartiallyChecked; + + if(_toRemove.contains(bufferId)) + return Qt::Unchecked; + + if(config()->bufferList().contains(bufferId)) + return Qt::Checked; + + if(config()->temporarilyRemovedBuffers().contains(bufferId)) + return Qt::PartiallyChecked; + + return Qt::Unchecked; +} + +bool BufferViewFilter::setData(const QModelIndex &index, const QVariant &value, int role) { + switch(role) { + case Qt::CheckStateRole: + return setCheckedState(index, Qt::CheckState(value.toInt())); + default: + return QSortFilterProxyModel::setData(index, value, role); + } +} + +bool BufferViewFilter::setCheckedState(const QModelIndex &index, Qt::CheckState state) { + BufferId bufferId = index.data(NetworkModel::BufferIdRole).value(); + if(!bufferId.isValid()) + return false; + + switch(state) { + case Qt::Unchecked: + _toAdd.remove(bufferId); + _toTempRemove.remove(bufferId); + _toRemove << bufferId; + break; + case Qt::PartiallyChecked: + _toAdd.remove(bufferId); + _toTempRemove << bufferId; + _toRemove.remove(bufferId); + break; + case Qt::Checked: + _toAdd << bufferId; + _toTempRemove.remove(bufferId); + _toRemove.remove(bufferId); + break; + default: + return false; + } + emit dataChanged(index, index); + return true; +} + void BufferViewFilter::checkPreviousCurrentForRemoval(const QModelIndex ¤t, const QModelIndex &previous) { Q_UNUSED(current); if(previous.isValid()) diff --git a/src/uisupport/bufferviewfilter.h b/src/uisupport/bufferviewfilter.h index 813e5548..b4bcb7be 100644 --- a/src/uisupport/bufferviewfilter.h +++ b/src/uisupport/bufferviewfilter.h @@ -21,6 +21,7 @@ #ifndef BUFFERVIEWFILTER_H_ #define BUFFERVIEWFILTER_H_ +#include #include #include #include @@ -59,12 +60,18 @@ public: QVariant data(const QModelIndex &index, int role) const; QVariant icon(const QModelIndex &index) const; QVariant foreground(const QModelIndex &index) const; + QVariant checkedState(const QModelIndex &index) const; + + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); + bool setCheckedState(const QModelIndex &index, Qt::CheckState state); void setConfig(BufferViewConfig *config); inline BufferViewConfig *config() const { return _config; } virtual void sort(int column, Qt::SortOrder order = Qt::AscendingOrder); + QList actions(const QModelIndex &index); + public slots: void checkPreviousCurrentForRemoval(const QModelIndex ¤t, const QModelIndex &previous); void checkItemForRemoval(const QModelIndex &index) { checkItemsForRemoval(index, index); } @@ -84,6 +91,7 @@ signals: private slots: void configInitialized(); void showUserStateIconsChanged(); + void enableEditMode(bool enable); private: QPointer _config; @@ -100,6 +108,12 @@ private: QPixmap _userOnlineIcon; bool _showUserStateIcons; + bool _editMode; + QAction _enableEditMode; + QSet _toAdd; + QSet _toTempRemove; + QSet _toRemove; + void loadColors(); bool filterAcceptBuffer(const QModelIndex &) const; -- 2.20.1