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

diff --git a/src/qtui/chatmonitorfilter.cpp b/src/qtui/chatmonitorfilter.cpp
index 2208f2b6..9817b9bc 100644
--- a/src/qtui/chatmonitorfilter.cpp
+++ b/src/qtui/chatmonitorfilter.cpp
@@ -20,31 +20,103 @@
 
 #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, parent)
 {
-  _initTime = QDateTime::currentDateTime();
+  QtUiSettings qtUiSettings;
+  QString showFieldSettingId = QString("ChatView/%1/showFields").arg(idString());
+  QString showOwnMessagesSettingId = QString("ChatView/%1/showOwnMsgs").arg(idString());
 
+  _showFields = qtUiSettings.value(showFieldSettingId, AllFields).toInt();
+  _showOwnMessages = qtUiSettings.value(showOwnMessagesSettingId, true).toBool();
+  qtUiSettings.notify(showFieldSettingId, this, SLOT(showFieldsSettingsChanged(const QVariant &)));
+  qtUiSettings.notify(showOwnMessagesSettingId, 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) {
+  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();
+  }
+
+  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) {
+  if(_showFields & field)
+    return;
+
+  QtUiSettings().setValue(QString("ChatView/%1/showFields").arg(idString()), _showFields | field); 
+}
+
+void ChatMonitorFilter::removeShowField(int field) {
+  if(!(_showFields & field))
+    return;
+
+  QtUiSettings().setValue(QString("ChatView/%1/showFields").arg(idString()), _showFields ^ field);
+}
+
+void ChatMonitorFilter::setShowOwnMessages(bool show) {
+  if(_showOwnMessages == show)
+    return;
+
+  QtUiSettings().setValue(QString("ChatView/%1/showOwnMsgs").arg(idString()), 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();
 }