mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: move shown-text calculation from filter widget to core

Browse source 
The filter widget was caching whether the filter was active and
used that flag to calculate the "# dives shown" string. Move this
directly to the DiveFilter class to remove interdependencies and
to unify with mobile.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-06-22 14:05:46 +02:00 • committed by Dirk Hohndel
parent 68fffc2672
commit 38b686687f
5 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
desktop-widgets/filterwidget2.cpp
View file

@ -10,8 +10,7 @@
FilterWidget2::FilterWidget2(QWidget* parent) :
QWidget(parent),
ignoreSignal(false),
validFilter(false)
ignoreSignal(false)
{
ui.setupUi(this);
@ -194,7 +193,6 @@ void FilterWidget2::updateFilter()
return;
FilterData filterData = createFilterData();
validFilter = filterData.validFilter();
DiveFilter::instance()->setFilter(filterData);
}
@ -227,11 +225,3 @@ void FilterWidget2::addConstraint(filter_constraint_type type)
{
constraintModel.addConstraint(type);
}
QString FilterWidget2::shownText()
{
if (validFilter)
return tr("%L1/%L2 shown").arg(shown_dives).arg(dive_table.nr);
else
return tr("%L1 dives").arg(dive_table.nr);
}