X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=49f1673a2ea538937e36aabd7a0a6870ffdf6aa3;hp=29694002adfcaacf66c783c25c3d247ba4fb9f79;hb=d80ba4f4bc4d3e2c8f1a86354af0c3bfce711d08;hpb=d6b056e936ec441258d291b7a8af7b83f9f53016 diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp index 29694002..49f1673a 100644 --- a/src/uisupport/bufferviewfilter.cpp +++ b/src/uisupport/bufferviewfilter.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-07 by the Quassel IRC Team * + * Copyright (C) 2005-08 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,133 +20,271 @@ #include "bufferviewfilter.h" +#include + +#include "buffermodel.h" +#include "client.h" +#include "networkmodel.h" + +#include "uisettings.h" + /***************************************** * The Filter for the Tree View *****************************************/ -BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, const Modes &filtermode, const QList &nets) +BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *config) : QSortFilterProxyModel(model), - mode(filtermode), - networks(QSet::fromList(nets)) + _config(0) { + setConfig(config); setSourceModel(model); - setSortCaseSensitivity(Qt::CaseInsensitive); - - // I have this feeling that this resulted in a fuckup once... no clue though right now and invalidateFilter isn't a slot -.- - //connect(model, SIGNAL(invalidateFilter()), this, SLOT(invalidate())); - connect(model, SIGNAL(invalidateFilter()), this, SLOT(invalidateFilter_())); + connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(source_rowsInserted(const QModelIndex &, int, int))); + + setDynamicSortFilter(true); } -void BufferViewFilter::invalidateFilter_() { - QSortFilterProxyModel::invalidateFilter(); +void BufferViewFilter::setConfig(BufferViewConfig *config) { + if(_config == config) + return; + + if(_config) { + disconnect(_config, 0, this, 0); + } + + _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())); + } + invalidate(); } Qt::ItemFlags BufferViewFilter::flags(const QModelIndex &index) const { Qt::ItemFlags flags = mapToSource(index).flags(); - if(mode & FullCustom) { - if(index == QModelIndex() || index.parent() == QModelIndex()) - flags |= Qt::ItemIsDropEnabled; - } + if(_config && index == QModelIndex() || index.parent() == QModelIndex()) + flags |= Qt::ItemIsDropEnabled; return flags; } bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) { - // drops have to occur in the open field - if(parent != QModelIndex()) + if(!config() || !NetworkModel::mimeContainsBufferList(data)) return QSortFilterProxyModel::dropMimeData(data, action, row, column, parent); - if(!BufferTreeModel::mimeContainsBufferList(data)) - return false; - - QList< QPair > bufferList = BufferTreeModel::mimeDataToBufferList(data); + NetworkId droppedNetworkId; + if(parent.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType) + droppedNetworkId = parent.data(NetworkModel::NetworkIdRole).value(); - uint netId, bufferId; + QList< QPair > bufferList = NetworkModel::mimeDataToBufferList(data); + BufferId bufferId; + NetworkId networkId; + int pos; for(int i = 0; i < bufferList.count(); i++) { - netId = bufferList[i].first; + networkId = bufferList[i].first; bufferId = bufferList[i].second; - networks << netId; - addBuffer(bufferId); + if(droppedNetworkId == networkId) { + if(row < 0) + row = 0; + if(row < rowCount(parent)) { + BufferId beforeBufferId = parent.child(row, 0).data(NetworkModel::BufferIdRole).value(); + pos = config()->bufferList().indexOf(beforeBufferId); + } else { + pos = config()->bufferList().count(); + } + + if(config()->bufferList().contains(bufferId)) { + if(config()->bufferList().indexOf(bufferId) < pos) + pos--; + config()->requestMoveBuffer(bufferId, pos); + } else { + config()->requestAddBuffer(bufferId, pos); + } + + } else { + addBuffer(bufferId); + } } return true; } -void BufferViewFilter::addBuffer(const uint &bufferuid) { - if(!buffers.contains(bufferuid)) { - buffers << bufferuid; - invalidateFilter(); +void BufferViewFilter::addBuffer(const BufferId &bufferId) { + if(!config() || config()->bufferList().contains(bufferId)) + return; + + int pos = config()->bufferList().count(); + bool lt; + for(int i = 0; i < config()->bufferList().count(); i++) { + if(config() && config()->sortAlphabetically()) + lt = bufferIdLessThan(bufferId, config()->bufferList()[i]); + else + lt = bufferId < config()->bufferList()[i]; + + if(lt) { + pos = i; + break; + } } + config()->requestAddBuffer(bufferId, pos); } void BufferViewFilter::removeBuffer(const QModelIndex &index) { - if(!(mode & FullCustom)) - return; // only custom buffers can be customized... obviously... :) - - if(index.parent() == QModelIndex()) - return; // only child elements can be deleted - - bool lastBuffer = (rowCount(index.parent()) == 1); - uint netId = index.data(BufferTreeModel::NetworkIdRole).toUInt(); - uint bufferuid = index.data(BufferTreeModel::BufferUidRole).toUInt(); - if(buffers.contains(bufferuid)) { - buffers.remove(bufferuid); - if(lastBuffer) - networks.remove(netId); - invalidateFilter(); - } + if(!config()) + return; + BufferId bufferId = data(index, NetworkModel::BufferIdRole).value(); + config()->requestRemoveBuffer(bufferId); } bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const { - Buffer::Type bufferType = (Buffer::Type) source_bufferIndex.data(BufferTreeModel::BufferTypeRole).toInt(); + BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value(); + Q_ASSERT(bufferId.isValid()); + if(!_config) + return true; - if((mode & NoChannels) && bufferType == Buffer::ChannelType) + if(config()->networkId().isValid() && config()->networkId() != sourceModel()->data(source_bufferIndex, NetworkModel::NetworkIdRole).value()) return false; - if((mode & NoQueries) && bufferType == Buffer::QueryType) + + if(!(_config->allowedBufferTypes() & (BufferInfo::Type)source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt())) return false; - if((mode & NoServers) && bufferType == Buffer::StatusType) + + if(_config->hideInactiveBuffers() && !source_bufferIndex.data(NetworkModel::ItemActiveRole).toBool()) return false; -// bool isActive = source_bufferIndex.data(BufferTreeModel::BufferActiveRole).toBool(); -// if((mode & NoActive) && isActive) -// return false; -// if((mode & NoInactive) && !isActive) -// return false; - -// if((mode & FullCustom)) { -// uint bufferuid = source_bufferIndex.data(BufferTreeModel::BufferUidRole).toUInt(); -// if(!buffers.contains(bufferuid)) -// return false; -// } - - return true; + if(_config->minimumActivity() > source_bufferIndex.data(NetworkModel::BufferActivityRole).toInt()) { + if(bufferId != Client::bufferModel()->standardSelectionModel()->currentIndex().data(NetworkModel::BufferIdRole).value()) + return false; + } + + return _config->bufferList().contains(bufferId); } bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) const { - uint net = source_index.data(BufferTreeModel::NetworkIdRole).toUInt(); - return !((mode & (SomeNets | FullCustom)) && !networks.contains(net)); + if(!config()) + return true; + + if(!config()->networkId().isValid()) { + return true; + } else { + return config()->networkId() == sourceModel()->data(source_index, NetworkModel::NetworkIdRole).value(); + } } bool BufferViewFilter::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const { QModelIndex child = sourceModel()->index(source_row, 0, source_parent); if(!child.isValid()) { - qDebug() << "filterAcceptsRow has been called with an invalid Child"; + qWarning() << "filterAcceptsRow has been called with an invalid Child"; return false; } - if(source_parent == QModelIndex()) + if(!source_parent.isValid()) return filterAcceptNetwork(child); else return filterAcceptBuffer(child); } -bool BufferViewFilter::lessThan(const QModelIndex &left, const QModelIndex &right) const { - int lefttype = left.data(BufferTreeModel::BufferTypeRole).toInt(); - int righttype = right.data(BufferTreeModel::BufferTypeRole).toInt(); +bool BufferViewFilter::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const { + int itemType = sourceModel()->data(source_left, NetworkModel::ItemTypeRole).toInt(); + switch(itemType) { + case NetworkModel::NetworkItemType: + return networkLessThan(source_left, source_right); + case NetworkModel::BufferItemType: + return bufferLessThan(source_left, source_right); + default: + return QSortFilterProxyModel::lessThan(source_left, source_right); + } +} + +bool BufferViewFilter::bufferLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const { + return QSortFilterProxyModel::lessThan(source_left, source_right); + BufferId leftBufferId = sourceModel()->data(source_left, NetworkModel::BufferIdRole).value(); + BufferId rightBufferId = sourceModel()->data(source_right, NetworkModel::BufferIdRole).value(); + if(config()) { + return config()->bufferList().indexOf(leftBufferId) < config()->bufferList().indexOf(rightBufferId); + } else + return bufferIdLessThan(leftBufferId, rightBufferId); +} + +bool BufferViewFilter::networkLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const { + NetworkId leftNetworkId = sourceModel()->data(source_left, NetworkModel::NetworkIdRole).value(); + NetworkId rightNetworkId = sourceModel()->data(source_right, NetworkModel::NetworkIdRole).value(); + + if(config() && config()->sortAlphabetically()) + return QSortFilterProxyModel::lessThan(source_left, source_right); + else + return leftNetworkId < rightNetworkId; +} + +QVariant BufferViewFilter::data(const QModelIndex &index, int role) const { + if(role == Qt::ForegroundRole) + return foreground(index); + else + return QSortFilterProxyModel::data(index, role); +} + +QVariant BufferViewFilter::foreground(const QModelIndex &index) const { + UiSettings s("QtUi/Colors"); + QVariant inactiveActivity = s.value("inactiveActivityFG", QVariant(QColor(Qt::gray))); + QVariant noActivity = s.value("noActivityFG", QVariant(QColor(Qt::black))); + QVariant highlightActivity = s.value("highlightActivityFG", QVariant(QColor(Qt::magenta))); + QVariant newMessageActivity = s.value("newMessageActivityFG", QVariant(QColor(Qt::green))); + QVariant otherActivity = s.value("otherActivityFG", QVariant(QColor(Qt::darkGreen))); + + if(!index.data(NetworkModel::ItemActiveRole).toBool()) + return inactiveActivity; + + Buffer::ActivityLevel activity = (Buffer::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt(); + + if(activity & Buffer::Highlight) + return highlightActivity; + if(activity & Buffer::NewMessage) + return newMessageActivity; + if(activity & Buffer::OtherActivity) + return otherActivity; + + return noActivity; + +} + +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()); + } +} + +// ****************************** +// Helper +// ****************************** +bool bufferIdLessThan(const BufferId &left, const BufferId &right) { + Q_CHECK_PTR(Client::networkModel()); + if(!Client::networkModel()) + return true; + + QModelIndex leftIndex = Client::networkModel()->bufferIndex(left); + QModelIndex rightIndex = Client::networkModel()->bufferIndex(right); + + int leftType = Client::networkModel()->data(leftIndex, NetworkModel::BufferTypeRole).toInt(); + int rightType = Client::networkModel()->data(rightIndex, NetworkModel::BufferTypeRole).toInt(); - if(lefttype != righttype) - return lefttype < righttype; + if(leftType != rightType) + return leftType < rightType; else - return QSortFilterProxyModel::lessThan(left, right); + return QString::compare(Client::networkModel()->data(leftIndex, Qt::DisplayRole).toString(), Client::networkModel()->data(rightIndex, Qt::DisplayRole).toString(), Qt::CaseInsensitive) < 0; }