X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatmonitorview.cpp;h=5efceffd28ed4a8cd77b125b882f7603aabf6629;hp=2c73e35fc4668bc314734b162f8c31c5615bdd1f;hb=e7ca039bcfdef8e22946b4402643ce107e89709c;hpb=4a5065255e652dd0c301bac0db41b7afb777ef49

diff --git a/src/qtui/chatmonitorview.cpp b/src/qtui/chatmonitorview.cpp
index 2c73e35f..5efceffd 100644
--- a/src/qtui/chatmonitorview.cpp
+++ b/src/qtui/chatmonitorview.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,6 +21,7 @@
 #include "chatmonitorview.h"
 
 #include <QAction>
+#include <QIcon>
 #include <QMenu>
 #include <QContextMenuEvent>
 
@@ -29,7 +30,6 @@
 #include "chatitem.h"
 #include "chatscene.h"
 #include "client.h"
-#include "iconloader.h"
 #include "networkmodel.h"
 #include "buffermodel.h"
 #include "messagemodel.h"
@@ -43,6 +43,9 @@ ChatMonitorView::ChatMonitorView(ChatMonitorFilter *filter, QWidget *parent)
     _filter(filter)
 {
     scene()->setSenderCutoffMode(ChatScene::CutoffLeft);
+    // The normal message prefixes get replaced by the network and buffer name.  Re-add brackets for
+    // all message types.
+    scene()->setAlwaysBracketSender(true);
     connect(Client::instance(), SIGNAL(coreConnectionStateChanged(bool)), this, SLOT(coreConnectionStateChanged(bool)));
 }
 
@@ -70,7 +73,7 @@ void ChatMonitorView::addActionsToMenu(QMenu *menu, const QPointF &pos)
     }
 
     menu->addSeparator();
-    menu->addAction(SmallIcon("configure"), tr("Configure..."), this, SLOT(showSettingsPage()));
+    menu->addAction(QIcon::fromTheme("configure"), tr("Configure..."), this, SLOT(showSettingsPage()));
 }