From 9de382b2b2a352bad4a076249f07ae84da94c420 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Mon, 14 Apr 2008 11:46:55 +0000 Subject: [PATCH] fixing the min-activity-issue --- src/qtui/settingspages/bufferviewsettingspage.cpp | 3 --- src/uisupport/bufferviewfilter.cpp | 10 ++++++---- version.inc | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/qtui/settingspages/bufferviewsettingspage.cpp b/src/qtui/settingspages/bufferviewsettingspage.cpp index 5710bd70..1d69e4ef 100644 --- a/src/qtui/settingspages/bufferviewsettingspage.cpp +++ b/src/qtui/settingspages/bufferviewsettingspage.cpp @@ -54,9 +54,6 @@ BufferViewSettingsPage::BufferViewSettingsPage(QWidget *parent) connect(ui.hideInactiveBuffers, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); connect(ui.networkSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(widgetHasChanged())); connect(ui.minimumActivitySelector, SIGNAL(currentIndexChanged(int)), this, SLOT(widgetHasChanged())); - - // FIXME: (see FIXME in BufferViewFilter::filterAcceptBuffer()) - ui.minimumActivitySelector->setEnabled(false); } BufferViewSettingsPage::~BufferViewSettingsPage() { diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp index a1744f62..a14ab031 100644 --- a/src/uisupport/bufferviewfilter.cpp +++ b/src/uisupport/bufferviewfilter.cpp @@ -22,6 +22,7 @@ #include +#include "buffermodel.h" #include "client.h" #include "networkmodel.h" @@ -146,16 +147,17 @@ void BufferViewFilter::removeBuffer(const QModelIndex &index) { bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const { if(!_config) return true; - + if(!(_config->allowedBufferTypes() & (BufferInfo::Type)source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt())) return false; if(_config->hideInactiveBuffers() && !source_bufferIndex.data(NetworkModel::ItemActiveRole).toBool()) return false; - // FIXME: this can result in bad loops :( - // if(_config->minimumActivity() > source_bufferIndex.data(NetworkModel::BufferActivityRole).toInt()) - // return false; + if(_config->minimumActivity() > source_bufferIndex.data(NetworkModel::BufferActivityRole).toInt()) { + if(!Client::bufferModel()->standardSelectionModel()->isSelected(source_bufferIndex)) + return false; + } BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value(); return _config->bufferList().contains(bufferId); diff --git a/version.inc b/version.inc index 865ef7b8..e25d6762 100644 --- a/version.inc +++ b/version.inc @@ -5,7 +5,7 @@ quasselVersion = "0.2.0-beta1-pre"; quasselDate = "2008-04-14"; - quasselBuild = 735; + quasselBuild = 736; //! Minimum client build number the core needs clientBuildNeeded = 731; -- 2.20.1