From e39ec4e56455e09ed38d98cbb825580735e8e7ed Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Sun, 8 Dec 2013 14:18:26 +0100 Subject: Fix units boxes in preference panel The groupBox-es got renamed, and thus the unit-systems radio-buttons was enabling/disabling the wrong buttons. Signed-off-by: Anton Lundin Signed-off-by: Dirk Hohndel --- qt-ui/preferences.cpp | 3 ++- qt-ui/preferences.ui | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp index 399d81dca..a373ef095 100644 --- a/qt-ui/preferences.cpp +++ b/qt-ui/preferences.cpp @@ -68,7 +68,7 @@ void PreferencesDialog::setUiFromPrefs() 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.groupBox->setEnabled(ui.personalize->isChecked()); + ui.units_group->setEnabled(ui.personalize->isChecked()); ui.gflow->setValue(prefs.gflow); ui.gfhigh->setValue(prefs.gfhigh); @@ -92,6 +92,7 @@ void PreferencesDialog::setUiFromPrefs() ui.cuft->setChecked(prefs.units.volume == units::CUFT); ui.kgs->setChecked(prefs.units.weight == units::KG); ui.lbs->setChecked(prefs.units.weight == units::LBS); + ui.font->setFont(QString(prefs.divelist_font)); ui.fontsize->setValue(prefs.font_size); ui.defaultfilename->setText(prefs.default_filename); diff --git a/qt-ui/preferences.ui b/qt-ui/preferences.ui index bdd37acca..aef83aa6f 100644 --- a/qt-ui/preferences.ui +++ b/qt-ui/preferences.ui @@ -131,7 +131,7 @@ - 3 + 1 @@ -290,7 +290,7 @@ - + @@ -1131,7 +1131,7 @@ personalize toggled(bool) - groupBox + units_group setEnabled(bool) -- cgit v1.2.3-70-g09d2