X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatmonitorfilter.cpp;h=e51b2cd9e1c2916c42d3071f83de7b6e49f5197e;hp=1fbab84f4a2c1edb5374dd1b638f9f9357d2abca;hb=77397f5e999830077fee13187c6a1ee044d92545;hpb=cb1b16fce88b240c735b942aad44a61a1dd3f28d

diff --git a/src/qtui/chatmonitorfilter.cpp b/src/qtui/chatmonitorfilter.cpp
index 1fbab84f..e51b2cd9 100644
--- a/src/qtui/chatmonitorfilter.cpp
+++ b/src/qtui/chatmonitorfilter.cpp
@@ -20,27 +20,53 @@
 
 #include "chatmonitorfilter.h"
 
-#include "buffer.h"
 #include "client.h"
 #include "chatlinemodel.h"
 #include "networkmodel.h"
+#include "chatviewsettings.h"
 
 ChatMonitorFilter::ChatMonitorFilter(MessageModel *model, QObject *parent)
-  : MessageFilter(model, QList<BufferId>(), parent)
+  : MessageFilter(model, parent)
 {
+  ChatViewSettings viewSettings(idString());
+  _showFields = viewSettings.value("showFields", AllFields).toInt();
+  _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 {
   Q_UNUSED(sourceParent)
 
   Message::Flags flags = (Message::Flags)sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::FlagsRole).toInt();
-  if(flags & Message::Backlog || flags & Message::Self)
+  if(flags & Message::Backlog || (!_showOwnMessages && flags & Message::Self))
     return false;
 
   Message::Type type = (Message::Type)sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::TypeRole).toInt();
   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;
 }
 
@@ -49,8 +75,6 @@ QVariant ChatMonitorFilter::data(const QModelIndex &index, int role) const {
   if(index.column() != ChatLineModel::SenderColumn || role != ChatLineModel::DisplayRole)
     return MessageFilter::data(index, role);
 
-  int showFields_ = showFields();
-
   BufferId bufid = data(index, ChatLineModel::BufferIdRole).value<BufferId>();
   if(!bufid.isValid()) {
     qDebug() << "ChatMonitorFilter::data(): chatline belongs to an invalid buffer!";
@@ -60,45 +84,49 @@ QVariant ChatMonitorFilter::data(const QModelIndex &index, int role) const {
   QModelIndex source_index = mapToSource(index);
 
   QStringList fields;
-  if(showFields_ & NetworkField) {
+  if(_showFields & NetworkField) {
     fields << Client::networkModel()->networkName(bufid);
   }
-  if(showFields_ & BufferField) {
+  if(_showFields & BufferField) {
     fields << Client::networkModel()->bufferName(bufid);
   }
 
   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::addShowField(int field) {
-  QtUiSettings s;
-  int fields = s.value(showFieldSettingId(), AllFields).toInt();
-  if(fields & field)
+  if(_showFields & field)
     return;
 
-  fields |= field;
-  s.setValue(showFieldSettingId(), fields);
-  showFieldSettingsChanged();
+  ChatViewSettings(idString()).setValue("showFields", _showFields | field); 
 }
 
 void ChatMonitorFilter::removeShowField(int field) {
-  QtUiSettings s;
-  int fields = s.value(showFieldSettingId(), AllFields).toInt();
-  if(!(fields & field))
+  if(!(_showFields & field))
     return;
 
-  fields ^= field;
-  s.setValue(showFieldSettingId(), fields);
-  showFieldSettingsChanged();
+  ChatViewSettings(idString()).setValue("showFields", _showFields ^ field);
 }
 
-void ChatMonitorFilter::showFieldSettingsChanged() {
+void ChatMonitorFilter::setShowOwnMessages(bool show) {
+  if(_showOwnMessages == show)
+    return;
+
+  ChatViewSettings(idString()).setValue("showOwnMsgs", show);
+}
+
+void ChatMonitorFilter::showFieldsSettingsChanged(const QVariant &newValue) {
+  int newFields = newValue.toInt();
+  if(_showFields == newFields)
+    return;
+
+  _showFields = newFields;
+  
   int rows = rowCount();
   if(rows == 0)
     return;
@@ -106,3 +134,21 @@ void ChatMonitorFilter::showFieldSettingsChanged() {
   emit dataChanged(index(0, ChatLineModel::SenderColumn), index(rows - 1, ChatLineModel::SenderColumn));
 }
 
+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>();
+  }
+}