X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=6bd65653e5f5757d2d15fd9cec1a3c8ef60bb238;hp=2e8fd4efa685df3c542b512842b03e8712653f6b;hb=6daace85c6e97db23d0ab946f59479db20defb63;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp index 2e8fd4ef..6bd65653 100644 --- a/src/uisupport/bufferviewfilter.cpp +++ b/src/uisupport/bufferviewfilter.cpp @@ -28,10 +28,11 @@ #include "buffermodel.h" #include "buffersettings.h" #include "client.h" +#include "clientbufferviewconfig.h" +#include "graphicalui.h" #include "iconloader.h" #include "networkmodel.h" - -#include "uisettings.h" +#include "uistyle.h" class CheckRemovalEvent : public QEvent { public: @@ -46,19 +47,15 @@ BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig * : QSortFilterProxyModel(model), _config(0), _sortOrder(Qt::AscendingOrder), - _userOfflineIcon(SmallIcon("user-offline")), - _userAwayIcon(SmallIcon("user-away")), - _userOnlineIcon(SmallIcon("user-online")), + _showServerQueries(false), _editMode(false), - _enableEditMode(tr("Edit Mode"), this) + _enableEditMode(tr("Show / Hide Chats"), this) { setConfig(config); setSourceModel(model); setDynamicSortFilter(true); - loadColors(); - connect(this, SIGNAL(_dataChanged(const QModelIndex &, const QModelIndex &)), this, SLOT(_q_sourceDataChanged(QModelIndex,QModelIndex))); @@ -66,23 +63,9 @@ BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig * _enableEditMode.setChecked(_editMode); connect(&_enableEditMode, SIGNAL(toggled(bool)), this, SLOT(enableEditMode(bool))); - BufferSettings bufferSettings; - _showUserStateIcons = bufferSettings.showUserStateIcons(); - bufferSettings.notify("ShowUserStateIcons", this, SLOT(showUserStateIconsChanged())); -} - -void BufferViewFilter::loadColors() { - UiSettings s("QtUiStyle/Colors"); - _FgColorInactiveActivity = s.value("inactiveActivityFG", QVariant(QColor(Qt::gray))).value(); - _FgColorNoActivity = s.value("noActivityFG", QVariant(QColor(Qt::black))).value(); - _FgColorHighlightActivity = s.value("highlightActivityFG", QVariant(QColor(Qt::magenta))).value(); - _FgColorNewMessageActivity = s.value("newMessageActivityFG", QVariant(QColor(Qt::green))).value(); - _FgColorOtherActivity = s.value("otherActivityFG", QVariant(QColor(Qt::darkGreen))).value(); -} - -void BufferViewFilter::showUserStateIconsChanged() { - BufferSettings bufferSettings; - _showUserStateIcons = bufferSettings.showUserStateIcons(); + BufferSettings defaultSettings; + defaultSettings.notify("ServerNoticesTarget", this, SLOT(showServerQueriesChanged())); + showServerQueriesChanged(); } void BufferViewFilter::setConfig(BufferViewConfig *config) { @@ -104,7 +87,9 @@ void BufferViewFilter::setConfig(BufferViewConfig *config) { if(config->isInitialized()) { configInitialized(); } else { - connect(config, SIGNAL(initDone()), this, SLOT(configInitialized())); + // we use a queued connection here since manipulating the connection list of a sending object + // doesn't seem to be such a good idea while executing a connected slots. + connect(config, SIGNAL(initDone()), this, SLOT(configInitialized()), Qt::QueuedConnection); invalidate(); } } @@ -113,18 +98,19 @@ void BufferViewFilter::configInitialized() { if(!config()) return; - 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())); - connect(config(), SIGNAL(bufferPermanentlyRemoved(const BufferId &)), this, SLOT(invalidate())); +// connect(config(), SIGNAL(bufferViewNameSet(const QString &)), this, SLOT(invalidate())); + connect(config(), SIGNAL(configChanged()), 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())); +// connect(config(), SIGNAL(bufferPermanentlyRemoved(const BufferId &)), this, SLOT(invalidate())); disconnect(config(), SIGNAL(initDone()), this, SLOT(configInitialized())); @@ -134,6 +120,16 @@ void BufferViewFilter::configInitialized() { emit configChanged(); } +void BufferViewFilter::showServerQueriesChanged() { + BufferSettings bufferSettings; + + bool showQueries = (bufferSettings.serverNoticesTarget() & BufferSettings::DefaultBuffer); + if(_showServerQueries != showQueries) { + _showServerQueries = showQueries; + invalidate(); + } +} + QList BufferViewFilter::actions(const QModelIndex &index) { Q_UNUSED(index) QList actionList; @@ -151,13 +147,8 @@ void BufferViewFilter::enableEditMode(bool enable) { return; if(enable == false) { - int numBuffers = config()->bufferList().count(); + addBuffers(QList::fromSet(_toAdd)); QSet::const_iterator iter; - for(iter = _toAdd.constBegin(); iter != _toAdd.constEnd(); iter++) { - if(config()->bufferList().contains(*iter)) - continue; - config()->requestAddBuffer(*iter, numBuffers); - } for(iter = _toTempRemove.constBegin(); iter != _toTempRemove.constEnd(); iter++) { if(config()->temporarilyRemovedBuffers().contains(*iter)) continue; @@ -178,13 +169,25 @@ void BufferViewFilter::enableEditMode(bool enable) { Qt::ItemFlags BufferViewFilter::flags(const QModelIndex &index) const { - Qt::ItemFlags flags = mapToSource(index).flags(); - if(_config) { - if(index == QModelIndex() || index.parent() == QModelIndex()) { + 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) { + ClientBufferViewConfig *clientConf = qobject_cast(config()); + if(clientConf && clientConf->isLocked()) { + flags &= ~(Qt::ItemIsDropEnabled | Qt::ItemIsDragEnabled); + } + } } return flags; } @@ -194,8 +197,9 @@ bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action return QSortFilterProxyModel::dropMimeData(data, action, row, column, parent); NetworkId droppedNetworkId; - if(parent.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType) - droppedNetworkId = parent.data(NetworkModel::NetworkIdRole).value(); + QModelIndex source_parent = mapToSource(parent); + if(sourceModel()->data(source_parent, NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType) + droppedNetworkId = sourceModel()->data(source_parent, NetworkModel::NetworkIdRole).value(); QList< QPair > bufferList = NetworkModel::mimeDataToBufferList(data); BufferId bufferId; @@ -209,7 +213,8 @@ bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action row = 0; if(row < rowCount(parent)) { - BufferId beforeBufferId = parent.child(row, 0).data(NetworkModel::BufferIdRole).value(); + QModelIndex source_child = mapToSource(index(row, 0, parent)); + BufferId beforeBufferId = sourceModel()->data(source_child, NetworkModel::BufferIdRole).value(); pos = config()->bufferList().indexOf(beforeBufferId); if(_sortOrder == Qt::DescendingOrder) pos++; @@ -220,10 +225,12 @@ bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action pos = 0; } - if(config()->bufferList().contains(bufferId)) { + if(config()->bufferList().contains(bufferId) && !config()->sortAlphabetically()) { if(config()->bufferList().indexOf(bufferId) < pos) pos--; - config()->requestMoveBuffer(bufferId, pos); + ClientBufferViewConfig *clientConf = qobject_cast(config()); + if(!clientConf || !clientConf->isLocked()) + config()->requestMoveBuffer(bufferId, pos); } else { config()->requestAddBuffer(bufferId, pos); } @@ -260,19 +267,47 @@ void BufferViewFilter::addBuffer(const BufferId &bufferId) const { config()->requestAddBuffer(bufferId, pos); } +void BufferViewFilter::addBuffers(const QList &bufferIds) const { + if(!config()) + return; + + QList bufferList = config()->bufferList(); + foreach(BufferId bufferId, bufferIds) { + if(bufferList.contains(bufferId)) + continue; + + int pos = bufferList.count(); + bool lt; + for(int i = 0; i < bufferList.count(); i++) { + if(config() && config()->sortAlphabetically()) + lt = bufferIdLessThan(bufferId, bufferList[i]); + else + lt = bufferId < config()->bufferList()[i]; + + if(lt) { + pos = i; + bufferList.insert(pos, bufferId); + break; + } + } + config()->requestAddBuffer(bufferId, pos); + } +} + bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const { // no config -> "all buffers" -> accept everything if(!config()) return true; - BufferId bufferId = source_bufferIndex.data(NetworkModel::BufferIdRole).value(); + BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value(); Q_ASSERT(bufferId.isValid()); - int activityLevel = source_bufferIndex.data(NetworkModel::BufferActivityRole).toInt(); + int activityLevel = sourceModel()->data(source_bufferIndex, NetworkModel::BufferActivityRole).toInt(); if(!config()->bufferList().contains(bufferId) && !_editMode) { // add the buffer if... - if(config()->isInitialized() && !config()->removedBuffers().contains(bufferId) // it hasn't been manually removed and either + 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 > BufferInfo::OtherActivity))) { // or was just temporarily hidden and has a new message waiting for us. addBuffer(bufferId); @@ -281,20 +316,26 @@ bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) return false; } - if(config()->networkId().isValid() && config()->networkId() != source_bufferIndex.data(NetworkModel::NetworkIdRole).value()) + if(config()->networkId().isValid() && config()->networkId() != sourceModel()->data(source_bufferIndex, NetworkModel::NetworkIdRole).value()) return false; int allowedBufferTypes = config()->allowedBufferTypes(); if(!config()->networkId().isValid()) allowedBufferTypes &= ~BufferInfo::StatusBuffer; - if(!(allowedBufferTypes & source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt())) + int bufferType = sourceModel()->data(source_bufferIndex, NetworkModel::BufferTypeRole).toInt(); + if(!(allowedBufferTypes & bufferType)) return false; + if(bufferType & BufferInfo::QueryBuffer && !_showServerQueries && sourceModel()->data(source_bufferIndex, Qt::DisplayRole).toString().contains('.')) { + return false; + } + // the following dynamic filters may not trigger if the buffer is currently selected. - if(bufferId == Client::bufferModel()->standardSelectionModel()->currentIndex().data(NetworkModel::BufferIdRole).value()) + QModelIndex currentIndex = Client::bufferModel()->standardSelectionModel()->currentIndex(); + if(bufferId == Client::bufferModel()->data(currentIndex, NetworkModel::BufferIdRole).value()) return true; - if(config()->hideInactiveBuffers() && !source_bufferIndex.data(NetworkModel::ItemActiveRole).toBool() && activityLevel <= BufferInfo::OtherActivity) + if(config()->hideInactiveBuffers() && !sourceModel()->data(source_bufferIndex, NetworkModel::ItemActiveRole).toBool() && activityLevel <= BufferInfo::OtherActivity) return false; if(config()->minimumActivity() > activityLevel) @@ -310,7 +351,7 @@ bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) cons if(!config()->networkId().isValid()) { return true; } else { - return config()->networkId() == source_index.data(NetworkModel::NetworkIdRole).value(); + return config()->networkId() == sourceModel()->data(source_index, NetworkModel::NetworkIdRole).value(); } } @@ -322,15 +363,20 @@ bool BufferViewFilter::filterAcceptsRow(int source_row, const QModelIndex &sourc return false; } - if(!source_parent.isValid()) + NetworkModel::ItemType childType = (NetworkModel::ItemType)sourceModel()->data(child, NetworkModel::ItemTypeRole).toInt(); + switch(childType) { + case NetworkModel::NetworkItemType: return filterAcceptNetwork(child); - else + case NetworkModel::BufferItemType: return filterAcceptBuffer(child); + default: + return false; + } } bool BufferViewFilter::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const { - int leftItemType = source_left.data(NetworkModel::ItemTypeRole).toInt(); - int rightItemType = source_right.data(NetworkModel::ItemTypeRole).toInt(); + int leftItemType = sourceModel()->data(source_left, NetworkModel::ItemTypeRole).toInt(); + int rightItemType = sourceModel()->data(source_right, NetworkModel::ItemTypeRole).toInt(); int itemType = leftItemType & rightItemType; switch(itemType) { case NetworkModel::NetworkItemType: @@ -343,8 +389,8 @@ bool BufferViewFilter::lessThan(const QModelIndex &source_left, const QModelInde } bool BufferViewFilter::bufferLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const { - BufferId leftBufferId = source_left.data(NetworkModel::BufferIdRole).value(); - BufferId rightBufferId = source_right.data(NetworkModel::BufferIdRole).value(); + BufferId leftBufferId = sourceModel()->data(source_left, NetworkModel::BufferIdRole).value(); + BufferId rightBufferId = sourceModel()->data(source_right, NetworkModel::BufferIdRole).value(); if(config()) { int leftPos = config()->bufferList().indexOf(leftBufferId); int rightPos = config()->bufferList().indexOf(rightBufferId); @@ -358,21 +404,21 @@ bool BufferViewFilter::bufferLessThan(const QModelIndex &source_left, const QMod } bool BufferViewFilter::networkLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const { - NetworkId leftNetworkId = source_left.data(NetworkModel::NetworkIdRole).value(); - NetworkId rightNetworkId = source_right.data(NetworkModel::NetworkIdRole).value(); + 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; + return QSortFilterProxyModel::lessThan(source_left, source_right); } QVariant BufferViewFilter::data(const QModelIndex &index, int role) const { switch(role) { - case Qt::DecorationRole: - return icon(index); + case Qt::FontRole: case Qt::ForegroundRole: - return foreground(index); + case Qt::BackgroundRole: + case Qt::DecorationRole: + if((config() && config()->disableDecoration())) + return QVariant(); + return GraphicalUi::uiStyle()->bufferViewItemData(mapToSource(index), role); case Qt::CheckStateRole: return checkedState(index); default: @@ -380,51 +426,15 @@ QVariant BufferViewFilter::data(const QModelIndex &index, int role) const { } } -QVariant BufferViewFilter::icon(const QModelIndex &index) const { - if(!_showUserStateIcons || (config() && config()->disableDecoration())) - return QVariant(); - - if(index.column() != 0) - return QVariant(); - - if(index.data(NetworkModel::BufferTypeRole).toInt() != BufferInfo::QueryBuffer) - return QVariant(); - - if(!index.data(NetworkModel::ItemActiveRole).toBool()) - return _userOfflineIcon; - - if(index.data(NetworkModel::UserAwayRole).toBool()) - return _userAwayIcon; - else - return _userOnlineIcon; - - return QVariant(); -} - -QVariant BufferViewFilter::foreground(const QModelIndex &index) const { - if(config() && config()->disableDecoration()) - return _FgColorNoActivity; - - BufferInfo::ActivityLevel activity = (BufferInfo::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt(); - - if(activity & BufferInfo::Highlight) - return _FgColorHighlightActivity; - if(activity & BufferInfo::NewMessage) - return _FgColorNewMessageActivity; - if(activity & BufferInfo::OtherActivity) - return _FgColorOtherActivity; - - if(!index.data(NetworkModel::ItemActiveRole).toBool() || index.data(NetworkModel::UserAwayRole).toBool()) - return _FgColorInactiveActivity; - - return _FgColorNoActivity; -} - QVariant BufferViewFilter::checkedState(const QModelIndex &index) const { if(!_editMode || !config()) return QVariant(); - BufferId bufferId = index.data(NetworkModel::BufferIdRole).value(); + QModelIndex source_index = mapToSource(index); + if(source_index == QModelIndex() || sourceModel()->data(source_index, NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType) + return QVariant(); + + BufferId bufferId = sourceModel()->data(source_index, NetworkModel::BufferIdRole).value(); if(_toAdd.contains(bufferId)) return Qt::Checked; @@ -453,7 +463,8 @@ bool BufferViewFilter::setData(const QModelIndex &index, const QVariant &value, } bool BufferViewFilter::setCheckedState(const QModelIndex &index, Qt::CheckState state) { - BufferId bufferId = index.data(NetworkModel::BufferIdRole).value(); + QModelIndex source_index = mapToSource(index); + BufferId bufferId = sourceModel()->data(source_index, NetworkModel::BufferIdRole).value(); if(!bufferId.isValid()) return false; @@ -510,12 +521,13 @@ bool BufferViewFilter::bufferIdLessThan(const BufferId &left, const BufferId &ri QModelIndex leftIndex = Client::networkModel()->bufferIndex(left); QModelIndex rightIndex = Client::networkModel()->bufferIndex(right); - int leftType = leftIndex.data(NetworkModel::BufferTypeRole).toInt(); - int rightType = rightIndex.data(NetworkModel::BufferTypeRole).toInt(); + int leftType = Client::networkModel()->data(leftIndex, NetworkModel::BufferTypeRole).toInt(); + int rightType = Client::networkModel()->data(rightIndex, NetworkModel::BufferTypeRole).toInt(); if(leftType != rightType) return leftType < rightType; else - return QString::compare(leftIndex.data(Qt::DisplayRole).toString(), rightIndex.data(Qt::DisplayRole).toString(), Qt::CaseInsensitive) < 0; + return QString::compare(Client::networkModel()->data(leftIndex, Qt::DisplayRole).toString(), Client::networkModel()->data(rightIndex, Qt::DisplayRole).toString(), Qt::CaseInsensitive) < 0; } +