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

diff --git a/src/qtui/chatmonitorfilter.cpp b/src/qtui/chatmonitorfilter.cpp
index 9c7082b1..e30faa59 100644
--- a/src/qtui/chatmonitorfilter.cpp
+++ b/src/qtui/chatmonitorfilter.cpp
@@ -20,55 +20,102 @@
 
 #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 {
   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))
+  if(flags & Message::Backlog || (!_showOwnMessages && 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";
+  Message::Type type = (Message::Type)sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::TypeRole).toInt();
+  if(!(type & (Message::Plain | Message::Notice | Message::Action)))
+    return false;
+
+  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)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();
 }