X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=a4ece414ffa8907f8919c3743fe3f5206c3c4492;hb=b5385b3ddf6f0e8df8f0af7275b59dcc1fcd0ed1;hp=a9f34fd428a197c5136b2b5f323146e37f482216;hpb=5b560ec1a01349562ac58051ca7e7fa899d4b994;p=quassel.git

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index a9f34fd4..a4ece414 100644
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -24,6 +24,8 @@
 
 #include "networkmodel.h"
 
+#include "uisettings.h"
+
 /*****************************************
 * The Filter for the Tree View
 *****************************************/
@@ -161,20 +163,25 @@ QVariant BufferViewFilter::data(const QModelIndex &index, int role) const {
 }
 
 QVariant BufferViewFilter::foreground(const QModelIndex &index) const {
+  UiSettings s("QtUi/Colors");
+  QVariant inactiveActivity = s.value("inactiveActivityFG", QVariant(QColor(Qt::gray)));
+  QVariant noActivity = s.value("noActivityFG", QVariant(QColor(Qt::black)));
+  QVariant highlightActivity = s.value("highlightActivityFG", QVariant(QColor(Qt::magenta)));
+  QVariant newMessageActivity = s.value("newMessageActivityFG", QVariant(QColor(Qt::green)));
+  QVariant otherActivity = s.value("otherActivityFG", QVariant(QColor(Qt::darkGreen)));
+
   if(!index.data(NetworkModel::ItemActiveRole).toBool())
-    return QColor(Qt::gray);
+    return inactiveActivity;
 
-  BufferItem::ActivityLevel activity = (BufferItem::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
+  Buffer::ActivityLevel activity = (Buffer::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
 
-  if(activity & BufferItem::Highlight)
-    return QColor(Qt::magenta);
-  if(activity & BufferItem::NewMessage)
-    return QColor(Qt::green);
-  if(activity & BufferItem::OtherActivity)
-    return QColor(Qt::darkGreen);
-  
-  return QColor(Qt::black);
-  
-  // FIXME:: make colors configurable;
+  if(activity & Buffer::Highlight)
+    return highlightActivity;
+  if(activity & Buffer::NewMessage)
+    return newMessageActivity;
+  if(activity & Buffer::OtherActivity)
+    return otherActivity;
+
+  return noActivity;
 
 }