X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatmonitorfilter.cpp;h=44aaea8a61e8974f787f4c0e0a6b87830a442ed1;hp=db0c8892aae5f487925f12b44ef501ba6b0f6d2f;hb=HEAD;hpb=a4cba7a7497d8b71942d5f5e81ef3c04f5c6bad5 diff --git a/src/qtui/chatmonitorfilter.cpp b/src/qtui/chatmonitorfilter.cpp index db0c8892..cd558c6d 100644 --- a/src/qtui/chatmonitorfilter.cpp +++ b/src/qtui/chatmonitorfilter.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2014 by the Quassel Project * + * Copyright (C) 2005-2022 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,20 +20,28 @@ #include "chatmonitorfilter.h" -#include "client.h" #include "chatlinemodel.h" -#include "networkmodel.h" #include "chatviewsettings.h" +#include "client.h" #include "clientignorelistmanager.h" +#include "networkmodel.h" -ChatMonitorFilter::ChatMonitorFilter(MessageModel *model, QObject *parent) +ChatMonitorFilter::ChatMonitorFilter(MessageModel* model, QObject* parent) : MessageFilter(model, parent) { - ChatViewSettings viewSettings(idString()); + // Global configuration + ChatViewSettings defaultSettings; + defaultSettings.initAndNotify("ShowSenderBrackets", this, &ChatMonitorFilter::showSenderBracketsSettingChanged); + + // NOTE: Whenever changing defaults here, also update ChatMonitorSettingsPage::loadSettings() + // and ChatMonitorSettingsPage::defaults() to match + + // Chat Monitor specific configuration + ChatViewSettings viewSettings(ChatMonitorFilter::idString()); _showFields = viewSettings.value("ShowFields", AllFields).toInt(); _showOwnMessages = viewSettings.value("ShowOwnMsgs", true).toBool(); - viewSettings.notify("ShowFields", this, SLOT(showFieldsSettingChanged(const QVariant &))); - viewSettings.notify("ShowOwnMsgs", this, SLOT(showOwnMessagesSettingChanged(const QVariant &))); + viewSettings.notify("ShowFields", this, &ChatMonitorFilter::showFieldsSettingChanged); + viewSettings.notify("ShowOwnMsgs", this, &ChatMonitorFilter::showOwnMessagesSettingChanged); // ChatMonitorSettingsPage QString showHighlightsSettingsId = "ShowHighlights"; @@ -41,34 +49,41 @@ ChatMonitorFilter::ChatMonitorFilter(MessageModel *model, QObject *parent) QString buffersSettingsId = "Buffers"; QString showBacklogSettingsId = "ShowBacklog"; QString includeReadSettingsId = "IncludeRead"; + QString alwaysOwnSettingsId = "AlwaysOwn"; _showHighlights = viewSettings.value(showHighlightsSettingsId, false).toBool(); - _operationMode = viewSettings.value(operationModeSettingsId, 0).toInt(); + _operationMode = viewSettings.value(operationModeSettingsId, ChatViewSettings::InvalidMode).toInt(); // read configured list of buffers to monitor/ignore - foreach(QVariant v, viewSettings.value(buffersSettingsId, QVariant()).toList()) - _bufferIds << v.value(); + foreach (QVariant v, viewSettings.value(buffersSettingsId, QVariant()).toList()) + _bufferIds << v.value(); _showBacklog = viewSettings.value(showBacklogSettingsId, true).toBool(); - _includeRead = viewSettings.value(includeReadSettingsId, true).toBool(); - - viewSettings.notify(showHighlightsSettingsId, this, SLOT(showHighlightsSettingChanged(const QVariant &))); - viewSettings.notify(operationModeSettingsId, this, SLOT(operationModeSettingChanged(const QVariant &))); - viewSettings.notify(buffersSettingsId, this, SLOT(buffersSettingChanged(const QVariant &))); - viewSettings.notify(showBacklogSettingsId, this, SLOT(showBacklogSettingChanged(const QVariant &))); - viewSettings.notify(includeReadSettingsId, this, SLOT(includeReadSettingChanged(const QVariant &))); + _includeRead = viewSettings.value(includeReadSettingsId, false).toBool(); + _alwaysOwn = viewSettings.value(alwaysOwnSettingsId, false).toBool(); + + viewSettings.notify(showHighlightsSettingsId, this, &ChatMonitorFilter::showHighlightsSettingChanged); + viewSettings.notify(operationModeSettingsId, this, &ChatMonitorFilter::operationModeSettingChanged); + viewSettings.notify(buffersSettingsId, this, &ChatMonitorFilter::buffersSettingChanged); + viewSettings.notify(showBacklogSettingsId, this, &ChatMonitorFilter::showBacklogSettingChanged); + viewSettings.notify(includeReadSettingsId, this, &ChatMonitorFilter::includeReadSettingChanged); + viewSettings.notify(alwaysOwnSettingsId, this, &ChatMonitorFilter::alwaysOwnSettingChanged); } - -bool ChatMonitorFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const +bool ChatMonitorFilter::filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const { Q_UNUSED(sourceParent) QModelIndex source_index = sourceModel()->index(sourceRow, 0); BufferId bufferId = source_index.data(MessageModel::BufferIdRole).value(); - Message::Flags flags = (Message::Flags)source_index.data(MessageModel::FlagsRole).toInt(); - if ((flags & Message::Backlog) && (!_showBacklog || (!_includeRead && - (Client::networkModel()->lastSeenMsgId(bufferId) >= sourceModel()->data(source_index, MessageModel::MsgIdRole).value())))) - return false; + + if (flags & Message::Backlog) { + if (!_showBacklog) + return false; + + if (!_includeRead + && Client::networkModel()->lastSeenMsgId(bufferId) >= sourceModel()->data(source_index, MessageModel::MsgIdRole).value()) + return false; + } if (!_showOwnMessages && flags & Message::Self) return false; @@ -78,26 +93,27 @@ bool ChatMonitorFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourc return false; // ChatMonitorSettingsPage - if (_operationMode == ChatViewSettings::OptOut - && !(_showHighlights && flags & Message::Highlight) - && _bufferIds.contains(bufferId)) + if (_showHighlights && flags & Message::Highlight) + ; // pass + else if (_alwaysOwn && flags & Message::Self) + ; // pass + else if (_operationMode == ChatViewSettings::OptOut && _bufferIds.contains(bufferId)) return false; - if (_operationMode == ChatViewSettings::OptIn - && !(_showHighlights && flags & Message::Highlight) - && !_bufferIds.contains(bufferId)) + else if (_operationMode == ChatViewSettings::OptIn && !_bufferIds.contains(bufferId)) return false; // ignorelist handling // only match if message is not flagged as server msg if (!(flags & Message::ServerMsg) && Client::ignoreListManager() - && Client::ignoreListManager()->match(source_index.data(MessageModel::MessageRole).value(), Client::networkModel()->networkName(bufferId))) + && Client::ignoreListManager()->match(source_index.data(MessageModel::MessageRole).value(), + Client::networkModel()->networkName(bufferId))) return false; + return true; } - // override this to inject display of network and channel -QVariant ChatMonitorFilter::data(const QModelIndex &index, int role) const +QVariant ChatMonitorFilter::data(const QModelIndex& index, int role) const { if (index.column() != ChatLineModel::SenderColumn || role != ChatLineModel::DisplayRole) return MessageFilter::data(index, role); @@ -123,10 +139,12 @@ QVariant ChatMonitorFilter::data(const QModelIndex &index, int role) const QString sender = MessageFilter::data(index, ChatLineModel::EditRole).toString(); fields << sender; } - return QString("<%1>").arg(fields.join(":")); + if (_showSenderBrackets) + return QString("<%1>").arg(fields.join(":")); + else + return QString("%1").arg(fields.join(":")); } - void ChatMonitorFilter::addShowField(int field) { if (_showFields & field) @@ -135,7 +153,6 @@ void ChatMonitorFilter::addShowField(int field) ChatViewSettings(idString()).setValue("ShowFields", _showFields | field); } - void ChatMonitorFilter::removeShowField(int field) { if (!(_showFields & field)) @@ -144,7 +161,6 @@ void ChatMonitorFilter::removeShowField(int field) ChatViewSettings(idString()).setValue("ShowFields", _showFields ^ field); } - void ChatMonitorFilter::setShowOwnMessages(bool show) { if (_showOwnMessages == show) @@ -153,8 +169,7 @@ void ChatMonitorFilter::setShowOwnMessages(bool show) ChatViewSettings(idString()).setValue("ShowOwnMsgs", show); } - -void ChatMonitorFilter::showFieldsSettingChanged(const QVariant &newValue) +void ChatMonitorFilter::showFieldsSettingChanged(const QVariant& newValue) { int newFields = newValue.toInt(); if (_showFields == newFields) @@ -169,38 +184,46 @@ void ChatMonitorFilter::showFieldsSettingChanged(const QVariant &newValue) emit dataChanged(index(0, ChatLineModel::SenderColumn), index(rows - 1, ChatLineModel::SenderColumn)); } - -void ChatMonitorFilter::showOwnMessagesSettingChanged(const QVariant &newValue) +void ChatMonitorFilter::showOwnMessagesSettingChanged(const QVariant& newValue) { _showOwnMessages = newValue.toBool(); } +void ChatMonitorFilter::alwaysOwnSettingChanged(const QVariant& newValue) +{ + _alwaysOwn = newValue.toBool(); +} -void ChatMonitorFilter::showHighlightsSettingChanged(const QVariant &newValue) +void ChatMonitorFilter::showHighlightsSettingChanged(const QVariant& newValue) { _showHighlights = newValue.toBool(); } - -void ChatMonitorFilter::operationModeSettingChanged(const QVariant &newValue) +void ChatMonitorFilter::operationModeSettingChanged(const QVariant& newValue) { _operationMode = newValue.toInt(); } - -void ChatMonitorFilter::buffersSettingChanged(const QVariant &newValue) +void ChatMonitorFilter::buffersSettingChanged(const QVariant& newValue) { _bufferIds.clear(); - foreach(QVariant v, newValue.toList()) { + foreach (QVariant v, newValue.toList()) { _bufferIds << v.value(); } invalidateFilter(); } -void ChatMonitorFilter::showBacklogSettingChanged(const QVariant &newValue) { +void ChatMonitorFilter::showBacklogSettingChanged(const QVariant& newValue) +{ _showBacklog = newValue.toBool(); } -void ChatMonitorFilter::includeReadSettingChanged(const QVariant &newValue) { +void ChatMonitorFilter::includeReadSettingChanged(const QVariant& newValue) +{ _includeRead = newValue.toBool(); } + +void ChatMonitorFilter::showSenderBracketsSettingChanged(const QVariant& newValue) +{ + _showSenderBrackets = newValue.toBool(); +}