/***************************************************************************
- * Copyright (C) 2005-2012 by the Quassel Project *
+ * Copyright (C) 2005-2018 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
ChatMonitorFilter::ChatMonitorFilter(MessageModel *model, QObject *parent)
: MessageFilter(model, parent)
{
- ChatViewSettings viewSettings(idString());
+ // Global configuration
+ ChatViewSettings defaultSettings;
+ _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(ChatMonitorFilter::idString());
_showFields = viewSettings.value("ShowFields", AllFields).toInt();
_showOwnMessages = viewSettings.value("ShowOwnMsgs", true).toBool();
viewSettings.notify("ShowFields", this, SLOT(showFieldsSettingChanged(const QVariant &)));
QString showHighlightsSettingsId = "ShowHighlights";
QString operationModeSettingsId = "OperationMode";
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, 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 &)));
}
Q_UNUSED(sourceParent)
QModelIndex source_index = sourceModel()->index(sourceRow, 0);
-
+ BufferId bufferId = source_index.data(MessageModel::BufferIdRole).value<BufferId>();
Message::Flags flags = (Message::Flags)source_index.data(MessageModel::FlagsRole).toInt();
- if (flags & Message::Backlog || (!_showOwnMessages && flags & Message::Self))
+
+ if (flags & Message::Backlog) {
+ if (!_showBacklog)
+ return false;
+
+ if (!_includeRead && Client::networkModel()->lastSeenMsgId(bufferId) >= sourceModel()->data(source_index, MessageModel::MsgIdRole).value<MsgId>())
+ return false;
+ }
+
+ if (!_showOwnMessages && flags & Message::Self)
return false;
Message::Type type = (Message::Type)source_index.data(MessageModel::TypeRole).toInt();
if (!(type & (Message::Plain | Message::Notice | Message::Action)))
return false;
- BufferId bufferId = source_index.data(MessageModel::BufferIdRole).value<BufferId>();
-
// 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
if (!(flags & Message::ServerMsg) && Client::ignoreListManager()
&& Client::ignoreListManager()->match(source_index.data(MessageModel::MessageRole).value<Message>(), Client::networkModel()->networkName(bufferId)))
return false;
+
return true;
}
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(":"));
}
_showOwnMessages = newValue.toBool();
}
+void ChatMonitorFilter::alwaysOwnSettingChanged(const QVariant &newValue) {
+ _alwaysOwn = newValue.toBool();
+}
void ChatMonitorFilter::showHighlightsSettingChanged(const QVariant &newValue)
{
}
invalidateFilter();
}
+
+void ChatMonitorFilter::showBacklogSettingChanged(const QVariant &newValue) {
+ _showBacklog = newValue.toBool();
+}
+
+void ChatMonitorFilter::includeReadSettingChanged(const QVariant &newValue) {
+ _includeRead = newValue.toBool();
+}
+
+void ChatMonitorFilter::showSenderBracketsSettingChanged(const QVariant &newValue)
+{
+ _showSenderBrackets = newValue.toBool();
+}