X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatmonitorfilter.cpp;h=bbf391892f0f036674f06c20866c1e5e07bd7b96;hp=e30faa595256374d43bb5f7d7fbcbf029e992673;hb=38880d99a159fd670915d910bcb2c4280b3efc51;hpb=332069a1830ed3a055ac6f2d7661bae1cc83e40c

diff --git a/src/qtui/chatmonitorfilter.cpp b/src/qtui/chatmonitorfilter.cpp
index e30faa59..bbf39189 100644
--- a/src/qtui/chatmonitorfilter.cpp
+++ b/src/qtui/chatmonitorfilter.cpp
@@ -23,18 +23,31 @@
 #include "client.h"
 #include "chatlinemodel.h"
 #include "networkmodel.h"
+#include "chatviewsettings.h"
 
 ChatMonitorFilter::ChatMonitorFilter(MessageModel *model, QObject *parent)
   : MessageFilter(model, parent)
 {
-  QtUiSettings qtUiSettings;
-  QString showFieldSettingId = QString("ChatView/%1/showFields").arg(idString());
-  QString showOwnMessagesSettingId = QString("ChatView/%1/showOwnMsgs").arg(idString());
-
-  _showFields = qtUiSettings.value(showFieldSettingId, AllFields).toInt();
-  _showOwnMessages = qtUiSettings.value(showOwnMessagesSettingId, true).toBool();
-  qtUiSettings.notify(showFieldSettingId, this, SLOT(showFieldsSettingsChanged(const QVariant &)));
-  qtUiSettings.notify(showOwnMessagesSettingId, this, SLOT(showOwnMessagesSettingChanged(const QVariant &)));
+  ChatViewSettings viewSettings(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 &)));
+
+  // ChatMonitorSettingsPage
+  QString showHighlightsSettingsId = "ShowHighlights";
+  QString operationModeSettingsId = "OperationMode";
+  QString buffersSettingsId = "Buffers";
+
+  _showHighlights = viewSettings.value(showHighlightsSettingsId, 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(showHighlightsSettingsId, this, SLOT(showHighlightsSettingChanged(const QVariant &)));
+  viewSettings.notify(operationModeSettingsId, this, SLOT(operationModeSettingChanged(const QVariant &)));
+  viewSettings.notify(buffersSettingsId, this, SLOT(buffersSettingChanged(const QVariant &)));
 }
 
 bool ChatMonitorFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const {
@@ -48,6 +61,16 @@ bool ChatMonitorFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourc
   if(!(type & (Message::Plain | Message::Notice | Message::Action)))
     return false;
 
+  // ChatMonitorSettingsPage
+  if(_operationMode == ChatViewSettings::OptOut
+    && !(_showHighlights && flags & Message::Highlight)
+    &&  _bufferIds.contains(sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::BufferIdRole).value<BufferId>()))
+    return false;
+  if(_operationMode == ChatViewSettings::OptIn
+    && !(_showHighlights && flags & Message::Highlight)
+    && !_bufferIds.contains(sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::BufferIdRole).value<BufferId>()))
+    return false;
+
   return true;
 }
 
@@ -74,9 +97,8 @@ QVariant ChatMonitorFilter::data(const QModelIndex &index, int role) const {
 
   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(":"));
 }
@@ -85,30 +107,30 @@ void ChatMonitorFilter::addShowField(int field) {
   if(_showFields & field)
     return;
 
-  QtUiSettings().setValue(QString("ChatView/%1/showFields").arg(idString()), _showFields | field); 
+  ChatViewSettings(idString()).setValue("ShowFields", _showFields | field);
 }
 
 void ChatMonitorFilter::removeShowField(int field) {
   if(!(_showFields & field))
     return;
 
-  QtUiSettings().setValue(QString("ChatView/%1/showFields").arg(idString()), _showFields ^ field);
+  ChatViewSettings(idString()).setValue("ShowFields", _showFields ^ field);
 }
 
 void ChatMonitorFilter::setShowOwnMessages(bool show) {
   if(_showOwnMessages == show)
     return;
 
-  QtUiSettings().setValue(QString("ChatView/%1/showOwnMsgs").arg(idString()), show);
+  ChatViewSettings(idString()).setValue("ShowOwnMsgs", show);
 }
 
-void ChatMonitorFilter::showFieldsSettingsChanged(const QVariant &newValue) {
+void ChatMonitorFilter::showFieldsSettingChanged(const QVariant &newValue) {
   int newFields = newValue.toInt();
   if(_showFields == newFields)
     return;
 
   _showFields = newFields;
-  
+
   int rows = rowCount();
   if(rows == 0)
     return;
@@ -119,3 +141,18 @@ void ChatMonitorFilter::showFieldsSettingsChanged(const QVariant &newValue) {
 void ChatMonitorFilter::showOwnMessagesSettingChanged(const QVariant &newValue) {
   _showOwnMessages = newValue.toBool();
 }
+
+void ChatMonitorFilter::showHighlightsSettingChanged(const QVariant &newValue) {
+  _showHighlights = newValue.toBool();
+}
+
+void ChatMonitorFilter::operationModeSettingChanged(const QVariant &newValue) {
+  _operationMode = newValue.toInt();
+}
+
+void ChatMonitorFilter::buffersSettingChanged(const QVariant &newValue) {
+  _bufferIds.clear();
+  foreach (QVariant v, newValue.toList()) {
+    _bufferIds << v.value<BufferId>();
+  }
+}