X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=aaa21840c6d71fd75d9132d02aed4c452dc45ff3;hp=0fa57cd7cfadddbb88ecf8b65cceda6b3a1c05d4;hb=731ec69d4608ba95e3ae4f154b8ca1852e1db2e5;hpb=43f0f050e5d91f86fc51c644f6343b45b4628a64 diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp index 0fa57cd7..aaa21840 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,28 @@ 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")) { setConfig(config); setSourceModel(model); - + setDynamicSortFilter(true); loadColors(); connect(this, SIGNAL(_dataChanged(const QModelIndex &, const QModelIndex &)), this, SLOT(_q_sourceDataChanged(QModelIndex,QModelIndex))); + + 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,10 +74,15 @@ 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); } @@ -88,7 +105,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())); @@ -105,6 +122,7 @@ void BufferViewFilter::configInitialized() { disconnect(config(), SIGNAL(initDone()), this, SLOT(configInitialized())); invalidate(); + emit configChanged(); } Qt::ItemFlags BufferViewFilter::flags(const QModelIndex &index) const { @@ -168,7 +186,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++) { @@ -176,7 +194,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; @@ -190,7 +208,7 @@ 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(); @@ -199,26 +217,28 @@ bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) // 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())) 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; } @@ -230,13 +250,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; @@ -249,20 +269,20 @@ 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 itemType = source_left.data(NetworkModel::ItemTypeRole).toInt(); 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); } else @@ -270,8 +290,8 @@ bool BufferViewFilter::bufferLessThan(const QModelIndex &source_left, const QMod } 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); @@ -280,25 +300,53 @@ 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 + 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; - Buffer::ActivityLevel activity = (Buffer::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt(); + return QVariant(); +} - if(activity & Buffer::Highlight) +QVariant BufferViewFilter::foreground(const QModelIndex &index) const { + if(config() && config()->disableDecoration()) + return _FgColorNoActivity; + + BufferInfo::ActivityLevel activity = (BufferInfo::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt(); + + 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; } @@ -311,10 +359,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(); } @@ -331,16 +379,16 @@ bool 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; }