X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=f45d58a1a0a3304ede73a6915d6da81d1962f143;hp=54387eccb48bb9581aee76d356fecec19f9e1588;hb=ef48d209f03f02debf369ff689002f1b32165100;hpb=92c88ffefa550de3a6ae03a7adbe605719f8349c

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index 54387ecc..f45d58a1 100644
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -31,8 +31,6 @@
 #include "iconloader.h"
 #include "networkmodel.h"
 
-#include "uisettings.h"
-
 class CheckRemovalEvent : public QEvent {
 public:
   CheckRemovalEvent(const QModelIndex &source_index) : QEvent(QEvent::User), index(source_index) {};
@@ -46,9 +44,9 @@ BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *
   : QSortFilterProxyModel(model),
     _config(0),
     _sortOrder(Qt::AscendingOrder),
-    _userOfflineIcon(SmallIcon("user-offline")),
-    _userAwayIcon(SmallIcon("user-away-extended")),
-    _userOnlineIcon(SmallIcon("user-online")),
+    _userOfflineIcon(SmallIcon("im-user-offline")),
+    _userAwayIcon(SmallIcon("im-user-away")),
+    _userOnlineIcon(SmallIcon("im-user")),
     _editMode(false),
     _enableEditMode(tr("Edit Mode"), this)
 {
@@ -57,8 +55,6 @@ BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *
 
   setDynamicSortFilter(true);
 
-  loadColors();
-
   connect(this, SIGNAL(_dataChanged(const QModelIndex &, const QModelIndex &)),
 	  this, SLOT(_q_sourceDataChanged(QModelIndex,QModelIndex)));
 
@@ -71,15 +67,6 @@ BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *
   bufferSettings.notify("ShowUserStateIcons", this, SLOT(showUserStateIconsChanged()));
 }
 
-void BufferViewFilter::loadColors() {
-  UiSettings s("QtUiStyle/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::showUserStateIconsChanged() {
   BufferSettings bufferSettings;
   _showUserStateIcons = bufferSettings.showUserStateIcons();
@@ -371,8 +358,6 @@ QVariant BufferViewFilter::data(const QModelIndex &index, int role) const {
   switch(role) {
   case Qt::DecorationRole:
     return icon(index);
-  case Qt::ForegroundRole:
-    return foreground(index);
   case Qt::CheckStateRole:
     return checkedState(index);
   default:
@@ -401,25 +386,6 @@ QVariant BufferViewFilter::icon(const QModelIndex &index) const {
   return QVariant();
 }
 
-QVariant BufferViewFilter::foreground(const QModelIndex &index) const {
-  if(config() && config()->disableDecoration())
-    return _FgColorNoActivity;
-
-  BufferInfo::ActivityLevel activity = (BufferInfo::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
-
-  if(activity & BufferInfo::Highlight)
-    return _FgColorHighlightActivity;
-  if(activity & BufferInfo::NewMessage)
-    return _FgColorNewMessageActivity;
-  if(activity & BufferInfo::OtherActivity)
-    return _FgColorOtherActivity;
-
-  if(!index.data(NetworkModel::ItemActiveRole).toBool() || index.data(NetworkModel::UserAwayRole).toBool())
-    return _FgColorInactiveActivity;
-
-  return _FgColorNoActivity;
-}
-
 QVariant BufferViewFilter::checkedState(const QModelIndex &index) const {
   if(!_editMode || !config())
     return QVariant();