Make the style engine fix a little less obscure by copying the string explicitely...

[quassel.git] / src / uisupport / bufferviewfilter.cpp

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index 9f0d4a1..af1686e 100644 (file)
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,28 +20,22 @@
 
 #include "bufferviewfilter.h"
 
+#include <QColor>
+
+#include "networkmodel.h"
+
+#include "uisettings.h"
+
 /*****************************************
 * The Filter for the Tree View
 *****************************************/
-BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, const Modes &filtermode, const QList<uint> &nets)
+BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, const Modes &filtermode, const QList<NetworkId> &nets)
   : QSortFilterProxyModel(model),
     mode(filtermode),
-    networks(QSet<uint>::fromList(nets))
+    networks(QSet<NetworkId>::fromList(nets))
 {
   setSourceModel(model);
   setSortCaseSensitivity(Qt::CaseInsensitive);
-
-  // FIXME
-  // ok the following basically sucks. therfore it's commented out. Justice served.
-  // a better solution would use dataChanged()
-  
-  // I have this feeling that this resulted in a fuckup once... no clue though right now and invalidateFilter isn't a slot -.-
-  //connect(model, SIGNAL(invalidateFilter()), this, SLOT(invalidate()));
-  // connect(model, SIGNAL(invalidateFilter()), this, SLOT(invalidateFilter_()));
-}
-
-void BufferViewFilter::invalidateFilter_() {
-  QSortFilterProxyModel::invalidateFilter();
 }
 
 Qt::ItemFlags BufferViewFilter::flags(const QModelIndex &index) const {
@@ -61,9 +55,10 @@ bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action
   if(!NetworkModel::mimeContainsBufferList(data))
     return false;
 
-  QList< QPair<uint, uint> > bufferList = NetworkModel::mimeDataToBufferList(data);
+  QList< QPair<NetworkId, BufferId> > bufferList = NetworkModel::mimeDataToBufferList(data);
 
-  uint netId, bufferId;
+  NetworkId netId;
+  BufferId bufferId;
   for(int i = 0; i < bufferList.count(); i++) {
     netId = bufferList[i].first;
     bufferId = bufferList[i].second;
@@ -75,7 +70,7 @@ bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action
   return true;
 }
 
-void BufferViewFilter::addBuffer(const uint &bufferuid) {
+void BufferViewFilter::addBuffer(const BufferId &bufferuid) {
   if(!buffers.contains(bufferuid)) {
     buffers << bufferuid;
     invalidateFilter();
@@ -90,8 +85,8 @@ void BufferViewFilter::removeBuffer(const QModelIndex &index) {
     return; // only child elements can be deleted
 
   bool lastBuffer = (rowCount(index.parent()) == 1);
-  uint netId = index.data(NetworkModel::NetworkIdRole).toUInt();
-  uint bufferuid = index.data(NetworkModel::BufferUidRole).toUInt();
+  NetworkId netId = index.data(NetworkModel::NetworkIdRole).value<NetworkId>();
+  BufferId bufferuid = index.data(NetworkModel::BufferIdRole).value<BufferId>();
 
   if(buffers.contains(bufferuid)) {
     buffers.remove(bufferuid);
@@ -108,13 +103,13 @@ void BufferViewFilter::removeBuffer(const QModelIndex &index) {
 
 
 bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const {
-  Buffer::Type bufferType = (Buffer::Type) source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt();
+  BufferInfo::Type bufferType = (BufferInfo::Type) source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt();
   
-  if((mode & NoChannels) && bufferType == Buffer::ChannelType)
+  if((mode & NoChannels) && bufferType == BufferInfo::ChannelBuffer)
     return false;
-  if((mode & NoQueries) && bufferType == Buffer::QueryType)
+  if((mode & NoQueries) && bufferType == BufferInfo::QueryBuffer)
     return false;
-  if((mode & NoServers) && bufferType == Buffer::StatusType)
+  if((mode & NoServers) && bufferType == BufferInfo::StatusBuffer)
     return false;
 
 //   bool isActive = source_bufferIndex.data(NetworkModel::BufferActiveRole).toBool();
@@ -124,7 +119,7 @@ bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex)
 //     return false;
 
   if((mode & FullCustom)) {
-    uint bufferuid = source_bufferIndex.data(NetworkModel::BufferUidRole).toUInt();
+    BufferId bufferuid = source_bufferIndex.data(NetworkModel::BufferIdRole).value<BufferId>();
     return buffers.contains(bufferuid);
   }
     
@@ -132,7 +127,7 @@ bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex)
 }
 
 bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) const {
-  uint net = source_index.data(NetworkModel::NetworkIdRole).toUInt();
+  NetworkId net = source_index.data(NetworkModel::NetworkIdRole).value<NetworkId>();
   return !((mode & (SomeNets | FullCustom)) && !networks.contains(net));
 }
 
@@ -160,3 +155,35 @@ bool BufferViewFilter::lessThan(const QModelIndex &left, const QModelIndex &righ
     return QSortFilterProxyModel::lessThan(left, right);
 }
 
+QVariant BufferViewFilter::data(const QModelIndex &index, int role) const {
+  if(role == Qt::ForegroundRole)
+    return foreground(index);
+  else
+    return QSortFilterProxyModel::data(index, role);
+}
+
+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.value<QColor>();
+
+  Buffer::ActivityLevel activity = (Buffer::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
+
+  if(activity & Buffer::Highlight)
+    return highlightActivity.value<QColor>();
+  if(activity & Buffer::NewMessage)
+    return newMessageActivity.value<QColor>();
+  if(activity & Buffer::OtherActivity)
+    return otherActivity.value<QColor>();
+  
+  return noActivity.value<QColor>();
+  
+  // FIXME:: make colors configurable;
+
+}