_showSenderBrackets = defaultSettings.showSenderBrackets();
defaultSettings.notify("ShowSenderBrackets", this, SLOT(showSenderBracketsSettingChanged(const QVariant &)));
+ // NOTE: Whenever changing defaults here, also update ChatMonitorSettingsPage::loadSettings()
+ // and ChatMonitorSettingsPage::defaults() to match
+
// Chat Monitor specific configuration
- ChatViewSettings viewSettings(idString());
+ ChatViewSettings viewSettings(ChatMonitorFilter::idString());
_showFields = viewSettings.value("ShowFields", AllFields).toInt();
_showOwnMessages = viewSettings.value("ShowOwnMsgs", true).toBool();
viewSettings.notify("ShowFields", this, SLOT(showFieldsSettingChanged(const QVariant &)));
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<BufferId>();
_showBacklog = viewSettings.value(showBacklogSettingsId, true).toBool();
- _includeRead = viewSettings.value(includeReadSettingsId, true).toBool();
+ _includeRead = viewSettings.value(includeReadSettingsId, false).toBool();
+ _alwaysOwn = viewSettings.value(alwaysOwnSettingsId, false).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 &)));
+ viewSettings.notify(alwaysOwnSettingsId, this, SLOT(alwaysOwnSettingChanged(const QVariant &)));
}
// ChatMonitorSettingsPage
if (_showHighlights && flags & Message::Highlight)
; // pass
+ else if (_alwaysOwn && flags & Message::Self)
+ ; // pass
else if (_operationMode == ChatViewSettings::OptOut && _bufferIds.contains(bufferId))
return false;
else if (_operationMode == ChatViewSettings::OptIn && !_bufferIds.contains(bufferId))
_showOwnMessages = newValue.toBool();
}
+void ChatMonitorFilter::alwaysOwnSettingChanged(const QVariant &newValue) {
+ _alwaysOwn = newValue.toBool();
+}
void ChatMonitorFilter::showHighlightsSettingChanged(const QVariant &newValue)
{