X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=f45d58a1a0a3304ede73a6915d6da81d1962f143;hp=4f095283d4f141eb44740f65d94653d48363a670;hb=ef48d209f03f02debf369ff689002f1b32165100;hpb=9996d2489e5e5ca23b0750f39f64d8d4b5990029 diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp index 4f095283..f45d58a1 100644 --- a/src/uisupport/bufferviewfilter.cpp +++ b/src/uisupport/bufferviewfilter.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 * @@ -31,8 +31,6 @@ #include "iconloader.h" #include "networkmodel.h" -#include "uisettings.h" - class CheckRemovalEvent : public QEvent { public: CheckRemovalEvent(const QModelIndex &source_index) : QEvent(QEvent::User), index(source_index) {}; @@ -46,34 +44,29 @@ BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig * : QSortFilterProxyModel(model), _config(0), _sortOrder(Qt::AscendingOrder), - _userOfflineIcon(SmallIcon("user-offline")), - _userAwayIcon(SmallIcon("user-away")), - _userOnlineIcon(SmallIcon("user-online")) + _userOfflineIcon(SmallIcon("im-user-offline")), + _userAwayIcon(SmallIcon("im-user-away")), + _userOnlineIcon(SmallIcon("im-user")), + _editMode(false), + _enableEditMode(tr("Edit Mode"), this) { setConfig(config); setSourceModel(model); setDynamicSortFilter(true); - loadColors(); - 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())); } -void BufferViewFilter::loadColors() { - UiSettings s("QtUiStyle/Colors"); - _FgColorInactiveActivity = s.value("inactiveActivityFG", QVariant(QColor(Qt::gray))).value(); - _FgColorNoActivity = s.value("noActivityFG", QVariant(QColor(Qt::black))).value(); - _FgColorHighlightActivity = s.value("highlightActivityFG", QVariant(QColor(Qt::magenta))).value(); - _FgColorNewMessageActivity = s.value("newMessageActivityFG", QVariant(QColor(Qt::green))).value(); - _FgColorOtherActivity = s.value("otherActivityFG", QVariant(QColor(Qt::darkGreen))).value(); -} - void BufferViewFilter::showUserStateIconsChanged() { BufferSettings bufferSettings; _showUserStateIcons = bufferSettings.showUserStateIcons(); @@ -91,6 +84,7 @@ void BufferViewFilter::setConfig(BufferViewConfig *config) { if(!config) { invalidate(); + setObjectName(""); return; } @@ -121,14 +115,64 @@ void BufferViewFilter::configInitialized() { disconnect(config(), SIGNAL(initDone()), this, SLOT(configInitialized())); + setObjectName(config()->bufferViewName()); + invalidate(); 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; } @@ -208,12 +252,12 @@ bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) if(!config()) return true; - BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value(); + BufferId bufferId = source_bufferIndex.data(NetworkModel::BufferIdRole).value(); Q_ASSERT(bufferId.isValid()); 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)... @@ -224,10 +268,13 @@ bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) return false; } - if(config()->networkId().isValid() && config()->networkId() != sourceModel()->data(source_bufferIndex, NetworkModel::NetworkIdRole).value()) + if(config()->networkId().isValid() && config()->networkId() != source_bufferIndex.data(NetworkModel::NetworkIdRole).value()) return false; - if(!(config()->allowedBufferTypes() & (BufferInfo::Type)source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt())) + int allowedBufferTypes = config()->allowedBufferTypes(); + if(!config()->networkId().isValid()) + allowedBufferTypes &= ~BufferInfo::StatusBuffer; + if(!(allowedBufferTypes & source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt())) return false; // the following dynamic filters may not trigger if the buffer is currently selected. @@ -250,7 +297,7 @@ bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) cons if(!config()->networkId().isValid()) { return true; } else { - return config()->networkId() == sourceModel()->data(source_index, NetworkModel::NetworkIdRole).value(); + return config()->networkId() == source_index.data(NetworkModel::NetworkIdRole).value(); } } @@ -269,7 +316,9 @@ bool BufferViewFilter::filterAcceptsRow(int source_row, const QModelIndex &sourc } bool BufferViewFilter::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const { - int itemType = sourceModel()->data(source_left, 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); @@ -281,17 +330,23 @@ bool BufferViewFilter::lessThan(const QModelIndex &source_left, const QModelInde } bool BufferViewFilter::bufferLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const { - BufferId leftBufferId = sourceModel()->data(source_left, NetworkModel::BufferIdRole).value(); - BufferId rightBufferId = sourceModel()->data(source_right, NetworkModel::BufferIdRole).value(); + 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); } bool BufferViewFilter::networkLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const { - NetworkId leftNetworkId = sourceModel()->data(source_left, NetworkModel::NetworkIdRole).value(); - NetworkId rightNetworkId = sourceModel()->data(source_right, NetworkModel::NetworkIdRole).value(); + NetworkId leftNetworkId = source_left.data(NetworkModel::NetworkIdRole).value(); + NetworkId rightNetworkId = source_right.data(NetworkModel::NetworkIdRole).value(); if(config() && config()->sortAlphabetically()) return QSortFilterProxyModel::lessThan(source_left, source_right); @@ -303,15 +358,15 @@ QVariant BufferViewFilter::data(const QModelIndex &index, int role) const { switch(role) { case Qt::DecorationRole: return icon(index); - case Qt::ForegroundRole: - return foreground(index); + case Qt::CheckStateRole: + return checkedState(index); default: return QSortFilterProxyModel::data(index, role); } } QVariant BufferViewFilter::icon(const QModelIndex &index) const { - if(!_showUserStateIcons) + if(!_showUserStateIcons || (config() && config()->disableDecoration())) return QVariant(); if(index.column() != 0) @@ -331,20 +386,64 @@ QVariant BufferViewFilter::icon(const QModelIndex &index) const { return QVariant(); } -QVariant BufferViewFilter::foreground(const QModelIndex &index) const { - BufferInfo::ActivityLevel activity = (BufferInfo::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt(); +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(activity & BufferInfo::Highlight) - return _FgColorHighlightActivity; - if(activity & BufferInfo::NewMessage) - return _FgColorNewMessageActivity; - if(activity & BufferInfo::OtherActivity) - return _FgColorOtherActivity; + if(_toTempRemove.contains(bufferId)) + return Qt::PartiallyChecked; - if(!index.data(NetworkModel::ItemActiveRole).toBool() || index.data(NetworkModel::UserAwayRole).toBool()) - return _FgColorInactiveActivity; + if(_toRemove.contains(bufferId)) + return Qt::Unchecked; - return _FgColorNoActivity; + 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) { @@ -369,10 +468,7 @@ void BufferViewFilter::checkItemsForRemoval(const QModelIndex &topLeft, const QM emit _dataChanged(source_topLeft, source_bottomRight); } -// ****************************** -// Helper -// ****************************** -bool bufferIdLessThan(const BufferId &left, const BufferId &right) { +bool BufferViewFilter::bufferIdLessThan(const BufferId &left, const BufferId &right) { Q_CHECK_PTR(Client::networkModel()); if(!Client::networkModel()) return true; @@ -380,12 +476,12 @@ bool bufferIdLessThan(const BufferId &left, const BufferId &right) { QModelIndex leftIndex = Client::networkModel()->bufferIndex(left); QModelIndex rightIndex = Client::networkModel()->bufferIndex(right); - int leftType = Client::networkModel()->data(leftIndex, NetworkModel::BufferTypeRole).toInt(); - int rightType = Client::networkModel()->data(rightIndex, NetworkModel::BufferTypeRole).toInt(); + int leftType = leftIndex.data(NetworkModel::BufferTypeRole).toInt(); + int rightType = rightIndex.data(NetworkModel::BufferTypeRole).toInt(); if(leftType != rightType) return leftType < rightType; else - return QString::compare(Client::networkModel()->data(leftIndex, Qt::DisplayRole).toString(), Client::networkModel()->data(rightIndex, Qt::DisplayRole).toString(), Qt::CaseInsensitive) < 0; + return QString::compare(leftIndex.data(Qt::DisplayRole).toString(), rightIndex.data(Qt::DisplayRole).toString(), Qt::CaseInsensitive) < 0; }