mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +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
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/divefilter.cpp
View file

@ -2,6 +2,7 @@
#include "divefilter.h"
#include "divelist.h" // for filter_dive
#include "gettextfromc.h"
#include "qthelper.h"
#include "subsurface-qt/divelistnotifier.h"
#ifndef SUBSURFACE_MOBILE
@ -151,6 +152,14 @@ bool DiveFilter::diveSiteMode() const
}
#endif
QString DiveFilter::shownText() const
{
if (diveSiteMode() || filterData.validFilter())
return gettextFromC::tr("%L1/%L2 shown").arg(shown_dives).arg(dive_table.nr);
else
return gettextFromC::tr("%L1 dives").arg(dive_table.nr);
}
void DiveFilter::setFilter(const FilterData &data)
{
filterData = data;

1
core/divefilter.h
View file

@ -38,6 +38,7 @@ class DiveFilter {
public:
static DiveFilter *instance();
QString shownText() const;
bool diveSiteMode() const; // returns true if we're filtering on dive site (on mobile always returns false)
#ifndef SUBSURFACE_MOBILE
const QVector<dive_site *> &filteredDiveSites() const;

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);
}

2
desktop-widgets/filterwidget2.h
View file

@ -20,7 +20,6 @@ class FilterWidget2 : public QWidget {
public:
explicit FilterWidget2(QWidget *parent = 0);
~FilterWidget2();
QString shownText();
protected:
void hideEvent(QHideEvent *event) override;
@ -43,7 +42,6 @@ private:
bool ignoreSignal;
Ui::FilterWidget2 ui;
FilterConstraintModel constraintModel;
bool validFilter;
void addConstraint(filter_constraint_type type);
std::vector<std::unique_ptr<FilterConstraintWidget>> constraintWidgets;
FilterData createFilterData() const;

2
desktop-widgets/mainwindow.cpp
View file

@ -1536,7 +1536,7 @@ void MainWindow::setTitle()
}
QString unsaved = (unsavedChanges() ? " *" : "");
QString shown = QString(" (%1)").arg(filterWidget2.shownText());
QString shown = QString(" (%1)").arg(DiveFilter::instance()->shownText());
setWindowTitle("Subsurface: " + displayedFilename(existing_filename) + unsaved + shown);
}