From 3086741d494feeffe77a77776d642b7266eda559 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 8 Feb 2014 14:29:40 -0800 Subject: Remove the graph options from the Preferences All of these are now set from the toolbar next to the new profile. This removes functionality for people using the old profile, but as we will rip that out and switch to the new profile, soon, that seems an acceptable side effect. Signed-off-by: Dirk Hohndel --- qt-ui/preferences.cpp | 31 ---- qt-ui/preferences.ui | 498 ++++++++++++-------------------------------------- 2 files changed, 116 insertions(+), 413 deletions(-) diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp index 2a49a43dc..5969a2d47 100644 --- a/qt-ui/preferences.cpp +++ b/qt-ui/preferences.cpp @@ -46,29 +46,11 @@ void PreferencesDialog::showEvent(QShowEvent *event) void PreferencesDialog::setUiFromPrefs() { // graphs - ui.phe->setChecked(prefs.pp_graphs.phe); - ui.pheThreshold->setEnabled(ui.phe->isChecked()); - ui.po2->setChecked(prefs.pp_graphs.po2); - ui.po2Threshold->setEnabled(ui.po2->isChecked()); - ui.pn2->setChecked(prefs.pp_graphs.pn2); - ui.pn2Threshold->setEnabled(ui.pn2->isChecked()); ui.pheThreshold->setValue(prefs.pp_graphs.phe_threshold); ui.po2Threshold->setValue(prefs.pp_graphs.po2_threshold); ui.pn2Threshold->setValue(prefs.pp_graphs.pn2_threshold); - ui.ead_end_eadd->setChecked(prefs.ead); - ui.mod->setChecked(prefs.mod); - ui.maxppo2->setEnabled(ui.mod->isChecked()); ui.maxppo2->setValue(prefs.mod_ppO2); - ui.dc_reported_ceiling->setChecked(prefs.profile_dc_ceiling); - ui.red_ceiling->setEnabled(ui.dc_reported_ceiling->isChecked()); ui.red_ceiling->setChecked(prefs.profile_red_ceiling); - ui.calculated_ceiling->setChecked(prefs.profile_calc_ceiling); - ui.increment_3m->setEnabled(ui.calculated_ceiling->isChecked()); - ui.increment_3m->setChecked(prefs.calc_ceiling_3m_incr); - ui.all_tissues->setEnabled(ui.calculated_ceiling->isChecked()); - ui.all_tissues->setChecked(prefs.calc_all_tissues); - ui.calc_ndl_tts->setEnabled(ui.calculated_ceiling->isChecked()); - ui.calc_ndl_tts->setChecked(prefs.calc_ndl_tts); ui.units_group->setEnabled(ui.personalize->isChecked()); ui.gflow->setValue(prefs.gflow); @@ -105,7 +87,6 @@ void PreferencesDialog::setUiFromPrefs() } ui.displayinvalid->setChecked(prefs.display_invalid_dives); ui.display_unused_tanks->setChecked(prefs.display_unused_tanks); - ui.show_sac->setChecked(prefs.show_sac); ui.vertical_speed_minutes->setChecked(prefs.units.vertical_speed_time == units::MINUTES); ui.vertical_speed_seconds->setChecked(prefs.units.vertical_speed_time == units::SECONDS); @@ -188,26 +169,14 @@ void PreferencesDialog::syncSettings() // Graph s.beginGroup("TecDetails"); - SB("phegraph", ui.phe); - SB("po2graph", ui.po2); - SB("pn2graph", ui.pn2); s.setValue("phethreshold", ui.pheThreshold->value()); s.setValue("po2threshold", ui.po2Threshold->value()); s.setValue("pn2threshold", ui.pn2Threshold->value()); - SB("ead", ui.ead_end_eadd); - SB("mod", ui.mod); s.setValue("modppO2", ui.maxppo2->value()); - SB("dcceiling", ui.dc_reported_ceiling); SB("redceiling", ui.red_ceiling); - SB("calcceiling", ui.calculated_ceiling); - SB("calcceiling3m", ui.increment_3m); - prefs.calc_ceiling_3m_incr = ui.increment_3m->isChecked() ? 1 : 0; - SB("calcndltts", ui.calc_ndl_tts); - SB("calcalltissues", ui.all_tissues); s.setValue("gflow", ui.gflow->value()); s.setValue("gfhigh", ui.gfhigh->value()); SB("gf_low_at_maxdepth", ui.gf_low_at_maxdepth); - SB("show_sac", ui.show_sac); SB("display_unused_tanks", ui.display_unused_tanks); s.endGroup(); diff --git a/qt-ui/preferences.ui b/qt-ui/preferences.ui index fb5a16abb..988c5484f 100644 --- a/qt-ui/preferences.ui +++ b/qt-ui/preferences.ui @@ -6,8 +6,8 @@ 0 0 - 780 - 521 + 872 + 648 @@ -131,7 +131,7 @@ - 1 + 0 @@ -504,40 +504,20 @@ - - - - pO₂ - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - false + true - threshold + threshold when showing pO₂ - false + true @@ -545,40 +525,20 @@ - - - - pN₂ - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - false + true - threshold + threshold when showing pN₂ - false + true @@ -586,40 +546,20 @@ - - - - pHe - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - false + true - threshold + threshold when showing pHe - false + true @@ -627,146 +567,34 @@ - - - - MOD - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - false + true - max ppO₂ + max ppO₂ when showing MOD - false + true - - - - EAD END EADD - - - - - - - Dive computer reported ceiling - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - false - - - draw ceiling red - - - - - - - - - - - Calculated ceiling - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - false - - - show all tissues - - - - - - - false - - - 3m increments - - - - - - - false + true - Calculate NDL/TTS - - - - - - - - - - - SAC + draw dive computer reported ceiling red @@ -895,9 +723,7 @@ - - - + buttonBox @@ -948,41 +774,9 @@ - po2 - clicked(bool) - label_12 - setEnabled(bool) - - - 195 - 39 - - - 195 - 39 - - - - - po2 - clicked(bool) - po2Threshold - setEnabled(bool) - - - 195 - 39 - - - 195 - 39 - - - - - pn2 - clicked(bool) - label_13 + personalize + toggled(bool) + units_group setEnabled(bool) @@ -996,265 +790,205 @@ - pn2 - clicked(bool) - pn2Threshold - setEnabled(bool) + languageSystemDefault + toggled(bool) + languageView + setDisabled(bool) - 195 - 39 + 176 + 30 - 195 - 39 + 171 + 79 - phe - clicked(bool) - label_17 - setEnabled(bool) + languageSystemDefault + toggled(bool) + languageFilter + setDisabled(bool) - 195 - 39 + 209 + 34 - 195 - 39 + 599 + 33 - phe - clicked(bool) - pheThreshold - setEnabled(bool) + imperial + toggled(bool) + feet + setChecked(bool) - 195 - 39 + 20 + 20 - 195 - 39 + 20 + 20 - mod - clicked(bool) - label_18 - setEnabled(bool) + metric + toggled(bool) + meter + setChecked(bool) - 195 - 39 + 20 + 20 - 195 - 39 + 20 + 20 - mod - clicked(bool) - maxppo2 - setEnabled(bool) + imperial + toggled(bool) + psi + setChecked(bool) - 195 - 39 + 20 + 20 - 195 - 39 + 20 + 20 - calculated_ceiling - clicked(bool) - all_tissues - setEnabled(bool) + metric + toggled(bool) + bar + setChecked(bool) - 195 - 39 + 20 + 20 - 195 - 39 + 20 + 20 - calculated_ceiling - clicked(bool) - increment_3m - setEnabled(bool) + imperial + toggled(bool) + cuft + setChecked(bool) - 195 - 39 + 20 + 20 - 195 - 39 + 20 + 20 - calculated_ceiling - clicked(bool) - calc_ndl_tts - setEnabled(bool) + metric + toggled(bool) + liter + setChecked(bool) - 195 - 39 + 20 + 20 - 195 - 39 + 20 + 20 - dc_reported_ceiling - clicked(bool) - red_ceiling - setEnabled(bool) + imperial + toggled(bool) + fahrenheit + setChecked(bool) - 195 - 39 + 20 + 20 - 195 - 39 + 20 + 20 - personalize + metric toggled(bool) - units_group - setEnabled(bool) + celsius + setChecked(bool) - 195 - 39 + 20 + 20 - 195 - 39 + 20 + 20 - languageSystemDefault + imperial toggled(bool) - languageView - setDisabled(bool) + lbs + setChecked(bool) - 176 - 30 + 20 + 20 - 171 - 79 + 20 + 20 - languageSystemDefault + metric toggled(bool) - languageFilter - setDisabled(bool) + kg + setChecked(bool) - 209 - 34 + 20 + 20 - 599 - 33 + 20 + 20 - - imperial - toggled(bool) - feet - setChecked(bool) - - - metric - toggled(bool) - meter - setChecked(bool) - - - imperial - toggled(bool) - psi - setChecked(bool) - - - metric - toggled(bool) - bar - setChecked(bool) - - - imperial - toggled(bool) - cuft - setChecked(bool) - - - metric - toggled(bool) - liter - setChecked(bool) - - - imperial - toggled(bool) - fahrenheit - setChecked(bool) - - - metric - toggled(bool) - celsius - setChecked(bool) - - - imperial - toggled(bool) - lbs - setChecked(bool) - - - metric - toggled(bool) - kg - setChecked(bool) - - + - + -- cgit v1.2.3-70-g09d2