X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatmonitorfilter.cpp;h=d3c0810a263d199019914c169d031a37c5071ad0;hb=5fc6f7e2d63b45770574260afd6ce535e9548d23;hp=db0c8892aae5f487925f12b44ef501ba6b0f6d2f;hpb=a4cba7a7497d8b71942d5f5e81ef3c04f5c6bad5;p=quassel.git

diff --git a/src/qtui/chatmonitorfilter.cpp b/src/qtui/chatmonitorfilter.cpp
index db0c8892..d3c0810a 100644
--- a/src/qtui/chatmonitorfilter.cpp
+++ b/src/qtui/chatmonitorfilter.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -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();
+}