X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=0fe6426900714b77842dafb7d363d2ebf282cd79;hb=16923dbe3a43fc11e903639cc026063c38aaad37;hp=51f8b0e5d3ccb58ac7e05e9ade4fdc878b1c1d8f;hpb=1066294489c2469323a2813b63ae4653d148bbc7;p=quassel.git diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp index 51f8b0e5..0fe64269 100644 --- a/src/uisupport/bufferviewfilter.cpp +++ b/src/uisupport/bufferviewfilter.cpp @@ -20,12 +20,20 @@ #include "bufferviewfilter.h" +#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 *****************************************/ @@ -40,6 +48,9 @@ BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig * setDynamicSortFilter(true); loadColors(); + + connect(this, SIGNAL(_dataChanged(const QModelIndex &, const QModelIndex &)), + this, SLOT(_q_sourceDataChanged(QModelIndex,QModelIndex))); } void BufferViewFilter::loadColors() { @@ -60,19 +71,32 @@ 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->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())); + + disconnect(config(), SIGNAL(initDone()), this, SLOT(configInitialized())); + invalidate(); } @@ -123,7 +147,7 @@ bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action return true; } -void BufferViewFilter::addBuffer(const BufferId &bufferId) { +void BufferViewFilter::addBuffer(const BufferId &bufferId) const { if(!config() || config()->bufferList().contains(bufferId)) return; @@ -143,36 +167,34 @@ void BufferViewFilter::addBuffer(const BufferId &bufferId) { config()->requestAddBuffer(bufferId, pos); } -void BufferViewFilter::removeBuffer(const QModelIndex &index) { - if(!config()) - return; - - BufferId bufferId = data(index, NetworkModel::BufferIdRole).value(); - config()->requestRemoveBuffer(bufferId); -} - - bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const { BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value(); Q_ASSERT(bufferId.isValid()); - if(!_config) + if(!config()) return true; - + + int activityLevel = source_bufferIndex.data(NetworkModel::BufferActivityRole).toInt(); 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); + if(config()->bufferList().contains(bufferId)) + return true; + + if(config()->isInitialized() && !config()->removedBuffers().contains(bufferId) && activityLevel > Buffer::OtherActivity) + addBuffer(bufferId); + + return false; } bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) const { @@ -268,6 +290,28 @@ void BufferViewFilter::source_rowsInserted(const QModelIndex &parent, int start, } } +void BufferViewFilter::checkPreviousCurrentForRemoval(const QModelIndex ¤t, const QModelIndex &previous) { + Q_UNUSED(current); + if(previous.isValid()) + QCoreApplication::postEvent(this, new CheckRemovalEvent(previous)); +} + +void BufferViewFilter::customEvent(QEvent *event) { + if(event->type() != QEvent::User) + return; + + 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 // ******************************