X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatmonitorfilter.cpp;h=ef68a9cd21f920ed77006c10cf0320c14b596580;hb=b18eac231c8a124a4e3a0792792343863eb10ab2;hp=2208f2b60d40db88902dfbaf9367bb2232329525;hpb=496d77836f54719491f2a117dbd2fb3e56def0b2;p=quassel.git

diff --git a/src/qtui/chatmonitorfilter.cpp b/src/qtui/chatmonitorfilter.cpp
index 2208f2b6..ef68a9cd 100644
--- a/src/qtui/chatmonitorfilter.cpp
+++ b/src/qtui/chatmonitorfilter.cpp
@@ -20,31 +20,87 @@
 
 #include "chatmonitorfilter.h"
 
+#include "buffer.h"
+#include "client.h"
 #include "chatlinemodel.h"
+#include "networkmodel.h"
 
 ChatMonitorFilter::ChatMonitorFilter(MessageModel *model, QObject *parent)
-: MessageFilter(model, QList<BufferId>(), parent)
+  : MessageFilter(model, QList<BufferId>(), parent),
+    _initTime(QDateTime::currentDateTime())
 {
-  _initTime = QDateTime::currentDateTime();
-
 }
 
 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))
+    return false;
+
   QDateTime msgTime = sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::TimestampRole).toDateTime();
   return msgTime > _initTime;
 }
 
-QString ChatMonitorFilter::idString() const {
-  return "ChatMonitor";
-}
-
 // 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) {
+  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!";
+    return QVariant();
+  }
 
+  QModelIndex source_index = mapToSource(index);
+  
+  QStringList fields;
+  if(showFields_ & NetworkField) {
+    fields << Client::networkModel()->networkName(bufid);
+  }
+  if(showFields_ & BufferField) {
+    fields << Client::networkModel()->bufferName(bufid);
   }
-  return MessageFilter::data(index, role);
 
+  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) {
+  QtUiSettings s;
+  int fields = s.value(showFieldSettingId(), AllFields).toInt();
+  if(fields & field)
+    return;
+
+  fields |= field;
+  s.setValue(showFieldSettingId(), fields);
+  showFieldSettingsChanged();
+}
+
+void ChatMonitorFilter::removeShowField(int field) {
+  QtUiSettings s;
+  int fields = s.value(showFieldSettingId(), AllFields).toInt();
+  if(!(fields & field))
+    return;
+
+  fields ^= field;
+  s.setValue(showFieldSettingId(), fields);
+  showFieldSettingsChanged();
+}
+
+void ChatMonitorFilter::showFieldSettingsChanged() {
+  int rows = rowCount();
+  if(rows == 0)
+    return;
+
+  emit dataChanged(index(0, ChatLineModel::SenderColumn), index(rows - 1, ChatLineModel::SenderColumn));
+}
+