emit bufferListSet();
}
-QVariantList BufferViewConfig::initRemovedBuffersList() const {
+QVariantList BufferViewConfig::initRemovedBuffers() const {
QVariantList removedBuffers;
foreach(BufferId bufferId, _removedBuffers) {
return removedBuffers;
}
-void BufferViewConfig::initSetRemovedBuffersList(const QVariantList &buffers) {
+void BufferViewConfig::initSetRemovedBuffers(const QVariantList &buffers) {
_removedBuffers.clear();
foreach(QVariant buffer, buffers) {
}
}
+QVariantList BufferViewConfig::initTemporarilyRemovedBuffers() const {
+ QVariantList temporarilyRemovedBuffers;
+
+ foreach(BufferId bufferId, _temporarilyRemovedBuffers) {
+ temporarilyRemovedBuffers << qVariantFromValue(bufferId);
+ }
+
+ return temporarilyRemovedBuffers;
+}
+
+void BufferViewConfig::initSetTemporarilyRemovedBuffers(const QVariantList &buffers) {
+ _temporarilyRemovedBuffers.clear();
+
+ foreach(QVariant buffer, buffers) {
+ _temporarilyRemovedBuffers << buffer.value<BufferId>();
+ }
+}
+
void BufferViewConfig::addBuffer(const BufferId &bufferId, int pos) {
if(_buffers.contains(bufferId))
return;
if(_removedBuffers.contains(bufferId))
_removedBuffers.remove(bufferId);
+ if(_temporarilyRemovedBuffers.contains(bufferId))
+ _temporarilyRemovedBuffers.remove(bufferId);
+
_buffers.insert(pos, bufferId);
emit bufferAdded(bufferId, pos);
}
}
void BufferViewConfig::removeBuffer(const BufferId &bufferId) {
- if(!_buffers.contains(bufferId))
- return;
+ if(_buffers.contains(bufferId))
+ _buffers.removeAt(_buffers.indexOf(bufferId));
- _buffers.removeAt(_buffers.indexOf(bufferId));
+ if(_removedBuffers.contains(bufferId))
+ _removedBuffers.remove(bufferId);
+
+ _temporarilyRemovedBuffers << bufferId;
+
emit bufferRemoved(bufferId);
}
void BufferViewConfig::removeBufferPermanently(const BufferId &bufferId) {
if(_buffers.contains(bufferId))
_buffers.removeAt(_buffers.indexOf(bufferId));
+
+ if(_temporarilyRemovedBuffers.contains(bufferId))
+ _temporarilyRemovedBuffers.remove(bufferId);
_removedBuffers << bufferId;
const QList<BufferId> &bufferList() const { return _buffers; }
const QSet<BufferId> &removedBuffers() const { return _removedBuffers; }
+ const QSet<BufferId> &temporarilyRemovedBuffers() const { return _temporarilyRemovedBuffers; }
QVariantList initBufferList() const;
void initSetBufferList(const QVariantList &buffers);
void initSetBufferList(const QList<BufferId> &buffers);
- QVariantList initRemovedBuffersList() const;
- void initSetRemovedBuffersList(const QVariantList &buffers);
+ QVariantList initRemovedBuffers() const;
+ void initSetRemovedBuffers(const QVariantList &buffers);
+
+ QVariantList initTemporarilyRemovedBuffers() const;
+ void initSetTemporarilyRemovedBuffers(const QVariantList &buffers);
void addBuffer(const BufferId &bufferId, int pos);
virtual inline void requestAddBuffer(const BufferId &bufferId, int pos) { emit addBufferRequested(bufferId, pos); }
int _minimumActivity;
QList<BufferId> _buffers;
QSet<BufferId> _removedBuffers;
+ QSet<BufferId> _temporarilyRemovedBuffers;
};
#endif // BUFFERVIEWCONFIG_H
{
setConfig(config);
setSourceModel(model);
- connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(source_rowsInserted(const QModelIndex &, int, int)));
setDynamicSortFilter(true);
}
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)...
+ || 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 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::BufferItemType)
- 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())
void checkPreviousCurrentForRemoval(const QModelIndex ¤t, const QModelIndex &previous);
void checkItemForRemoval(const QModelIndex &index) { checkItemsForRemoval(index, index); }
void checkItemsForRemoval(const QModelIndex &topLeft, const QModelIndex &bottomRight);
- void source_rowsInserted(const QModelIndex &parent, int start, int end);
protected:
bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
{ using namespace Global;
quasselVersion = "0.3.0-pre";
- quasselDate = "2008-05-26";
- quasselBuild = 861;
+ quasselDate = "2008-05-30";
+ quasselBuild = 866;
//! Minimum client build number the core needs
clientBuildNeeded = 731;