*****************************************/
BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *config)
: QSortFilterProxyModel(model),
- _config(0)
+ _config(0),
+ _sortOrder(Qt::AscendingOrder)
{
setConfig(config);
setSourceModel(model);
}
_config = config;
+
+ if(!config) {
+ invalidate();
+ return;
+ }
+
if(config->isInitialized()) {
configInitialized();
} else {
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;
}
if(droppedNetworkId == networkId) {
if(row < 0)
row = 0;
+
if(row < rowCount(parent)) {
BufferId beforeBufferId = parent.child(row, 0).data(NetworkModel::BufferIdRole).value<BufferId>();
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)) {
return true;
}
+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;
// 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.
+ || (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 filters ("show only channels" and stuff)
+ // note: adding the buffer to the valid list does not temper with the following filters ("show only channels" and stuff)
return false;
}