X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=51f8b0e5d3ccb58ac7e05e9ade4fdc878b1c1d8f;hp=49f1673a2ea538937e36aabd7a0a6870ffdf6aa3;hb=1066294489c2469323a2813b63ae4653d148bbc7;hpb=d80ba4f4bc4d3e2c8f1a86354af0c3bfce711d08

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index 49f1673a..51f8b0e5 100644
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -20,8 +20,6 @@
 
 #include "bufferviewfilter.h"
 
-#include <QColor>
-
 #include "buffermodel.h"
 #include "client.h"
 #include "networkmodel.h"
@@ -40,6 +38,17 @@ BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *
   connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(source_rowsInserted(const QModelIndex &, int, int)));
 			
   setDynamicSortFilter(true);
+
+  loadColors();
+}
+
+void BufferViewFilter::loadColors() {
+  UiSettings s("QtUi/Colors");
+  _FgColorInactiveActivity = s.value("inactiveActivityFG", QVariant(QColor(Qt::gray))).value<QColor>();
+  _FgColorNoActivity = s.value("noActivityFG", QVariant(QColor(Qt::black))).value<QColor>();
+  _FgColorHighlightActivity = s.value("highlightActivityFG", QVariant(QColor(Qt::magenta))).value<QColor>();
+  _FgColorNewMessageActivity = s.value("newMessageActivityFG", QVariant(QColor(Qt::green))).value<QColor>();
+  _FgColorOtherActivity = s.value("otherActivityFG", QVariant(QColor(Qt::darkGreen))).value<QColor>();
 }
 
 void BufferViewFilter::setConfig(BufferViewConfig *config) {
@@ -204,7 +213,6 @@ bool BufferViewFilter::lessThan(const QModelIndex &source_left, const QModelInde
 }
 
 bool BufferViewFilter::bufferLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const {
-  return QSortFilterProxyModel::lessThan(source_left, source_right);
   BufferId leftBufferId = sourceModel()->data(source_left, NetworkModel::BufferIdRole).value<BufferId>();
   BufferId rightBufferId = sourceModel()->data(source_right, NetworkModel::BufferIdRole).value<BufferId>();
   if(config()) {
@@ -231,31 +239,23 @@ 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 inactiveActivity;
+    return _FgColorInactiveActivity;
 
   Buffer::ActivityLevel activity = (Buffer::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
 
   if(activity & Buffer::Highlight)
-    return highlightActivity;
+    return _FgColorHighlightActivity;
   if(activity & Buffer::NewMessage)
-    return newMessageActivity;
+    return _FgColorNewMessageActivity;
   if(activity & Buffer::OtherActivity)
-    return otherActivity;
-
-  return noActivity;
+    return _FgColorOtherActivity;
 
+  return _FgColorNoActivity;
 }
 
 void BufferViewFilter::source_rowsInserted(const QModelIndex &parent, int start, int end) {
-  if(parent.data(NetworkModel::ItemTypeRole) != NetworkModel::BufferItemType)
+  if(parent.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
     return;
 
   if(!config() || !config()->addNewBuffersAutomatically())