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

diff --git a/src/qtui/chatmonitorfilter.cpp b/src/qtui/chatmonitorfilter.cpp
index 9817b9bc..547ea27f 100644
--- a/src/qtui/chatmonitorfilter.cpp
+++ b/src/qtui/chatmonitorfilter.cpp
@@ -20,22 +20,19 @@
 
 #include "chatmonitorfilter.h"
 
-#include "buffer.h"
 #include "client.h"
 #include "chatlinemodel.h"
 #include "networkmodel.h"
+#include "chatviewsettings.h"
 
 ChatMonitorFilter::ChatMonitorFilter(MessageModel *model, QObject *parent)
   : 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 &)));
+  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 {
@@ -75,9 +72,8 @@ QVariant ChatMonitorFilter::data(const QModelIndex &index, int role) const {
 
   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);
+    QString sender = MessageFilter::data(index, ChatLineModel::EditRole).toString();
+    fields << sender;
   }
   return QString("<%1>").arg(fields.join(":"));
 }
@@ -86,21 +82,21 @@ void ChatMonitorFilter::addShowField(int field) {
   if(_showFields & field)
     return;
 
-  QtUiSettings().setValue(QString("ChatView/%1/showFields").arg(idString()), _showFields | field); 
+  ChatViewSettings(idString()).setValue("showFields", _showFields | field); 
 }
 
 void ChatMonitorFilter::removeShowField(int field) {
   if(!(_showFields & field))
     return;
 
-  QtUiSettings().setValue(QString("ChatView/%1/showFields").arg(idString()), _showFields ^ field);
+  ChatViewSettings(idString()).setValue("showFields", _showFields ^ field);
 }
 
 void ChatMonitorFilter::setShowOwnMessages(bool show) {
   if(_showOwnMessages == show)
     return;
 
-  QtUiSettings().setValue(QString("ChatView/%1/showOwnMsgs").arg(idString()), show);
+  ChatViewSettings(idString()).setValue("showOwnMsgs", show);
 }
 
 void ChatMonitorFilter::showFieldsSettingsChanged(const QVariant &newValue) {