X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatmonitorfilter.cpp;h=c93c235e77ea359ccbe2fe37cd250202606d31eb;hp=3654867fa9c00302e2ea9504611bcd7cb0553510;hb=0f16a547d17c536cc567bfb2746824bfca3424cd;hpb=32eadb49053bb3d68fe60a1773a79abd9e86c5f4

diff --git a/src/qtui/chatmonitorfilter.cpp b/src/qtui/chatmonitorfilter.cpp
index 3654867f..c93c235e 100644
--- a/src/qtui/chatmonitorfilter.cpp
+++ b/src/qtui/chatmonitorfilter.cpp
@@ -20,39 +20,100 @@
 
 #include "chatmonitorfilter.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(showFieldsSettingsChanged(const QVariant &)));
+  viewSettings.notify("showOwnMsgs", this, SLOT(showOwnMessagesSettingChanged(const QVariant &)));
 }
 
 bool ChatMonitorFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const {
-  QDateTime msgTime = sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::TimestampRole).toDateTime();
-  return msgTime > _initTime;
-}
+  Q_UNUSED(sourceParent)
+
+  Message::Flags flags = (Message::Flags)sourceModel()->data(sourceModel()->index(sourceRow, 0), 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();
+  if(!(type & (Message::Plain | Message::Notice | Message::Action)))
+    return false;
 
-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);
-    if(bufid.isValid) {
-      const Network *net = Client::networkModel()->networkByIndex(Client::networkModel()->bufferIndex(bufid));
-      if(!net) {
-        qDebug() << "invalid net!";
-        return QVariant();
-      }
-
-  */
+  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)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);
+  }
+  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::showFieldsSettingsChanged(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();
 }