X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=aaa21840c6d71fd75d9132d02aed4c452dc45ff3;hp=58998530b0207a8db40f11e578444c2894f4fa1d;hb=731ec69d4608ba95e3ae4f154b8ca1852e1db2e5;hpb=332069a1830ed3a055ac6f2d7661bae1cc83e40c

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index 58998530..aaa21840 100644
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -26,7 +26,9 @@
 
 #include "bufferinfo.h"
 #include "buffermodel.h"
+#include "buffersettings.h"
 #include "client.h"
+#include "iconloader.h"
 #include "networkmodel.h"
 
 #include "uisettings.h"
@@ -43,7 +45,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);
@@ -54,6 +59,10 @@ BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *
 
   connect(this, SIGNAL(_dataChanged(const QModelIndex &, const QModelIndex &)),
 	  this, SLOT(_q_sourceDataChanged(QModelIndex,QModelIndex)));
+
+  BufferSettings bufferSettings;
+  _showUserStateIcons = bufferSettings.showUserStateIcons();
+  bufferSettings.notify("ShowUserStateIcons", this, SLOT(showUserStateIconsChanged()));
 }
 
 void BufferViewFilter::loadColors() {
@@ -65,6 +74,11 @@ void BufferViewFilter::loadColors() {
   _FgColorOtherActivity = s.value("otherActivityFG", QVariant(QColor(Qt::darkGreen))).value<QColor>();
 }
 
+void BufferViewFilter::showUserStateIconsChanged() {
+  BufferSettings bufferSettings;
+  _showUserStateIcons = bufferSettings.showUserStateIcons();
+}
+
 void BufferViewFilter::setConfig(BufferViewConfig *config) {
   if(_config == config)
     return;
@@ -194,7 +208,7 @@ bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex)
   if(!config())
     return true;
 
-  BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value<BufferId>();
+  BufferId bufferId = source_bufferIndex.data(NetworkModel::BufferIdRole).value<BufferId>();
   Q_ASSERT(bufferId.isValid());
 
   int activityLevel = source_bufferIndex.data(NetworkModel::BufferActivityRole).toInt();
@@ -210,19 +224,21 @@ bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex)
     return false;
   }
 
-  if(config()->networkId().isValid() && config()->networkId() != sourceModel()->data(source_bufferIndex, NetworkModel::NetworkIdRole).value<NetworkId>())
+  if(config()->networkId().isValid() && config()->networkId() != source_bufferIndex.data(NetworkModel::NetworkIdRole).value<NetworkId>())
     return false;
 
   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;
 }
@@ -234,7 +250,7 @@ bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) cons
   if(!config()->networkId().isValid()) {
     return true;
   } else {
-    return config()->networkId() == sourceModel()->data(source_index, NetworkModel::NetworkIdRole).value<NetworkId>();
+    return config()->networkId() == source_index.data(NetworkModel::NetworkIdRole).value<NetworkId>();
   }
 }
 
@@ -253,7 +269,7 @@ bool BufferViewFilter::filterAcceptsRow(int source_row, const QModelIndex &sourc
 }
 
 bool BufferViewFilter::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const {
-  int itemType = sourceModel()->data(source_left, NetworkModel::ItemTypeRole).toInt();
+  int itemType = source_left.data(NetworkModel::ItemTypeRole).toInt();
   switch(itemType) {
   case NetworkModel::NetworkItemType:
     return networkLessThan(source_left, source_right);
@@ -265,8 +281,8 @@ bool BufferViewFilter::lessThan(const QModelIndex &source_left, const QModelInde
 }
 
 bool BufferViewFilter::bufferLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const {
-  BufferId leftBufferId = sourceModel()->data(source_left, NetworkModel::BufferIdRole).value<BufferId>();
-  BufferId rightBufferId = sourceModel()->data(source_right, NetworkModel::BufferIdRole).value<BufferId>();
+  BufferId leftBufferId = source_left.data(NetworkModel::BufferIdRole).value<BufferId>();
+  BufferId rightBufferId = source_right.data(NetworkModel::BufferIdRole).value<BufferId>();
   if(config()) {
     return config()->bufferList().indexOf(leftBufferId) < config()->bufferList().indexOf(rightBufferId);
   } else
@@ -274,8 +290,8 @@ bool BufferViewFilter::bufferLessThan(const QModelIndex &source_left, const QMod
 }
 
 bool BufferViewFilter::networkLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const {
-  NetworkId leftNetworkId = sourceModel()->data(source_left, NetworkModel::NetworkIdRole).value<NetworkId>();
-  NetworkId rightNetworkId = sourceModel()->data(source_right, NetworkModel::NetworkIdRole).value<NetworkId>();
+  NetworkId leftNetworkId = source_left.data(NetworkModel::NetworkIdRole).value<NetworkId>();
+  NetworkId rightNetworkId = source_right.data(NetworkModel::NetworkIdRole).value<NetworkId>();
 
   if(config() && config()->sortAlphabetically())
     return QSortFilterProxyModel::lessThan(source_left, source_right);
@@ -285,25 +301,39 @@ 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(!_showUserStateIcons || config() && config()->disableDecoration())
+    return QVariant();
+
+  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();
+}
+
+QVariant BufferViewFilter::foreground(const QModelIndex &index) const {
+  if(config() && config()->disableDecoration())
+    return _FgColorNoActivity;
 
   BufferInfo::ActivityLevel activity = (BufferInfo::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
 
@@ -314,6 +344,9 @@ QVariant BufferViewFilter::foreground(const QModelIndex &index) const {
   if(activity & BufferInfo::OtherActivity)
     return _FgColorOtherActivity;
 
+  if(!index.data(NetworkModel::ItemActiveRole).toBool() || index.data(NetworkModel::UserAwayRole).toBool())
+    return _FgColorInactiveActivity;
+
   return _FgColorNoActivity;
 }
 
@@ -350,12 +383,12 @@ bool bufferIdLessThan(const BufferId &left, const BufferId &right) {
   QModelIndex leftIndex = Client::networkModel()->bufferIndex(left);
   QModelIndex rightIndex = Client::networkModel()->bufferIndex(right);
 
-  int leftType = Client::networkModel()->data(leftIndex, NetworkModel::BufferTypeRole).toInt();
-  int rightType = Client::networkModel()->data(rightIndex, NetworkModel::BufferTypeRole).toInt();
+  int leftType = leftIndex.data(NetworkModel::BufferTypeRole).toInt();
+  int rightType = rightIndex.data(NetworkModel::BufferTypeRole).toInt();
 
   if(leftType != rightType)
     return leftType < rightType;
   else
-    return QString::compare(Client::networkModel()->data(leftIndex, Qt::DisplayRole).toString(), Client::networkModel()->data(rightIndex, Qt::DisplayRole).toString(), Qt::CaseInsensitive) < 0;
+    return QString::compare(leftIndex.data(Qt::DisplayRole).toString(), rightIndex.data(Qt::DisplayRole).toString(), Qt::CaseInsensitive) < 0;
 }