X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatmonitorfilter.cpp;h=5cd366e1b880965cd3fe69956df84c974871ef32;hb=faa66f7e00aeeea661b46f01bdfc715567eef669;hp=e3dbd63b922ad113e867abaedd553ade2dd9e50f;hpb=0a43227b8cd44625f4881cc1545d42c8c8a4876c;p=quassel.git

diff --git a/src/qtui/chatmonitorfilter.cpp b/src/qtui/chatmonitorfilter.cpp
index e3dbd63b..5cd366e1 100644
--- a/src/qtui/chatmonitorfilter.cpp
+++ b/src/qtui/chatmonitorfilter.cpp
@@ -29,6 +29,12 @@
 ChatMonitorFilter::ChatMonitorFilter(MessageModel *model, QObject *parent)
     : MessageFilter(model, parent)
 {
+    // Global configuration
+    ChatViewSettings defaultSettings;
+    _showSenderBrackets = defaultSettings.showSenderBrackets();
+    defaultSettings.notify("ShowSenderBrackets", this, SLOT(showSenderBracketsSettingChanged(const QVariant &)));
+
+    // Chat Monitor specific configuration
     ChatViewSettings viewSettings(idString());
     _showFields = viewSettings.value("ShowFields", AllFields).toInt();
     _showOwnMessages = viewSettings.value("ShowOwnMsgs", true).toBool();
@@ -123,7 +129,10 @@ QVariant ChatMonitorFilter::data(const QModelIndex &index, int role) const
         QString sender = MessageFilter::data(index, ChatLineModel::EditRole).toString();
         fields << sender;
     }
-    return QString("<%1>").arg(fields.join(":"));
+    if (_showSenderBrackets)
+        return QString("<%1>").arg(fields.join(":"));
+    else
+        return QString("%1").arg(fields.join(":"));
 }
 
 
@@ -204,3 +213,8 @@ void ChatMonitorFilter::showBacklogSettingChanged(const QVariant &newValue) {
 void ChatMonitorFilter::includeReadSettingChanged(const QVariant &newValue) {
     _includeRead = newValue.toBool();
 }
+
+void ChatMonitorFilter::showSenderBracketsSettingChanged(const QVariant &newValue)
+{
+    _showSenderBrackets = newValue.toBool();
+}