{
setConfig(config);
setSourceModel(model);
- connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(source_rowsInserted(const QModelIndex &, int, int)));
setDynamicSortFilter(true);
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()));
}
bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const {
- BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value<BufferId>();
- Q_ASSERT(bufferId.isValid());
+ // no config -> "all buffers" -> accept everything
if(!config())
return true;
+ BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value<BufferId>();
+ Q_ASSERT(bufferId.isValid());
+
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<NetworkId>())
return false;
return false;
}
- if(config()->bufferList().contains(bufferId))
- return true;
-
- if(config()->isInitialized() && !config()->removedBuffers().contains(bufferId) && activityLevel > Buffer::OtherActivity)
- addBuffer(bufferId);
-
- return false;
+ return true;
}
bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) const {
return _FgColorNoActivity;
}
-void BufferViewFilter::source_rowsInserted(const QModelIndex &parent, int start, int end) {
- if(parent.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
- return;
-
- if(!config() || !config()->addNewBuffersAutomatically())
- return;
-
- QModelIndex child;
- for(int row = start; row <= end; row++) {
- child = sourceModel()->index(row, 0, parent);
- addBuffer(sourceModel()->data(child, NetworkModel::BufferIdRole).value<BufferId>());
- }
-}
-
void BufferViewFilter::checkPreviousCurrentForRemoval(const QModelIndex ¤t, const QModelIndex &previous) {
Q_UNUSED(current);
if(previous.isValid())