X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatmonitorfilter.cpp;h=001e6c5f25fce4b7006b12898a71f4ee09ad1799;hp=9c7082b19564c38bf4ee97d9471750c444a91c44;hb=236dda81632fa792e788d45b0f4f31b973823f7f;hpb=3033999cfae93d1cc513bfb7494e0bb578457110

diff --git a/src/qtui/chatmonitorfilter.cpp b/src/qtui/chatmonitorfilter.cpp
index 9c7082b1..001e6c5f 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  *
@@ -20,55 +20,141 @@
 
 #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)
 {
-  _initTime = QDateTime::currentDateTime();
+  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 {
   Q_UNUSED(sourceParent)
-  Message::Type type = (Message::Type)sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::TypeRole).toInt();
-  Message::Flags flags = (Message::Flags)sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::FlagsRole).toInt();
-  if(!((type & (Message::Plain | Message::Notice | Message::Action)) || flags & Message::Self))
+
+  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)source_index.data(MessageModel::TypeRole).toInt();
+  if(!(type & (Message::Plain | Message::Notice | Message::Action)))
+    return false;
+
+  // ChatMonitorSettingsPage
+  if(_operationMode == ChatViewSettings::OptOut
+    && !(_showHighlights && flags & Message::Highlight)
+    &&  _bufferIds.contains(source_index.data(MessageModel::BufferIdRole).value<BufferId>()))
+    return false;
+  if(_operationMode == ChatViewSettings::OptIn
+    && !(_showHighlights && flags & Message::Highlight)
+    && !_bufferIds.contains(source_index.data(MessageModel::BufferIdRole).value<BufferId>()))
     return false;
-  QDateTime msgTime = sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::TimestampRole).toDateTime();
-  return msgTime > _initTime;
-}
 
-QString ChatMonitorFilter::idString() const {
-  return "ChatMonitor";
+  return true;
 }
 
 // override this to inject display of network and channel
 QVariant ChatMonitorFilter::data(const QModelIndex &index, int role) const {
-  if(index.column() != ChatLineModel::SenderColumn) return MessageFilter::data(index, role);
-  if(role == ChatLineModel::DisplayRole) {
-    BufferId bufid = data(index, ChatLineModel::BufferIdRole).value<BufferId>();
-    if(bufid.isValid()) {
-      Buffer *buf = Client::buffer(bufid);
-      if(!buf) {
-        qDebug() << "invalid buffer!";
-        return QVariant();
-      }
-      const Network *net = Client::networkModel()->networkByIndex(Client::networkModel()->bufferIndex(bufid));
-      if(!net) {
-        qDebug() << "invalid net!";
-        return QVariant();
-      }
-      QString result = QString("<%1:%2:%3").arg(net->networkName())
-                                            .arg(buf->bufferInfo().bufferName())
-                                            .arg(MessageFilter::data(index, role).toString().mid(1));
-      return result;
-    }
+  if(index.column() != ChatLineModel::SenderColumn || role != ChatLineModel::DisplayRole)
+    return MessageFilter::data(index, role);
 
+  BufferId bufid = data(index, ChatLineModel::BufferIdRole).value<BufferId>();
+  if(!bufid.isValid()) {
+    qDebug() << "ChatMonitorFilter::data(): chatline belongs to an invalid buffer!";
+    return QVariant();
   }
-  return MessageFilter::data(index, role);
 
+  QModelIndex source_index = mapToSource(index);
+
+  QStringList fields;
+  if(_showFields & NetworkField) {
+    fields << Client::networkModel()->networkName(bufid);
+  }
+  if(_showFields & BufferField) {
+    fields << Client::networkModel()->bufferName(bufid);
+  }
+
+  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;
+  }
+  return QString("<%1>").arg(fields.join(":"));
+}
+
+void ChatMonitorFilter::addShowField(int field) {
+  if(_showFields & field)
+    return;
+
+  ChatViewSettings(idString()).setValue("ShowFields", _showFields | field);
+}
+
+void ChatMonitorFilter::removeShowField(int field) {
+  if(!(_showFields & field))
+    return;
+
+  ChatViewSettings(idString()).setValue("ShowFields", _showFields ^ field);
+}
+
+void ChatMonitorFilter::setShowOwnMessages(bool show) {
+  if(_showOwnMessages == show)
+    return;
+
+  ChatViewSettings(idString()).setValue("ShowOwnMsgs", show);
+}
+
+void ChatMonitorFilter::showFieldsSettingChanged(const QVariant &newValue) {
+  int newFields = newValue.toInt();
+  if(_showFields == newFields)
+    return;
+
+  _showFields = newFields;
+
+  int rows = rowCount();
+  if(rows == 0)
+    return;
+
+  emit dataChanged(index(0, ChatLineModel::SenderColumn), index(rows - 1, ChatLineModel::SenderColumn));
+}
+
+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>();
+  }
 }