X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=6b81c38f49648ac0ef9683d9a6de0e12803e3afc;hp=51f8b0e5d3ccb58ac7e05e9ade4fdc878b1c1d8f;hb=4a174a228d64ab906a0944f3de3dfe4324d058ff;hpb=1066294489c2469323a2813b63ae4653d148bbc7 diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp index 51f8b0e5..6b81c38f 100644 --- a/src/uisupport/bufferviewfilter.cpp +++ b/src/uisupport/bufferviewfilter.cpp @@ -20,26 +20,39 @@ #include "bufferviewfilter.h" +#include +#include +#include + #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); - connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(source_rowsInserted(const QModelIndex &, int, int))); setDynamicSortFilter(true); loadColors(); + + connect(this, SIGNAL(_dataChanged(const QModelIndex &, const QModelIndex &)), + this, SLOT(_q_sourceDataChanged(QModelIndex,QModelIndex))); } void BufferViewFilter::loadColors() { @@ -60,25 +73,46 @@ void BufferViewFilter::setConfig(BufferViewConfig *config) { } _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; } @@ -101,11 +135,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)) { @@ -123,7 +163,12 @@ bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action return true; } -void BufferViewFilter::addBuffer(const BufferId &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; @@ -143,36 +188,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; -bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const { BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value(); Q_ASSERT(bufferId.isValid()); - if(!_config) - return true; + + 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 > Buffer::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())) + if(!(config()->allowedBufferTypes() & (BufferInfo::Type)source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt())) return false; - if(_config->hideInactiveBuffers() && !source_bufferIndex.data(NetworkModel::ItemActiveRole).toBool()) + if(config()->hideInactiveBuffers() && !source_bufferIndex.data(NetworkModel::ItemActiveRole).toBool()) return false; - if(_config->minimumActivity() > source_bufferIndex.data(NetworkModel::BufferActivityRole).toInt()) { + if(config()->minimumActivity() > activityLevel) { if(bufferId != Client::bufferModel()->standardSelectionModel()->currentIndex().data(NetworkModel::BufferIdRole).value()) return false; } - return _config->bufferList().contains(bufferId); + return true; } bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) const { @@ -232,10 +283,21 @@ 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 { @@ -254,18 +316,26 @@ QVariant BufferViewFilter::foreground(const QModelIndex &index) const { return _FgColorNoActivity; } -void BufferViewFilter::source_rowsInserted(const QModelIndex &parent, int start, int end) { - if(parent.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType) - return; +void BufferViewFilter::checkPreviousCurrentForRemoval(const QModelIndex ¤t, const QModelIndex &previous) { + Q_UNUSED(current); + if(previous.isValid()) + QCoreApplication::postEvent(this, new CheckRemovalEvent(previous)); +} - if(!config() || !config()->addNewBuffersAutomatically()) +void BufferViewFilter::customEvent(QEvent *event) { + if(event->type() != QEvent::User) return; + + CheckRemovalEvent *removalEvent = static_cast(event); + checkItemForRemoval(removalEvent->index); + + event->accept(); +} - QModelIndex child; - for(int row = start; row <= end; row++) { - child = sourceModel()->index(row, 0, parent); - addBuffer(sourceModel()->data(child, NetworkModel::BufferIdRole).value()); - } +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); } // ******************************