X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=af1686e0a8033607332b14187f203242044fd611;hp=ac4bae5daa240c4d03203562cfcc34bce1b0e595;hb=aa40491595ffec54ba340a9850d99dc14d920eb3;hpb=770b7ef54b03f3ebd1e29a58b4757505e1809b2d

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index ac4bae5d..af1686e0 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
 *****************************************/
@@ -101,13 +103,13 @@ void BufferViewFilter::removeBuffer(const QModelIndex &index) {
 
 
 bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const {
-  BufferItem::Type bufferType = (BufferItem::Type) source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt();
+  BufferInfo::Type bufferType = (BufferInfo::Type) source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt();
   
-  if((mode & NoChannels) && bufferType == BufferItem::ChannelType)
+  if((mode & NoChannels) && bufferType == BufferInfo::ChannelBuffer)
     return false;
-  if((mode & NoQueries) && bufferType == BufferItem::QueryType)
+  if((mode & NoQueries) && bufferType == BufferInfo::QueryBuffer)
     return false;
-  if((mode & NoServers) && bufferType == BufferItem::StatusType)
+  if((mode & NoServers) && bufferType == BufferInfo::StatusBuffer)
     return false;
 
 //   bool isActive = source_bufferIndex.data(NetworkModel::BufferActiveRole).toBool();
@@ -161,19 +163,26 @@ 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.value<QColor>();
 
-  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);
+  if(activity & Buffer::Highlight)
+    return highlightActivity.value<QColor>();
+  if(activity & Buffer::NewMessage)
+    return newMessageActivity.value<QColor>();
+  if(activity & Buffer::OtherActivity)
+    return otherActivity.value<QColor>();
   
-  return QColor(Qt::black);
+  return noActivity.value<QColor>();
   
   // FIXME:: make colors configurable;