_showOwnMessages = viewSettings.value("showOwnMsgs", true).toBool();
viewSettings.notify("showFields", this, SLOT(showFieldsSettingsChanged(const QVariant &)));
viewSettings.notify("showOwnMsgs", this, SLOT(showOwnMessagesSettingChanged(const QVariant &)));
+
+ // ChatMonitorSettingsPage
+ QString highlightAlwaysSettingsId = "HighlightAlways";
+ QString operationModeSettingsId = "OperationMode";
+ QString buffersSettingsId = "Buffers";
+
+ _highlightAlways = viewSettings.value(highlightAlwaysSettingsId, false).toBool();
+ _operationMode = viewSettings.value(operationModeSettingsId, 0).toInt();
+ // read configured list of buffers to monitor/ignore
+ foreach(QVariant v, viewSettings.value(buffersSettingsId, QVariant()).toList())
+ _bufferIds << v.value<BufferId>();
+
+ viewSettings.notify(highlightAlwaysSettingsId, this, SLOT(highlightAlwaysSettingsChanged(const QVariant &)));
+ viewSettings.notify(operationModeSettingsId, this, SLOT(operationModeSettingsChanged(const QVariant &)));
+ viewSettings.notify(buffersSettingsId, this, SLOT(buffersSettingsChanged(const QVariant &)));
}
bool ChatMonitorFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const {
if(!(type & (Message::Plain | Message::Notice | Message::Action)))
return false;
+ // ChatMonitorSettingsPage
+ if (_operationMode == ChatViewSettings::OptOut && !(_highlightAlways && flags & Message::Highlight) && _bufferIds.contains(sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::BufferIdRole).value<BufferId>()))
+ return false;
+ if (_operationMode == ChatViewSettings::OptIn && !(_highlightAlways && flags & Message::Highlight) && !_bufferIds.contains(sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::BufferIdRole).value<BufferId>()))
+ return false;
+
return true;
}
Message::Type messageType = (Message::Type)sourceModel()->data(source_index, MessageModel::TypeRole).toInt();
if(messageType & (Message::Plain | Message::Notice)) {
- QString sender = MessageFilter::data(index, role).toString();
- // we have to strip leading and traling < / >
- fields << sender.mid(1, sender.count() - 2);
+ QString sender = MessageFilter::data(index, ChatLineModel::EditRole).toString();
+ fields << sender;
}
return QString("<%1>").arg(fields.join(":"));
}
void ChatMonitorFilter::showOwnMessagesSettingChanged(const QVariant &newValue) {
_showOwnMessages = newValue.toBool();
}
+
+void ChatMonitorFilter::highlightAlwaysSettingsChanged(const QVariant &newValue) {
+ _highlightAlways = newValue.toBool();
+}
+
+void ChatMonitorFilter::operationModeSettingsChanged(const QVariant &newValue) {
+ _operationMode = newValue.toInt();
+}
+
+void ChatMonitorFilter::buffersSettingsChanged(const QVariant &newValue) {
+ _bufferIds.clear();
+ foreach (QVariant v, newValue.toList()) {
+ _bufferIds << v.value<BufferId>();
+ }
+}