X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=bb67e506048a9f2edfcbd1339e1fe7266b7c2932;hp=04e315670b70d60d73de43d850b7767254ff1f6f;hb=73696998505c35c02bd019f78e9f502cbc36da5b;hpb=0f206dd896485276cf25025e562c812b8c7fc5da diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp index 04e31567..bb67e506 100644 --- a/src/uisupport/bufferviewfilter.cpp +++ b/src/uisupport/bufferviewfilter.cpp @@ -20,10 +20,15 @@ #include "bufferviewfilter.h" -#include +#include +#include +#include +#include "bufferinfo.h" #include "buffermodel.h" +#include "buffersettings.h" #include "client.h" +#include "iconloader.h" #include "networkmodel.h" #include "uisettings.h" @@ -40,21 +45,34 @@ public: BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *config) : QSortFilterProxyModel(model), _config(0), - _sortOrder(Qt::AscendingOrder) + _sortOrder(Qt::AscendingOrder), + _userOfflineIcon(SmallIcon("user-offline")), + _userAwayIcon(SmallIcon("user-away")), + _userOnlineIcon(SmallIcon("user-online")), + _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("QtUi/Colors"); + 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(); @@ -62,15 +80,27 @@ void BufferViewFilter::loadColors() { _FgColorOtherActivity = s.value("otherActivityFG", QVariant(QColor(Qt::darkGreen))).value(); } +void BufferViewFilter::showUserStateIconsChanged() { + BufferSettings bufferSettings; + _showUserStateIcons = bufferSettings.showUserStateIcons(); +} + void BufferViewFilter::setConfig(BufferViewConfig *config) { if(_config == config) return; - + if(_config) { disconnect(_config, 0, this, 0); } _config = config; + + if(!config) { + invalidate(); + setObjectName(""); + return; + } + if(config->isInitialized()) { configInitialized(); } else { @@ -82,7 +112,7 @@ void BufferViewFilter::setConfig(BufferViewConfig *config) { void BufferViewFilter::configInitialized() { if(!config()) return; - + connect(config(), SIGNAL(bufferViewNameSet(const QString &)), this, SLOT(invalidate())); connect(config(), SIGNAL(networkIdSet(const NetworkId &)), this, SLOT(invalidate())); connect(config(), SIGNAL(addNewBuffersAutomaticallySet(bool)), this, SLOT(invalidate())); @@ -98,13 +128,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; } @@ -162,7 +243,7 @@ void BufferViewFilter::sort(int column, Qt::SortOrder order) { void BufferViewFilter::addBuffer(const BufferId &bufferId) const { if(!config() || config()->bufferList().contains(bufferId)) return; - + int pos = config()->bufferList().count(); bool lt; for(int i = 0; i < config()->bufferList().count(); i++) { @@ -170,7 +251,7 @@ void BufferViewFilter::addBuffer(const BufferId &bufferId) const { lt = bufferIdLessThan(bufferId, config()->bufferList()[i]); else lt = bufferId < config()->bufferList()[i]; - + if(lt) { pos = i; break; @@ -184,35 +265,40 @@ 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)... - || (config()->temporarilyRemovedBuffers().contains(bufferId) && activityLevel > Buffer::OtherActivity))) { // or was just temporarily hidden and has a new message waiting for us. + || (config()->temporarilyRemovedBuffers().contains(bufferId) && activityLevel > BufferInfo::OtherActivity))) { // or was just temporarily hidden and has a new message waiting for us. addBuffer(bufferId); } // note: adding the buffer to the valid list does not temper with the following filters ("show only channels" and stuff) 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; - if(config()->hideInactiveBuffers() && !source_bufferIndex.data(NetworkModel::ItemActiveRole).toBool()) + // the following dynamic filters may not trigger if the buffer is currently selected. + if(bufferId == Client::bufferModel()->standardSelectionModel()->currentIndex().data(NetworkModel::BufferIdRole).value()) + return true; + + if(config()->hideInactiveBuffers() && !source_bufferIndex.data(NetworkModel::ItemActiveRole).toBool() && activityLevel <= BufferInfo::OtherActivity) return false; - if(config()->minimumActivity() > activityLevel) { - if(bufferId != Client::bufferModel()->standardSelectionModel()->currentIndex().data(NetworkModel::BufferIdRole).value()) - return false; - } + if(config()->minimumActivity() > activityLevel) + return false; return true; } @@ -224,13 +310,13 @@ 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(); } } bool BufferViewFilter::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const { QModelIndex child = sourceModel()->index(source_row, 0, source_parent); - + if(!child.isValid()) { qWarning() << "filterAcceptsRow has been called with an invalid Child"; return false; @@ -243,29 +329,37 @@ 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); case NetworkModel::BufferItemType: return bufferLessThan(source_left, source_right); default: - return QSortFilterProxyModel::lessThan(source_left, source_right); + return QSortFilterProxyModel::lessThan(source_left, source_right); } } 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); @@ -274,28 +368,118 @@ bool BufferViewFilter::networkLessThan(const QModelIndex &source_left, const QMo } QVariant BufferViewFilter::data(const QModelIndex &index, int role) const { - if(role == Qt::ForegroundRole) + switch(role) { + case Qt::DecorationRole: + return icon(index); + case Qt::ForegroundRole: return foreground(index); - else + case Qt::CheckStateRole: + return checkedState(index); + default: return QSortFilterProxyModel::data(index, role); + } } -QVariant BufferViewFilter::foreground(const QModelIndex &index) const { +QVariant BufferViewFilter::icon(const QModelIndex &index) const { + if(!_showUserStateIcons || (config() && config()->disableDecoration())) + return QVariant(); + + if(index.column() != 0) + return QVariant(); + + if(index.data(NetworkModel::BufferTypeRole).toInt() != BufferInfo::QueryBuffer) + return QVariant(); + if(!index.data(NetworkModel::ItemActiveRole).toBool()) - return _FgColorInactiveActivity; + return _userOfflineIcon; + + if(index.data(NetworkModel::UserAwayRole).toBool()) + return _userAwayIcon; + else + return _userOnlineIcon; + + return QVariant(); +} + +QVariant BufferViewFilter::foreground(const QModelIndex &index) const { + if(config() && config()->disableDecoration()) + return _FgColorNoActivity; - Buffer::ActivityLevel activity = (Buffer::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt(); + BufferInfo::ActivityLevel activity = (BufferInfo::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt(); - if(activity & Buffer::Highlight) + if(activity & BufferInfo::Highlight) return _FgColorHighlightActivity; - if(activity & Buffer::NewMessage) + if(activity & BufferInfo::NewMessage) return _FgColorNewMessageActivity; - if(activity & Buffer::OtherActivity) + if(activity & BufferInfo::OtherActivity) return _FgColorOtherActivity; + if(!index.data(NetworkModel::ItemActiveRole).toBool() || index.data(NetworkModel::UserAwayRole).toBool()) + return _FgColorInactiveActivity; + 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()) @@ -305,10 +489,10 @@ void BufferViewFilter::checkPreviousCurrentForRemoval(const QModelIndex ¤t void BufferViewFilter::customEvent(QEvent *event) { if(event->type() != QEvent::User) return; - + CheckRemovalEvent *removalEvent = static_cast(event); checkItemForRemoval(removalEvent->index); - + event->accept(); } @@ -318,23 +502,20 @@ 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; - + 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; }