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

core: activate qPrefUnits

Browse source 
remove Units from SettingsObjectWrapper and reference qPrefUnits

update files using SettingsObjectWrapper/Units to use qPrefUnits

this activated qPrefUnits and removed the similar class from
SettingsObjectWrapper.

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-07-31 18:40:59 +02:00 • committed by Dirk Hohndel
parent 54335e1ec6
commit affdc9d394
6 changed files with 51 additions and 304 deletions
Download patch file Download diff file Expand all files Collapse all files

20
desktop-widgets/preferences/preferences_units.cpp
View file

@ -51,14 +51,14 @@ void PreferencesUnits::syncSettings()
QString unitSystem[] = {"metric", "imperial", "personal"};
short unitValue = ui->metric->isChecked() ? METRIC : (ui->imperial->isChecked() ? IMPERIAL : PERSONALIZE);
units->setUnitSystem(unitSystem[unitValue]);
units->setTemperature(ui->fahrenheit->isChecked() ? units::FAHRENHEIT : units::CELSIUS);
units->setLength(ui->feet->isChecked() ? units::FEET : units::METERS);
units->setPressure(ui->psi->isChecked() ? units::PSI : units::BAR);
units->setVolume(ui->cuft->isChecked() ? units::CUFT : units::LITER);
units->setWeight(ui->lbs->isChecked() ? units::LBS : units::KG);
units->setVerticalSpeedTime(ui->vertical_speed_minutes->isChecked() ? units::MINUTES : units::SECONDS);
units->setCoordinatesTraditional(ui->gpsTraditional->isChecked());
units->setDurationUnits(ui->duration_mixed->isChecked() ? units::MIXED : (ui->duration_no_hours->isChecked() ? units::MINUTES_ONLY : units::ALWAYS_HOURS));
units->setShowUnitsTable(ui->show_units_table->isChecked());
units->set_unit_system(unitSystem[unitValue]);
units->set_temperature(ui->fahrenheit->isChecked() ? units::FAHRENHEIT : units::CELSIUS);
units->set_length(ui->feet->isChecked() ? units::FEET : units::METERS);
units->set_pressure(ui->psi->isChecked() ? units::PSI : units::BAR);
units->set_volume(ui->cuft->isChecked() ? units::CUFT : units::LITER);
units->set_weight(ui->lbs->isChecked() ? units::LBS : units::KG);
units->set_vertical_speed_time(ui->vertical_speed_minutes->isChecked() ? units::MINUTES : units::SECONDS);
units->set_coordinates_traditional(ui->gpsTraditional->isChecked());
units->set_duration_units(ui->duration_mixed->isChecked() ? units::MIXED : (ui->duration_no_hours->isChecked() ? units::MINUTES_ONLY : units::ALWAYS_HOURS));
units->set_show_units_table(ui->show_units_table->isChecked());
}