/***************************************************************************
- * Copyright (C) 2005-2015 by the Quassel Project *
+ * Copyright (C) 2005-2019 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
setSourceModel(model);
setDynamicSortFilter(true);
+ // Sort case-insensitively (primarily for network names; channels/nicks handled elsewhere)
+ setSortCaseSensitivity(Qt::CaseInsensitive);
_enableEditMode.setCheckable(true);
_enableEditMode.setChecked(_editMode);
return actionList;
}
+void BufferViewFilter::setFilterString(const QString string)
+{
+ beginResetModel();
+ _filterString = string;
+ endResetModel();
+ enableEditMode(!string.isEmpty());
+}
+
void BufferViewFilter::enableEditMode(bool enable)
{
QModelIndex source_index = mapToSource(index);
Qt::ItemFlags flags = sourceModel()->flags(source_index);
if (config()) {
- NetworkModel::ItemType itemType = (NetworkModel::ItemType)sourceModel()->data(source_index, NetworkModel::ItemTypeRole).toInt();
BufferInfo::Type bufferType = (BufferInfo::Type)sourceModel()->data(source_index, NetworkModel::BufferTypeRole).toInt();
- if (source_index == QModelIndex() || itemType == NetworkModel::NetworkItemType) {
- flags |= Qt::ItemIsDropEnabled;
- }
- else if (_editMode) {
- flags |= Qt::ItemIsUserCheckable | Qt::ItemIsTristate;
- }
- // prohibit dragging of most items. and most drop places
- // only query to query is allowed for merging
- if (bufferType != BufferInfo::QueryBuffer) {
+ // We need Status Buffers to be a drop target, to allow for rearranging buffers.
+ // The Status Buffer "owns" the space between Channel/Query buffers in the tree.
+ // This DOES mean that it looks like you can merge a buffer into the Status buffer, but that is restricted in BufferView::dropEvent().
+ if (bufferType == BufferInfo::StatusBuffer) {
+ // But only if the layout isn't locked!
ClientBufferViewConfig *clientConf = qobject_cast<ClientBufferViewConfig *>(config());
- if (clientConf && clientConf->isLocked()) {
- flags &= ~(Qt::ItemIsDropEnabled | Qt::ItemIsDragEnabled);
+ if (clientConf && !clientConf->isLocked()) {
+ flags |= Qt::ItemIsDropEnabled;
}
}
+
+ // If we're in Edit Mode, everything except Status Buffers should be hideable.
+ if (_editMode && bufferType != BufferInfo::StatusBuffer) {
+ flags |= Qt::ItemIsUserCheckable | Qt::ItemIsTristate;
+ }
}
return flags;
}
return false;
}
+ if (!_filterString.isEmpty()) {
+ const BufferInfo info = qvariant_cast<BufferInfo>(Client::bufferModel()->data(source_bufferIndex, NetworkModel::BufferInfoRole));
+ QString name = info.bufferName();
+ if (name.contains(_filterString, Qt::CaseInsensitive)) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
// the following dynamic filters may not trigger if the buffer is currently selected.
QModelIndex currentIndex = Client::bufferModel()->standardSelectionModel()->currentIndex();
if (bufferId == Client::bufferModel()->data(currentIndex, NetworkModel::BufferIdRole).value<BufferId>())
{
BufferId leftBufferId = sourceModel()->data(source_left, NetworkModel::BufferIdRole).value<BufferId>();
BufferId rightBufferId = sourceModel()->data(source_right, NetworkModel::BufferIdRole).value<BufferId>();
+ // If filtering, prioritize relevant items first
+ if (!_filterString.isEmpty()) {
+ // Get names of the buffers
+ QString leftBufferName = sourceModel()->data(source_left, NetworkModel::BufferInfoRole)
+ .value<BufferInfo>().bufferName();
+ QString rightBufferName = sourceModel()->data(source_right, NetworkModel::BufferInfoRole)
+ .value<BufferInfo>().bufferName();
+ // Check if there's any differences across types, most important first
+ if ((QString::compare(leftBufferName, _filterString, Qt::CaseInsensitive) == 0)
+ != (QString::compare(rightBufferName, _filterString, Qt::CaseInsensitive) == 0)) {
+ // One of these buffers is an exact match with the filter string, while the other isn't
+ // Prioritize whichever one is the exact match
+ // (If left buffer is exact, return true to set it as less than right)
+ return (QString::compare(leftBufferName, _filterString, Qt::CaseInsensitive) == 0);
+ }
+ else if (leftBufferName.startsWith(_filterString, Qt::CaseInsensitive)
+ != rightBufferName.startsWith(_filterString, Qt::CaseInsensitive)) {
+ // One of these buffers starts with the filter string, while the other doesn't
+ // Prioritize whichever one starts with the filter string
+ // (If left buffer starts with, return true to set it as less than right)
+ return leftBufferName.startsWith(_filterString, Qt::CaseInsensitive);
+ }
+ // Otherwise, do the normal sorting (sorting happens within each priority bracket)
+ }
if (config()) {
int leftPos = config()->bufferList().indexOf(leftBufferId);
int rightPos = config()->bufferList().indexOf(rightBufferId);