X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=a4ece414ffa8907f8919c3743fe3f5206c3c4492;hp=22b514134bcefb6a2b00716b843096dd4729cd1b;hb=bde6f40f73d85cff300b133a722e4f59bff77f84;hpb=3411a31283e5390ba5c88b918706df4da7a4bacf

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index 22b51413..a4ece414 100644
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -164,26 +164,24 @@ QVariant BufferViewFilter::data(const QModelIndex &index, int role) const {
 
 QVariant BufferViewFilter::foreground(const QModelIndex &index) const {
   UiSettings s("QtUi/Colors");
-  QVariant inactiveActivity = s.value("inactiveActivity", QVariant(QColor(Qt::gray)));
-  QVariant noActivity = s.value("noActivity", QVariant(QColor(Qt::black)));
-  QVariant highlightActivity = s.value("highlightActivity", QVariant(QColor(Qt::magenta)));
-  QVariant newMessageActivity = s.value("newMessageActivity", QVariant(QColor(Qt::green)));
-  QVariant otherActivity = s.value("otherActivity", QVariant(QColor(Qt::darkGreen)));
+  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 inactiveActivity.value<QColor>();
+    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 highlightActivity.value<QColor>();
-  if(activity & BufferItem::NewMessage)
-    return newMessageActivity.value<QColor>();
-  if(activity & BufferItem::OtherActivity)
-    return otherActivity.value<QColor>();
-  
-  return noActivity.value<QColor>();
-  
-  // FIXME:: make colors configurable;
+  if(activity & Buffer::Highlight)
+    return highlightActivity;
+  if(activity & Buffer::NewMessage)
+    return newMessageActivity;
+  if(activity & Buffer::OtherActivity)
+    return otherActivity;
+
+  return noActivity;
 
 }