X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=5727d348fbee58ccebc63652a083c9ffe9dc0c6f;hp=6b81c38f49648ac0ef9683d9a6de0e12803e3afc;hb=da1ad61b4d3f7b21d34a3a22e8408eb593d2b0a8;hpb=4a174a228d64ab906a0944f3de3dfe4324d058ff

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index 6b81c38f..5727d348 100644
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -24,6 +24,7 @@
 #include <QPalette>
 #include <QBrush>
 
+#include "bufferinfo.h"
 #include "buffermodel.h"
 #include "client.h"
 #include "networkmodel.h"
@@ -46,7 +47,7 @@ BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *
 {
   setConfig(config);
   setSourceModel(model);
-			
+
   setDynamicSortFilter(true);
 
   loadColors();
@@ -56,7 +57,7 @@ BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *
 }
 
 void BufferViewFilter::loadColors() {
-  UiSettings s("QtUi/Colors");
+  UiSettings s("QtUiStyle/Colors");
   _FgColorInactiveActivity = s.value("inactiveActivityFG", QVariant(QColor(Qt::gray))).value<QColor>();
   _FgColorNoActivity = s.value("noActivityFG", QVariant(QColor(Qt::black))).value<QColor>();
   _FgColorHighlightActivity = s.value("highlightActivityFG", QVariant(QColor(Qt::magenta))).value<QColor>();
@@ -67,7 +68,7 @@ void BufferViewFilter::loadColors() {
 void BufferViewFilter::setConfig(BufferViewConfig *config) {
   if(_config == config)
     return;
-  
+
   if(_config) {
     disconnect(_config, 0, this, 0);
   }
@@ -90,7 +91,7 @@ void BufferViewFilter::setConfig(BufferViewConfig *config) {
 void BufferViewFilter::configInitialized() {
   if(!config())
     return;
-    
+
   connect(config(), SIGNAL(bufferViewNameSet(const QString &)), this, SLOT(invalidate()));
   connect(config(), SIGNAL(networkIdSet(const NetworkId &)), this, SLOT(invalidate()));
   connect(config(), SIGNAL(addNewBuffersAutomaticallySet(bool)), this, SLOT(invalidate()));
@@ -171,7 +172,7 @@ void BufferViewFilter::sort(int column, Qt::SortOrder order) {
 void BufferViewFilter::addBuffer(const BufferId &bufferId) const {
   if(!config() || config()->bufferList().contains(bufferId))
     return;
-  
+
   int pos = config()->bufferList().count();
   bool lt;
   for(int i = 0; i < config()->bufferList().count(); i++) {
@@ -179,7 +180,7 @@ void BufferViewFilter::addBuffer(const BufferId &bufferId) const {
       lt = bufferIdLessThan(bufferId, config()->bufferList()[i]);
     else
       lt = bufferId < config()->bufferList()[i];
-    
+
     if(lt) {
       pos = i;
       break;
@@ -202,20 +203,20 @@ 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)
     return false;
   }
-  
+
   if(config()->networkId().isValid() && config()->networkId() != sourceModel()->data(source_bufferIndex, 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())
+  if(config()->hideInactiveBuffers() && !source_bufferIndex.data(NetworkModel::ItemActiveRole).toBool() && activityLevel <= BufferInfo::OtherActivity)
     return false;
 
   if(config()->minimumActivity() > activityLevel) {
@@ -239,7 +240,7 @@ bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) cons
 
 bool BufferViewFilter::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const {
   QModelIndex child = sourceModel()->index(source_row, 0, source_parent);
-  
+
   if(!child.isValid()) {
     qWarning() << "filterAcceptsRow has been called with an invalid Child";
     return false;
@@ -259,7 +260,7 @@ bool BufferViewFilter::lessThan(const QModelIndex &source_left, const QModelInde
   case NetworkModel::BufferItemType:
     return bufferLessThan(source_left, source_right);
   default:
-    return QSortFilterProxyModel::lessThan(source_left, source_right);    
+    return QSortFilterProxyModel::lessThan(source_left, source_right);
   }
 }
 
@@ -301,18 +302,18 @@ QVariant BufferViewFilter::data(const QModelIndex &index, int role) const {
 }
 
 QVariant BufferViewFilter::foreground(const QModelIndex &index) const {
-  if(!index.data(NetworkModel::ItemActiveRole).toBool())
-    return _FgColorInactiveActivity;
-
-  Buffer::ActivityLevel activity = (Buffer::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
+  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())
+    return _FgColorInactiveActivity;
+
   return _FgColorNoActivity;
 }
 
@@ -325,10 +326,10 @@ void BufferViewFilter::checkPreviousCurrentForRemoval(const QModelIndex &current
 void BufferViewFilter::customEvent(QEvent *event) {
   if(event->type() != QEvent::User)
     return;
-  
+
   CheckRemovalEvent *removalEvent = static_cast<CheckRemovalEvent *>(event);
   checkItemForRemoval(removalEvent->index);
-  
+
   event->accept();
 }
 
@@ -345,7 +346,7 @@ bool bufferIdLessThan(const BufferId &left, const BufferId &right) {
   Q_CHECK_PTR(Client::networkModel());
   if(!Client::networkModel())
     return true;
-  
+
   QModelIndex leftIndex = Client::networkModel()->bufferIndex(left);
   QModelIndex rightIndex = Client::networkModel()->bufferIndex(right);