chatmonitor shows own messages again (per default) (configurable via context menu)

[quassel.git] / src / qtui / chatmonitorfilter.cpp

diff --git a/src/qtui/chatmonitorfilter.cpp b/src/qtui/chatmonitorfilter.cpp
index d11378d..9817b9b 100644 (file)
--- a/src/qtui/chatmonitorfilter.cpp
+++ b/src/qtui/chatmonitorfilter.cpp
@@ -26,20 +26,30 @@
 #include "networkmodel.h"
 
 ChatMonitorFilter::ChatMonitorFilter(MessageModel *model, QObject *parent)
-  : MessageFilter(model, QList<BufferId>(), parent),
-    _initTime(QDateTime::currentDateTime())
+  : MessageFilter(model, parent)
 {
+  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;
+
+  Message::Type type = (Message::Type)sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::TypeRole).toInt();
+  if(!(type & (Message::Plain | Message::Notice | Message::Action)))
     return false;
 
-  QDateTime msgTime = sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::TimestampRole).toDateTime();
-  return msgTime > _initTime;
+  return true;
 }
 
 // override this to inject display of network and channel
@@ -47,48 +57,59 @@ QVariant ChatMonitorFilter::data(const QModelIndex &index, int role) const {
   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) {
+  if(_showFields & NetworkField) {
     fields << Client::networkModel()->networkName(bufid);
   }
-  if(showFields_ & BufferField) {
+  if(_showFields & BufferField) {
     fields << Client::networkModel()->bufferName(bufid);
   }
-  fields << MessageFilter::data(index, role).toString().mid(1);
-  return QString("<%1").arg(fields.join(":"));
+
+  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)
+  if(_showFields & field)
     return;
 
-  fields |= field;
-  s.setValue(showFieldSettingId(), fields);
-  showFieldSettingsChanged();
+  QtUiSettings().setValue(QString("ChatView/%1/showFields").arg(idString()), _showFields | field); 
 }
 
 void ChatMonitorFilter::removeShowField(int field) {
-  QtUiSettings s;
-  int fields = s.value(showFieldSettingId(), AllFields).toInt();
-  if(!(fields & field))
+  if(!(_showFields & field))
+    return;
+
+  QtUiSettings().setValue(QString("ChatView/%1/showFields").arg(idString()), _showFields ^ field);
+}
+
+void ChatMonitorFilter::setShowOwnMessages(bool show) {
+  if(_showOwnMessages == show)
     return;
 
-  fields ^= field;
-  s.setValue(showFieldSettingId(), fields);
-  showFieldSettingsChanged();
+  QtUiSettings().setValue(QString("ChatView/%1/showOwnMsgs").arg(idString()), show);
 }
 
-void ChatMonitorFilter::showFieldSettingsChanged() {
+void ChatMonitorFilter::showFieldsSettingsChanged(const QVariant &newValue) {
+  int newFields = newValue.toInt();
+  if(_showFields == newFields)
+    return;
+
+  _showFields = newFields;
+  
   int rows = rowCount();
   if(rows == 0)
     return;
@@ -96,3 +117,6 @@ void ChatMonitorFilter::showFieldSettingsChanged() {
   emit dataChanged(index(0, ChatLineModel::SenderColumn), index(rows - 1, ChatLineModel::SenderColumn));
 }
 
+void ChatMonitorFilter::showOwnMessagesSettingChanged(const QVariant &newValue) {
+  _showOwnMessages = newValue.toBool();
+}