X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=2de916b066da9c2e8f1b290ffc55808d1a4f4135;hp=0adf8ebb53338cdfb672bb9625ceeec7c2fb839f;hb=eba1be2f198709d25b9d2e1e48023dfadecd60db;hpb=613850196857c7e29b0ef5c09175aadb9492642d diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp index 0adf8ebb..2de916b0 100644 --- a/src/uisupport/bufferviewfilter.cpp +++ b/src/uisupport/bufferviewfilter.cpp @@ -20,10 +20,14 @@ #include "bufferviewfilter.h" -#include +#include +#include +#include +#include "bufferinfo.h" #include "buffermodel.h" #include "client.h" +#include "iconloader.h" #include "networkmodel.h" #include "uisettings.h" @@ -39,11 +43,15 @@ public: *****************************************/ BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *config) : QSortFilterProxyModel(model), - _config(0) + _config(0), + _sortOrder(Qt::AscendingOrder), + _userOfflineIcon(SmallIcon("user-offline")), + _userAwayIcon(SmallIcon("user-away")), + _userOnlineIcon(SmallIcon("user-online")) { setConfig(config); setSourceModel(model); - + setDynamicSortFilter(true); loadColors(); @@ -53,7 +61,7 @@ BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig * } 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(); @@ -64,12 +72,18 @@ void BufferViewFilter::loadColors() { void BufferViewFilter::setConfig(BufferViewConfig *config) { if(_config == config) return; - + if(_config) { disconnect(_config, 0, this, 0); } _config = config; + + if(!config) { + invalidate(); + return; + } + if(config->isInitialized()) { configInitialized(); } else { @@ -81,7 +95,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,6 +112,7 @@ void BufferViewFilter::configInitialized() { disconnect(config(), SIGNAL(initDone()), this, SLOT(configInitialized())); invalidate(); + emit configChanged(); } Qt::ItemFlags BufferViewFilter::flags(const QModelIndex &index) const { @@ -125,11 +140,17 @@ bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action if(droppedNetworkId == networkId) { if(row < 0) row = 0; + if(row < rowCount(parent)) { BufferId beforeBufferId = parent.child(row, 0).data(NetworkModel::BufferIdRole).value(); pos = config()->bufferList().indexOf(beforeBufferId); + if(_sortOrder == Qt::DescendingOrder) + pos++; } else { - pos = config()->bufferList().count(); + if(_sortOrder == Qt::AscendingOrder) + pos = config()->bufferList().count(); + else + pos = 0; } if(config()->bufferList().contains(bufferId)) { @@ -147,10 +168,15 @@ bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action return true; } +void BufferViewFilter::sort(int column, Qt::SortOrder order) { + _sortOrder = order; + QSortFilterProxyModel::sort(column, 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++) { @@ -158,7 +184,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; @@ -181,26 +207,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()) 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; } @@ -218,7 +246,7 @@ bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) cons 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; @@ -238,7 +266,7 @@ bool BufferViewFilter::lessThan(const QModelIndex &source_left, const QModelInde case NetworkModel::BufferItemType: return bufferLessThan(source_left, source_right); default: - return QSortFilterProxyModel::lessThan(source_left, source_right); + return QSortFilterProxyModel::lessThan(source_left, source_right); } } @@ -262,25 +290,47 @@ 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(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 { + 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; } @@ -293,10 +343,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(); } @@ -313,7 +363,7 @@ 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);