X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=2de916b066da9c2e8f1b290ffc55808d1a4f4135;hp=d3a1b52160f6384a36e275a8b0227b3116a6f320;hb=eba1be2f198709d25b9d2e1e48023dfadecd60db;hpb=2a92703a6941fb7aa85f5876c51b360878475f01

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index d3a1b521..2de916b0 100644
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -24,8 +24,10 @@
 #include <QPalette>
 #include <QBrush>
 
+#include "bufferinfo.h"
 #include "buffermodel.h"
 #include "client.h"
+#include "iconloader.h"
 #include "networkmodel.h"
 
 #include "uisettings.h"
@@ -42,7 +44,10 @@ public:
 BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *config)
   : QSortFilterProxyModel(model),
     _config(0),
-    _sortOrder(Qt::AscendingOrder)
+    _sortOrder(Qt::AscendingOrder),
+    _userOfflineIcon(SmallIcon("user-offline")),
+    _userAwayIcon(SmallIcon("user-away")),
+    _userOnlineIcon(SmallIcon("user-online"))
 {
   setConfig(config);
   setSourceModel(model);
@@ -202,7 +207,7 @@ bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex)
     // add the buffer if...
     if(config()->isInitialized() && !config()->removedBuffers().contains(bufferId) // it hasn't been manually removed and either
        && ((config()->addNewBuffersAutomatically() && !config()->temporarilyRemovedBuffers().contains(bufferId)) // is totally unknown to us (a new buffer)...
-	   || (config()->temporarilyRemovedBuffers().contains(bufferId) && activityLevel > Buffer::OtherActivity))) { // or was just temporarily hidden and has a new message waiting for us.
+	   || (config()->temporarilyRemovedBuffers().contains(bufferId) && activityLevel > BufferInfo::OtherActivity))) { // or was just temporarily hidden and has a new message waiting for us.
       addBuffer(bufferId);
     }
     // note: adding the buffer to the valid list does not temper with the following filters ("show only channels" and stuff)
@@ -215,13 +220,15 @@ bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex)
   if(!(config()->allowedBufferTypes() & (BufferInfo::Type)source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt()))
     return false;
 
-  if(config()->hideInactiveBuffers() && !source_bufferIndex.data(NetworkModel::ItemActiveRole).toBool())
+  // the following dynamic filters may not trigger if the buffer is currently selected.
+  if(bufferId == Client::bufferModel()->standardSelectionModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>())
+    return true;
+
+  if(config()->hideInactiveBuffers() && !source_bufferIndex.data(NetworkModel::ItemActiveRole).toBool() && activityLevel <= BufferInfo::OtherActivity)
     return false;
 
-  if(config()->minimumActivity() > activityLevel) {
-    if(bufferId != Client::bufferModel()->standardSelectionModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>())
-      return false;
-  }
+  if(config()->minimumActivity() > activityLevel)
+    return false;
 
   return true;
 }
@@ -284,35 +291,46 @@ bool BufferViewFilter::networkLessThan(const QModelIndex &source_left, const QMo
 
 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::BackgroundRole:
-    if(index.data(NetworkModel::UserAwayRole).toBool()) {
-      QLinearGradient gradient(0, 0, 0, 18);
-      gradient.setColorAt(0.4, QApplication::palette().color(QPalette::Normal, QPalette::Base));
-      gradient.setColorAt(0.5, QApplication::palette().color(QPalette::Disabled, QPalette::Base));
-      gradient.setColorAt(0.6, QApplication::palette().color(QPalette::Normal, QPalette::Base));
-      return QBrush(gradient);
-    }
-    // else: fallthrough to default
   default:
     return QSortFilterProxyModel::data(index, role);
   }
 }
 
-QVariant BufferViewFilter::foreground(const QModelIndex &index) const {
+QVariant BufferViewFilter::icon(const QModelIndex &index) const {
+  if(index.column() != 0)
+    return QVariant();
+
+  if(index.data(NetworkModel::BufferTypeRole).toInt() != BufferInfo::QueryBuffer)
+    return QVariant();
+
   if(!index.data(NetworkModel::ItemActiveRole).toBool())
-    return _FgColorInactiveActivity;
+    return _userOfflineIcon;
+
+  if(index.data(NetworkModel::UserAwayRole).toBool())
+    return _userAwayIcon;
+  else
+    return _userOnlineIcon;
+
+  return QVariant();
+}
 
-  Buffer::ActivityLevel activity = (Buffer::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
+QVariant BufferViewFilter::foreground(const QModelIndex &index) const {
+  BufferInfo::ActivityLevel activity = (BufferInfo::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
 
-  if(activity & Buffer::Highlight)
+  if(activity & BufferInfo::Highlight)
     return _FgColorHighlightActivity;
-  if(activity & Buffer::NewMessage)
+  if(activity & BufferInfo::NewMessage)
     return _FgColorNewMessageActivity;
-  if(activity & Buffer::OtherActivity)
+  if(activity & BufferInfo::OtherActivity)
     return _FgColorOtherActivity;
 
+  if(!index.data(NetworkModel::ItemActiveRole).toBool() || index.data(NetworkModel::UserAwayRole).toBool())
+    return _FgColorInactiveActivity;
+
   return _FgColorNoActivity;
 }