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

Desktop, Filter UI: make date/time consistent

Browse source 
On all (most?) places we use separate date/time fields for the time of a
dive, and we follow the setting from the preferences to format those.

Make the new filter widget consistent, with respect to the to and from
interval.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2019-01-20 17:00:56 +01:00 • committed by Dirk Hohndel
parent 5986225fce
commit e8b0d165a7
4 changed files with 57 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
desktop-widgets/filterwidget2.cpp
View file

@ -24,7 +24,13 @@ FilterWidget2::FilterWidget2(QWidget* parent) : QWidget(parent)
ui.labelEquipment->hide();
ui.invertFilter->hide();
ui.to->setDate(data.to.date());
ui.fromDate->setDisplayFormat(prefs.date_format);
ui.fromTime->setDisplayFormat(prefs.time_format);
ui.toDate->setDisplayFormat(prefs.date_format);
ui.toTime->setDisplayFormat(prefs.time_format);
ui.toDate->setDate(data.toDate.date());
ui.toTime->setTime(data.toTime);
connect(ui.maxRating, &StarWidget::valueChanged,
this, &FilterWidget2::updateFilter);
@ -50,10 +56,16 @@ FilterWidget2::FilterWidget2(QWidget* parent) : QWidget(parent)
connect(ui.minWaterTemp, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
this, &FilterWidget2::updateFilter);
connect(ui.from, &QDateTimeEdit::dateTimeChanged,
connect(ui.fromDate, &QDateTimeEdit::dateChanged,
this, &FilterWidget2::updateFilter);
connect(ui.to, &QDateTimeEdit::dateTimeChanged,
connect(ui.fromTime, &QDateTimeEdit::timeChanged,
this, &FilterWidget2::updateFilter);
connect(ui.toDate, &QDateTimeEdit::dateChanged,
this, &FilterWidget2::updateFilter);
connect(ui.toTime, &QDateTimeEdit::timeChanged,
this, &FilterWidget2::updateFilter);
connect(ui.tags, &QLineEdit::textChanged,
@ -81,8 +93,10 @@ void FilterWidget2::updateFilter()
filterData.maxWaterTemp = ui.maxWaterTemp->value();
filterData.minAirTemp = ui.minAirTemp->value();
filterData.maxWaterTemp = ui.maxWaterTemp->value();
filterData.from = ui.from->dateTime();
filterData.to = ui.to->dateTime();
filterData.fromDate = ui.fromDate->dateTime();
filterData.fromTime = ui.fromTime->time();
filterData.toDate = ui.toDate->dateTime();
filterData.toTime = ui.toTime->time();
filterData.tags = ui.tags->text().split(",", QString::SkipEmptyParts);
filterData.people = ui.people->text().split(",", QString::SkipEmptyParts);
filterData.location = ui.location->text().split(",", QString::SkipEmptyParts);

34
desktop-widgets/filterwidget2.ui
View file

@ -160,9 +160,6 @@
</property>
</widget>
</item>
<item row="5" column="1" colspan="4">
<widget class="QDateTimeEdit" name="from"/>
</item>
<item row="10" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
@ -170,9 +167,6 @@
</property>
</widget>
</item>
<item row="6" column="1" colspan="4">
<widget class="QDateTimeEdit" name="to"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
@ -252,6 +246,26 @@
</property>
</widget>
</item>
<item row="5" column="3">
<widget class="QTimeEdit" name="fromTime"/>
</item>
<item row="5" column="1" colspan="2">
<widget class="QDateTimeEdit" name="fromDate">
<property name="calendarPopup">
<bool>true</bool>
</property>
</widget>
</item>
<item row="6" column="1" colspan="2">
<widget class="QDateTimeEdit" name="toDate">
<property name="calendarPopup">
<bool>true</bool>
</property>
</widget>
</item>
<item row="6" column="3">
<widget class="QTimeEdit" name="toTime"/>
</item>
</layout>
</widget>
<customwidgets>
@ -267,8 +281,12 @@
<tabstop>maxRating</tabstop>
<tabstop>minVisibility</tabstop>
<tabstop>maxVisibility</tabstop>
<tabstop>from</tabstop>
<tabstop>to</tabstop>
<tabstop>fromDate</tabstop>
<tabstop>fromTime</tabstop>
<tabstop>toDate</tabstop>
<tabstop>toTime</tabstop>
<tabstop>logged</tabstop>
<tabstop>planned</tabstop>
<tabstop>tags</tabstop>
<tabstop>people</tabstop>
<tabstop>location</tabstop>

10
qt-models/filtermodels.cpp
View file

@ -114,10 +114,16 @@ bool MultiFilterSortModel::showDive(const struct dive *d) const
(d->airtemp.mkelvin < C_to_mkelvin(filterData.minAirTemp) || d->airtemp.mkelvin > C_to_mkelvin(filterData.maxAirTemp)))
return false;
if (filterData.from.isValid() && d->when < filterData.from.toTime_t())
QDateTime t = filterData.fromDate;
t.setTime(filterData.fromTime);
if (filterData.fromDate.isValid() && filterData.fromTime.isValid() &&
d->when < t.toMSecsSinceEpoch()/1000 + t.offsetFromUtc())
return false;
if (filterData.to.isValid() && d->when > filterData.to.toTime_t())
t = filterData.toDate;
t.setTime(filterData.toTime);
if (filterData.toDate.isValid() && filterData.toTime.isValid() &&
d->when > t.toMSecsSinceEpoch()/1000 + t.offsetFromUtc())
return false;
// tags.

6
qt-models/filtermodels.h
View file

@ -24,8 +24,10 @@ struct FilterData {
double maxWaterTemp = 100;
double minAirTemp = 0;
double maxAirTemp = 100;
QDateTime from;
QDateTime to = QDateTime::currentDateTime();
QDateTime fromDate;
QTime fromTime;
QDateTime toDate = QDateTime::currentDateTime();
QTime toTime = QTime::currentTime();
QStringList tags;
QStringList people;
QStringList location;