X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=5727d348fbee58ccebc63652a083c9ffe9dc0c6f;hp=896bd116a021975566ce266ec86dec117b753ec0;hb=da1ad61b4d3f7b21d34a3a22e8408eb593d2b0a8;hpb=f2e4609f070221a010eef8be98524c5ce88d228b diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp index 896bd116..5727d348 100644 --- a/src/uisupport/bufferviewfilter.cpp +++ b/src/uisupport/bufferviewfilter.cpp @@ -20,54 +20,100 @@ #include "bufferviewfilter.h" -#include +#include +#include +#include +#include "bufferinfo.h" +#include "buffermodel.h" #include "client.h" #include "networkmodel.h" #include "uisettings.h" +class CheckRemovalEvent : public QEvent { +public: + CheckRemovalEvent(const QModelIndex &source_index) : QEvent(QEvent::User), index(source_index) {}; + QPersistentModelIndex index; +}; + /***************************************** * The Filter for the Tree View *****************************************/ BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *config) : QSortFilterProxyModel(model), - _config(0) + _config(0), + _sortOrder(Qt::AscendingOrder) { setConfig(config); setSourceModel(model); - // setSortCaseSensitivity(Qt::CaseInsensitive); + setDynamicSortFilter(true); + + loadColors(); + + connect(this, SIGNAL(_dataChanged(const QModelIndex &, const QModelIndex &)), + this, SLOT(_q_sourceDataChanged(QModelIndex,QModelIndex))); +} + +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::setConfig(BufferViewConfig *config) { if(_config == config) return; - + if(_config) { disconnect(_config, 0, this, 0); } _config = config; - if(config) { - 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())); - connect(config, SIGNAL(sortAlphabeticallySet(bool)), this, SLOT(invalidate())); - connect(config, SIGNAL(hideInactiveBuffersSet(bool)), this, SLOT(invalidate())); - connect(config, SIGNAL(allowedBufferTypesSet(int)), this, SLOT(invalidate())); - connect(config, SIGNAL(minimumActivitySet(int)), this, SLOT(invalidate())); - connect(config, SIGNAL(bufferListSet()), this, SLOT(invalidate())); - connect(config, SIGNAL(bufferAdded(const BufferId &, int)), this, SLOT(invalidate())); - connect(config, SIGNAL(bufferMoved(const BufferId &, int)), this, SLOT(invalidate())); - connect(config, SIGNAL(bufferRemoved(const BufferId &)), this, SLOT(invalidate())); + + if(!config) { + invalidate(); + return; + } + + if(config->isInitialized()) { + configInitialized(); + } else { + connect(config, SIGNAL(initDone()), this, SLOT(configInitialized())); + invalidate(); } +} + +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())); + connect(config(), SIGNAL(sortAlphabeticallySet(bool)), this, SLOT(invalidate())); + connect(config(), SIGNAL(hideInactiveBuffersSet(bool)), this, SLOT(invalidate())); + connect(config(), SIGNAL(allowedBufferTypesSet(int)), this, SLOT(invalidate())); + connect(config(), SIGNAL(minimumActivitySet(int)), this, SLOT(invalidate())); + connect(config(), SIGNAL(bufferListSet()), this, SLOT(invalidate())); + connect(config(), SIGNAL(bufferAdded(const BufferId &, int)), this, SLOT(invalidate())); + connect(config(), SIGNAL(bufferMoved(const BufferId &, int)), this, SLOT(invalidate())); + connect(config(), SIGNAL(bufferRemoved(const BufferId &)), this, SLOT(invalidate())); + connect(config(), SIGNAL(bufferPermanentlyRemoved(const BufferId &)), this, SLOT(invalidate())); + + disconnect(config(), SIGNAL(initDone()), this, SLOT(configInitialized())); + invalidate(); + emit configChanged(); } Qt::ItemFlags BufferViewFilter::flags(const QModelIndex &index) const { Qt::ItemFlags flags = mapToSource(index).flags(); - if(_config && index == QModelIndex() || index.parent() == QModelIndex()) + if(_config && (index == QModelIndex() || index.parent() == QModelIndex())) flags |= Qt::ItemIsDropEnabled; return flags; } @@ -88,11 +134,19 @@ bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action networkId = bufferList[i].first; bufferId = bufferList[i].second; 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)) { @@ -110,10 +164,15 @@ bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action return true; } -void BufferViewFilter::addBuffer(const BufferId &bufferId) { - if(config()->bufferList().contains(bufferId)) +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++) { @@ -121,7 +180,7 @@ void BufferViewFilter::addBuffer(const BufferId &bufferId) { lt = bufferIdLessThan(bufferId, config()->bufferList()[i]); else lt = bufferId < config()->bufferList()[i]; - + if(lt) { pos = i; break; @@ -130,30 +189,42 @@ void BufferViewFilter::addBuffer(const BufferId &bufferId) { config()->requestAddBuffer(bufferId, pos); } -void BufferViewFilter::removeBuffer(const QModelIndex &index) { +bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const { + // no config -> "all buffers" -> accept everything if(!config()) - return; - - BufferId bufferId = data(index, NetworkModel::BufferIdRole).value(); - config()->requestRemoveBuffer(bufferId); -} + return true; + BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value(); + Q_ASSERT(bufferId.isValid()); -bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const { - if(!_config) - return true; - - if(!(_config->allowedBufferTypes() & (BufferInfo::Type)source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt())) + int activityLevel = source_bufferIndex.data(NetworkModel::BufferActivityRole).toInt(); + + if(!config()->bufferList().contains(bufferId)) { + // 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 > 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->hideInactiveBuffers() && !source_bufferIndex.data(NetworkModel::ItemActiveRole).toBool()) + if(config()->networkId().isValid() && config()->networkId() != sourceModel()->data(source_bufferIndex, NetworkModel::NetworkIdRole).value()) return false; - if(_config->minimumActivity() > source_bufferIndex.data(NetworkModel::BufferActivityRole).toInt()) + if(!(config()->allowedBufferTypes() & (BufferInfo::Type)source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt())) return false; - BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value(); - return _config->bufferList().contains(bufferId); + 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; + } + + return true; } bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) const { @@ -169,13 +240,13 @@ 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; } - if(source_parent == QModelIndex()) + if(!source_parent.isValid()) return filterAcceptNetwork(child); else return filterAcceptBuffer(child); @@ -189,7 +260,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); } } @@ -199,7 +270,7 @@ bool BufferViewFilter::bufferLessThan(const QModelIndex &source_left, const QMod if(config()) { return config()->bufferList().indexOf(leftBufferId) < config()->bufferList().indexOf(rightBufferId); } else - return leftBufferId < rightBufferId; + return bufferIdLessThan(leftBufferId, rightBufferId); } bool BufferViewFilter::networkLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const { @@ -213,36 +284,60 @@ 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::ForegroundRole: return foreground(index); - else + case Qt::BackgroundRole: + if(index.data(NetworkModel::UserAwayRole).toBool()) { + QLinearGradient gradient(0, 0, 0, 18); + gradient.setColorAt(0.4, QApplication::palette().color(QPalette::Normal, QPalette::Base)); + gradient.setColorAt(0.5, QApplication::palette().color(QPalette::Disabled, QPalette::Base)); + gradient.setColorAt(0.6, QApplication::palette().color(QPalette::Normal, QPalette::Base)); + return QBrush(gradient); + } + // else: fallthrough to default + default: return QSortFilterProxyModel::data(index, role); + } } QVariant BufferViewFilter::foreground(const QModelIndex &index) const { - UiSettings s("QtUi/Colors"); - QVariant inactiveActivity = s.value("inactiveActivityFG", QVariant(QColor(Qt::gray))); - QVariant noActivity = s.value("noActivityFG", QVariant(QColor(Qt::black))); - QVariant highlightActivity = s.value("highlightActivityFG", QVariant(QColor(Qt::magenta))); - QVariant newMessageActivity = s.value("newMessageActivityFG", QVariant(QColor(Qt::green))); - QVariant otherActivity = s.value("otherActivityFG", QVariant(QColor(Qt::darkGreen))); + BufferInfo::ActivityLevel activity = (BufferInfo::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt(); + + if(activity & BufferInfo::Highlight) + return _FgColorHighlightActivity; + if(activity & BufferInfo::NewMessage) + return _FgColorNewMessageActivity; + if(activity & BufferInfo::OtherActivity) + return _FgColorOtherActivity; if(!index.data(NetworkModel::ItemActiveRole).toBool()) - return inactiveActivity; + return _FgColorInactiveActivity; - Buffer::ActivityLevel activity = (Buffer::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt(); + return _FgColorNoActivity; +} + +void BufferViewFilter::checkPreviousCurrentForRemoval(const QModelIndex ¤t, const QModelIndex &previous) { + Q_UNUSED(current); + if(previous.isValid()) + QCoreApplication::postEvent(this, new CheckRemovalEvent(previous)); +} - if(activity & Buffer::Highlight) - return highlightActivity; - if(activity & Buffer::NewMessage) - return newMessageActivity; - if(activity & Buffer::OtherActivity) - return otherActivity; +void BufferViewFilter::customEvent(QEvent *event) { + if(event->type() != QEvent::User) + return; - return noActivity; + CheckRemovalEvent *removalEvent = static_cast(event); + checkItemForRemoval(removalEvent->index); + event->accept(); } +void BufferViewFilter::checkItemsForRemoval(const QModelIndex &topLeft, const QModelIndex &bottomRight) { + QModelIndex source_topLeft = mapToSource(topLeft); + QModelIndex source_bottomRight = mapToSource(bottomRight); + emit _dataChanged(source_topLeft, source_bottomRight); +} // ****************************** // Helper @@ -251,7 +346,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); @@ -261,6 +356,6 @@ bool bufferIdLessThan(const BufferId &left, const BufferId &right) { if(leftType != rightType) return leftType < rightType; else - return Client::networkModel()->data(leftIndex, Qt::DisplayRole).toString() < Client::networkModel()->data(rightIndex, Qt::DisplayRole).toString(); + return QString::compare(Client::networkModel()->data(leftIndex, Qt::DisplayRole).toString(), Client::networkModel()->data(rightIndex, Qt::DisplayRole).toString(), Qt::CaseInsensitive) < 0; }