X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatmonitorfilter.cpp;h=45cc6c010f08a573ef87fae1e490eab55ff2f378;hp=676ea850888ac7ee636fee993c3863b80eeeb3fb;hb=af6cd0ea27697a79902413da2ff898a87955ebe2;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce diff --git a/src/qtui/chatmonitorfilter.cpp b/src/qtui/chatmonitorfilter.cpp index 676ea850..45cc6c01 100644 --- a/src/qtui/chatmonitorfilter.cpp +++ b/src/qtui/chatmonitorfilter.cpp @@ -1,22 +1,22 @@ /*************************************************************************** -* Copyright (C) 2005-09 by the Quassel Project * -* devel@quassel-irc.org * -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) version 3. * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU General Public License for more details. * -* * -* You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * -* Free Software Foundation, Inc., * -* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * -***************************************************************************/ + * Copyright (C) 2005-2018 by the Quassel Project * + * devel@quassel-irc.org * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) version 3. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ #include "chatmonitorfilter.h" @@ -29,6 +29,15 @@ ChatMonitorFilter::ChatMonitorFilter(MessageModel *model, QObject *parent) : MessageFilter(model, parent) { + // 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(idString()); _showFields = viewSettings.value("ShowFields", AllFields).toInt(); _showOwnMessages = viewSettings.value("ShowOwnMsgs", true).toBool(); @@ -39,16 +48,26 @@ ChatMonitorFilter::ChatMonitorFilter(MessageModel *model, QObject *parent) 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(); + _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 &))); } @@ -57,25 +76,32 @@ bool ChatMonitorFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourc 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 || (!_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()) + 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(); - // 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 @@ -83,6 +109,7 @@ bool ChatMonitorFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourc if (!(flags & Message::ServerMsg) && Client::ignoreListManager() && Client::ignoreListManager()->match(source_index.data(MessageModel::MessageRole).value(), Client::networkModel()->networkName(bufferId))) return false; + return true; } @@ -114,7 +141,10 @@ 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(":")); } @@ -166,6 +196,9 @@ void ChatMonitorFilter::showOwnMessagesSettingChanged(const QVariant &newValue) _showOwnMessages = newValue.toBool(); } +void ChatMonitorFilter::alwaysOwnSettingChanged(const QVariant &newValue) { + _alwaysOwn = newValue.toBool(); +} void ChatMonitorFilter::showHighlightsSettingChanged(const QVariant &newValue) { @@ -187,3 +220,16 @@ void ChatMonitorFilter::buffersSettingChanged(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(); +}