X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=ac4bae5daa240c4d03203562cfcc34bce1b0e595;hp=29694002adfcaacf66c783c25c3d247ba4fb9f79;hb=770b7ef54b03f3ebd1e29a58b4757505e1809b2d;hpb=d6b056e936ec441258d291b7a8af7b83f9f53016

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index 29694002..ac4bae5d 100644
--- 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,24 +20,20 @@
 
 #include "bufferviewfilter.h"
 
+#include <QColor>
+
+#include "networkmodel.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);
-  
-  // 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 {
@@ -54,22 +50,25 @@ bool BufferViewFilter::dropMimeData(const QMimeData *data, Qt::DropAction action
   if(parent != QModelIndex())
     return QSortFilterProxyModel::dropMimeData(data, action, row, column, parent);
 
-  if(!BufferTreeModel::mimeContainsBufferList(data))
+  if(!NetworkModel::mimeContainsBufferList(data))
     return false;
 
-  QList< QPair<uint, uint> > bufferList = BufferTreeModel::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;
-    networks << netId;
+    if(!networks.contains(netId)) {
+      networks << netId;
+    }
     addBuffer(bufferId);
   }
   return true;
 }
 
-void BufferViewFilter::addBuffer(const uint &bufferuid) {
+void BufferViewFilter::addBuffer(const BufferId &bufferuid) {
   if(!buffers.contains(bufferuid)) {
     buffers << bufferuid;
     invalidateFilter();
@@ -84,12 +83,17 @@ void BufferViewFilter::removeBuffer(const QModelIndex &index) {
     return; // only child elements can be deleted
 
   bool lastBuffer = (rowCount(index.parent()) == 1);
-  uint netId = index.data(BufferTreeModel::NetworkIdRole).toUInt();
-  uint bufferuid = index.data(BufferTreeModel::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);
-    if(lastBuffer)
+    
+    if(lastBuffer) {
       networks.remove(netId);
+      Q_ASSERT(!networks.contains(netId));
+    }
+
     invalidateFilter();
   }
   
@@ -97,32 +101,31 @@ void BufferViewFilter::removeBuffer(const QModelIndex &index) {
 
 
 bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const {
-  Buffer::Type bufferType = (Buffer::Type) source_bufferIndex.data(BufferTreeModel::BufferTypeRole).toInt();
+  BufferItem::Type bufferType = (BufferItem::Type) source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt();
   
-  if((mode & NoChannels) && bufferType == Buffer::ChannelType)
+  if((mode & NoChannels) && bufferType == BufferItem::ChannelType)
     return false;
-  if((mode & NoQueries) && bufferType == Buffer::QueryType)
+  if((mode & NoQueries) && bufferType == BufferItem::QueryType)
     return false;
-  if((mode & NoServers) && bufferType == Buffer::StatusType)
+  if((mode & NoServers) && bufferType == BufferItem::StatusType)
     return false;
 
-//   bool isActive = source_bufferIndex.data(BufferTreeModel::BufferActiveRole).toBool();
+//   bool isActive = source_bufferIndex.data(NetworkModel::BufferActiveRole).toBool();
 //   if((mode & NoActive) && isActive)
 //     return false;
 //   if((mode & NoInactive) && !isActive)
 //     return false;
 
-//   if((mode & FullCustom)) {
-//     uint bufferuid = source_bufferIndex.data(BufferTreeModel::BufferUidRole).toUInt();
-//     if(!buffers.contains(bufferuid))
-//       return false;
-//   }
+  if((mode & FullCustom)) {
+    BufferId bufferuid = source_bufferIndex.data(NetworkModel::BufferIdRole).value<BufferId>();
+    return buffers.contains(bufferuid);
+  }
     
   return true;
 }
 
 bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) const {
-  uint net = source_index.data(BufferTreeModel::NetworkIdRole).toUInt();
+  NetworkId net = source_index.data(NetworkModel::NetworkIdRole).value<NetworkId>();
   return !((mode & (SomeNets | FullCustom)) && !networks.contains(net));
 }
 
@@ -141,8 +144,8 @@ bool BufferViewFilter::filterAcceptsRow(int source_row, const QModelIndex &sourc
 }
 
 bool BufferViewFilter::lessThan(const QModelIndex &left, const QModelIndex &right) const {
-  int lefttype = left.data(BufferTreeModel::BufferTypeRole).toInt();
-  int righttype = right.data(BufferTreeModel::BufferTypeRole).toInt();
+  int lefttype = left.data(NetworkModel::BufferTypeRole).toInt();
+  int righttype = right.data(NetworkModel::BufferTypeRole).toInt();
 
   if(lefttype != righttype)
     return lefttype < righttype;
@@ -150,3 +153,28 @@ 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 {
+  if(!index.data(NetworkModel::ItemActiveRole).toBool())
+    return QColor(Qt::gray);
+
+  BufferItem::ActivityLevel activity = (BufferItem::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
+
+  if(activity & BufferItem::Highlight)
+    return QColor(Qt::magenta);
+  if(activity & BufferItem::NewMessage)
+    return QColor(Qt::green);
+  if(activity & BufferItem::OtherActivity)
+    return QColor(Qt::darkGreen);
+  
+  return QColor(Qt::black);
+  
+  // FIXME:: make colors configurable;
+
+}