X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fnickviewfilter.cpp;h=959ae9c63f91c803cdce69f58d42fb85117c3df4;hp=e4955ac5a32bc4f30f576eac3f2505387f5d0745;hb=d37bdc91c5474603e1417c2cd9c40c02e1ad5ee6;hpb=fee29a2c223027f15ac911809ec4fcbbf74a0e4c

diff --git a/src/uisupport/nickviewfilter.cpp b/src/uisupport/nickviewfilter.cpp
index e4955ac5..959ae9c6 100644
--- a/src/uisupport/nickviewfilter.cpp
+++ b/src/uisupport/nickviewfilter.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,52 +20,33 @@
 
 #include "nickviewfilter.h"
 
+#include "buffersettings.h"
+#include "iconloader.h"
 #include "networkmodel.h"
 
-#include "uisettings.h"
-
-#include <QColor>
-
 /******************************************************************************************
  * NickViewFilter
  ******************************************************************************************/
 NickViewFilter::NickViewFilter(const BufferId &bufferId, NetworkModel *parent)
   : QSortFilterProxyModel(parent),
-    _bufferId(bufferId)
+    _bufferId(bufferId),
+    _userOnlineIcon(SmallIcon("im-user")),
+    _userAwayIcon(SmallIcon("im-user-away")),
+    _categoryOpIcon(SmallIcon("irc-operator")),
+    _categoryVoiceIcon(SmallIcon("irc-voice")),
+    _opIconLimit(UserCategoryItem::categoryFromModes("o")),
+    _voiceIconLimit(UserCategoryItem::categoryFromModes("v"))
 {
   setSourceModel(parent);
   setDynamicSortFilter(true);
   setSortCaseSensitivity(Qt::CaseInsensitive);
-}
-
-QVariant NickViewFilter::data(const QModelIndex &index, int role) const {
-  if(role == Qt::ForegroundRole)
-    return foreground(index);
-  else
-    return QSortFilterProxyModel::data(index, role);
-//   else {
-//     QVariant d = 
-//     if(role == 0)
-//       qDebug() << index << role << d;
-//     return d;
-//   }
-}
-
-QVariant NickViewFilter::foreground(const QModelIndex &index) const {
-  UiSettings s("QtUi/Colors");
-  QVariant onlineStatusFG = s.value("onlineStatusFG", QVariant(QColor(Qt::black)));
-  QVariant awayStatusFG = s.value("awayStatusFG", QVariant(QColor(Qt::gray)));
+  setSortRole(TreeModel::SortRole);
 
-  if(!index.data(NetworkModel::ItemActiveRole).toBool())
-    return awayStatusFG.value<QColor>();
-  
-  return onlineStatusFG.value<QColor>();
-  
-  // FIXME:: make colors configurable;
-  // FIXME: use the style interface instead of qsettings
+  BufferSettings bufferSettings;
+  _showUserStateIcons = bufferSettings.showUserStateIcons();
+  bufferSettings.notify("ShowUserStateIcons", this, SLOT(showUserStateIconsChanged()));
 }
 
-
 bool NickViewFilter::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const {
   // root node, networkindexes, the bufferindex of the buffer this filter is active for and it's childs are accepted
   if(!source_parent.isValid())
@@ -74,3 +55,47 @@ bool NickViewFilter::filterAcceptsRow(int source_row, const QModelIndex &source_
   QModelIndex source_child = source_parent.child(source_row, 0);
   return (sourceModel()->data(source_child, NetworkModel::BufferIdRole).value<BufferId>() == _bufferId);
 }
+
+QVariant NickViewFilter::data(const QModelIndex &index, int role) const {
+  switch(role) {
+  case Qt::DecorationRole:
+    return icon(index);
+  default:
+    return QSortFilterProxyModel::data(index, role);
+  }
+}
+
+QVariant NickViewFilter::icon(const QModelIndex &index) const {
+  if(!_showUserStateIcons)
+    return QVariant();
+
+  if(index.column() != 0)
+    return QVariant();
+
+  QModelIndex source_index = mapToSource(index);
+  NetworkModel::ItemType itemType = (NetworkModel::ItemType)sourceModel()->data(source_index, NetworkModel::ItemTypeRole).toInt();
+  switch(itemType) {
+  case NetworkModel::UserCategoryItemType:
+    {
+      int categoryId = sourceModel()->data(source_index, TreeModel::SortRole).toInt();
+      if(categoryId <= _opIconLimit)
+	return _categoryOpIcon;
+      if(categoryId <= _voiceIconLimit)
+	return _categoryVoiceIcon;
+      return _userOnlineIcon;
+    }
+  case NetworkModel::IrcUserItemType:
+    if(sourceModel()->data(source_index, NetworkModel::ItemActiveRole).toBool())
+      return _userOnlineIcon;
+    else
+      return _userAwayIcon;
+    break;
+  default:
+    return QVariant();
+  };
+}
+
+void NickViewFilter::showUserStateIconsChanged() {
+  BufferSettings bufferSettings;
+  _showUserStateIcons = bufferSettings.showUserStateIcons();
+}