diff options
| author |  jan Iversen <jan@casacondor.com> | 2020-01-02 12:27:19 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-01-04 10:56:55 -0800 |
| commit | 347a002923978f39d6252eb136403588f369a8d2 (patch) | |
| tree | 0ab932c4d9136c6b2dc3dde102b0e8554a4397d8 /core | |
| parent | 1d58d11676aa6b64cb60761759a3c06bf4eb0be6 (diff) | |
| download | subsurface-347a002923978f39d6252eb136403588f369a8d2.tar.gz | |
core/settings: qPrefUnit, secure original signal gets emitted
When using the string setters, the original signal should still be emitted.
Change to call original setter in string setter.
Signed-off-by: Jan Iversen <jan@casacondor.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core')
| -rw-r--r-- | core/settings/qPrefUnit.cpp | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/core/settings/qPrefUnit.cpp b/core/settings/qPrefUnit.cpp index e30b684ec..8a3bb50f7 100644 --- a/core/settings/qPrefUnit.cpp +++ b/core/settings/qPrefUnit.cpp @@ -31,15 +31,14 @@ HANDLE_PREFERENCE_BOOL(Units, "coordinates", coordinates_traditional); QString qPrefUnits::duration_units() { return prefs.units.duration_units == units::DURATION::ALWAYS_HOURS ? QStringLiteral("hours") : - prefs.units.duration_units == units::DURATION::MINUTES_ONLY ? QStringLiteral("minutes") : - QStringLiteral("mixed"); + prefs.units.duration_units == units::DURATION::MINUTES_ONLY ? QStringLiteral("minutes") : + QStringLiteral("mixed"); } void qPrefUnits::set_duration_units(const QString& value) { - prefs.units.duration_units = value == QStringLiteral("hours") ? units::DURATION::ALWAYS_HOURS : - value == QStringLiteral("minutes")? units::DURATION::MINUTES_ONLY : - units::DURATION::MIXED; - disk_duration_units(true); + set_duration_units(value == QStringLiteral("hours") ? units::DURATION::ALWAYS_HOURS : + value == QStringLiteral("minutes")? units::DURATION::MINUTES_ONLY : + units::DURATION::MIXED); emit instance()->duration_unitsStringChanged(value); } SET_PREFERENCE_ENUM_EXT(Units, units::DURATION, duration_units, units.); @@ -51,8 +50,7 @@ QString qPrefUnits::length() } void qPrefUnits::set_length(const QString& value) { - prefs.units.length = value == QStringLiteral("meters") ? units::LENGTH::METERS : units::LENGTH::FEET; - disk_length(true); + set_length(value == QStringLiteral("meters") ? units::LENGTH::METERS : units::LENGTH::FEET); emit instance()->lengthStringChanged(value); } SET_PREFERENCE_ENUM_EXT(Units, units::LENGTH, length, units.); @@ -64,8 +62,7 @@ QString qPrefUnits::pressure() } void qPrefUnits::set_pressure(const QString& value) { - prefs.units.pressure = value == QStringLiteral("bar") ? units::PRESSURE::BAR : units::PRESSURE::PSI; - disk_pressure(true); + set_pressure(value == QStringLiteral("bar") ? units::PRESSURE::BAR : units::PRESSURE::PSI); emit instance()->pressureStringChanged(value); } SET_PREFERENCE_ENUM_EXT(Units, units::PRESSURE, pressure, units.); @@ -79,8 +76,7 @@ QString qPrefUnits::temperature() } void qPrefUnits::set_temperature(const QString& value) { - prefs.units.temperature = value == QStringLiteral("celcius") ? units::TEMPERATURE::CELSIUS : units::TEMPERATURE::FAHRENHEIT; - disk_temperature(true); + set_temperature(value == QStringLiteral("celcius") ? units::TEMPERATURE::CELSIUS : units::TEMPERATURE::FAHRENHEIT); emit instance()->temperatureStringChanged(value); } SET_PREFERENCE_ENUM_EXT(Units, units::TEMPERATURE, temperature, units.); @@ -142,8 +138,7 @@ QString qPrefUnits::vertical_speed_time() } void qPrefUnits::set_vertical_speed_time(const QString& value) { - prefs.units.vertical_speed_time = value == QStringLiteral("minutes") ? units::TIME::MINUTES : units::TIME::SECONDS; - disk_vertical_speed_time(true); + set_vertical_speed_time(value == QStringLiteral("minutes") ? units::TIME::MINUTES : units::TIME::SECONDS); emit instance()->vertical_speed_timeStringChanged(value); } SET_PREFERENCE_ENUM_EXT(Units, units::TIME, vertical_speed_time, units.); @@ -155,8 +150,7 @@ QString qPrefUnits::volume() } void qPrefUnits::set_volume(const QString& value) { - prefs.units.volume = value == QStringLiteral("liter") ? units::VOLUME::LITER : units::VOLUME::CUFT; - disk_volume(true); + set_volume(value == QStringLiteral("liter") ? units::VOLUME::LITER : units::VOLUME::CUFT); emit instance()->volumeStringChanged(value); } SET_PREFERENCE_ENUM_EXT(Units, units::VOLUME, volume, units.); @@ -168,8 +162,7 @@ QString qPrefUnits::weight() } void qPrefUnits::set_weight(const QString& value) { - prefs.units.weight = value == QStringLiteral("kg") ? units::WEIGHT::KG : units::WEIGHT::LBS; - disk_weight(true); + set_weight(value == QStringLiteral("kg") ? units::WEIGHT::KG : units::WEIGHT::LBS); emit instance()->weightStringChanged(value); } SET_PREFERENCE_ENUM_EXT(Units, units::WEIGHT, weight, units.); |