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

diff --git a/src/qtui/chatmonitorfilter.cpp b/src/qtui/chatmonitorfilter.cpp
index e51b2cd9..b46dd29c 100644
--- a/src/qtui/chatmonitorfilter.cpp
+++ b/src/qtui/chatmonitorfilter.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-*   Copyright (C) 2005-08 by the Quassel Project                          *
+*   Copyright (C) 2005-09 by the Quassel Project                          *
 *   devel@quassel-irc.org                                                 *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
@@ -24,49 +24,63 @@
 #include "chatlinemodel.h"
 #include "networkmodel.h"
 #include "chatviewsettings.h"
+#include "clientignorelistmanager.h"
 
 ChatMonitorFilter::ChatMonitorFilter(MessageModel *model, QObject *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 &)));
+  _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 highlightAlwaysSettingsId = "HighlightAlways";
+  QString showHighlightsSettingsId = "ShowHighlights";
   QString operationModeSettingsId = "OperationMode";
   QString buffersSettingsId = "Buffers";
 
-  _highlightAlways = viewSettings.value(highlightAlwaysSettingsId, false).toBool();
+  _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(highlightAlwaysSettingsId, this, SLOT(highlightAlwaysSettingsChanged(const QVariant &)));
-  viewSettings.notify(operationModeSettingsId, this, SLOT(operationModeSettingsChanged(const QVariant &)));
-  viewSettings.notify(buffersSettingsId, this, SLOT(buffersSettingsChanged(const QVariant &)));
+  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 {
   Q_UNUSED(sourceParent)
 
-  Message::Flags flags = (Message::Flags)sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::FlagsRole).toInt();
+  QModelIndex source_index = sourceModel()->index(sourceRow, 0);
+
+  Message::Flags flags = (Message::Flags)source_index.data(MessageModel::FlagsRole).toInt();
   if(flags & Message::Backlog || (!_showOwnMessages && flags & Message::Self))
     return false;
 
-  Message::Type type = (Message::Type)sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::TypeRole).toInt();
+  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 && !(_highlightAlways && flags & Message::Highlight) &&  _bufferIds.contains(sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::BufferIdRole).value<BufferId>()))
+  if(_operationMode == ChatViewSettings::OptOut
+    && !(_showHighlights && flags & Message::Highlight)
+    &&  _bufferIds.contains(bufferId))
     return false;
-  if (_operationMode == ChatViewSettings::OptIn && !(_highlightAlways && flags & Message::Highlight) && !_bufferIds.contains(sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::BufferIdRole).value<BufferId>()))
+  if(_operationMode == ChatViewSettings::OptIn
+    && !(_showHighlights && flags & Message::Highlight)
+    && !_bufferIds.contains(bufferId))
     return false;
 
+  // ignorelist handling
+  // only match if message is not flagged as server msg
+  if(!(flags & Message::ServerMsg) && Client::ignoreListManager()
+      && Client::ignoreListManager()->match(source_index.data(MessageModel::MessageRole).value<Message>(), Client::networkModel()->networkName(bufferId)))
+    return false;
   return true;
 }
 
@@ -91,7 +105,7 @@ QVariant ChatMonitorFilter::data(const QModelIndex &index, int role) const {
     fields << Client::networkModel()->bufferName(bufid);
   }
 
-  Message::Type messageType = (Message::Type)sourceModel()->data(source_index, MessageModel::TypeRole).toInt();
+  Message::Type messageType = (Message::Type)source_index.data(MessageModel::TypeRole).toInt();
   if(messageType & (Message::Plain | Message::Notice)) {
     QString sender = MessageFilter::data(index, ChatLineModel::EditRole).toString();
     fields << sender;
@@ -103,30 +117,30 @@ void ChatMonitorFilter::addShowField(int field) {
   if(_showFields & field)
     return;
 
-  ChatViewSettings(idString()).setValue("showFields", _showFields | field); 
+  ChatViewSettings(idString()).setValue("ShowFields", _showFields | field);
 }
 
 void ChatMonitorFilter::removeShowField(int field) {
   if(!(_showFields & field))
     return;
 
-  ChatViewSettings(idString()).setValue("showFields", _showFields ^ field);
+  ChatViewSettings(idString()).setValue("ShowFields", _showFields ^ field);
 }
 
 void ChatMonitorFilter::setShowOwnMessages(bool show) {
   if(_showOwnMessages == show)
     return;
 
-  ChatViewSettings(idString()).setValue("showOwnMsgs", 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;
@@ -138,17 +152,18 @@ void ChatMonitorFilter::showOwnMessagesSettingChanged(const QVariant &newValue)
   _showOwnMessages = newValue.toBool();
 }
 
-void ChatMonitorFilter::highlightAlwaysSettingsChanged(const QVariant &newValue) {
-  _highlightAlways = newValue.toBool();
+void ChatMonitorFilter::showHighlightsSettingChanged(const QVariant &newValue) {
+  _showHighlights = newValue.toBool();
 }
 
-void ChatMonitorFilter::operationModeSettingsChanged(const QVariant &newValue) {
+void ChatMonitorFilter::operationModeSettingChanged(const QVariant &newValue) {
   _operationMode = newValue.toInt();
 }
 
-void ChatMonitorFilter::buffersSettingsChanged(const QVariant &newValue) {
+void ChatMonitorFilter::buffersSettingChanged(const QVariant &newValue) {
   _bufferIds.clear();
   foreach (QVariant v, newValue.toList()) {
     _bufferIds << v.value<BufferId>();
   }
+  invalidateFilter();
 }