diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2013-12-08 14:18:26 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-12-08 16:17:43 +0100 |
| commit | e39ec4e56455e09ed38d98cbb825580735e8e7ed (patch) | |
| tree | 29e50e367c9ebf6886b296a33a934af1fe0a83db /qt-ui | |
| parent | f84e4ef4ee8c66f19a69db114e763ddc27d3c001 (diff) | |
| download | subsurface-e39ec4e56455e09ed38d98cbb825580735e8e7ed.tar.gz | |
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 <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/preferences.cpp | 3 | ||||
| -rw-r--r-- | qt-ui/preferences.ui | 6 |
2 files changed, 5 insertions, 4 deletions
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 @@ </sizepolicy> </property> <property name="currentIndex"> - <number>3</number> + <number>1</number> </property> <widget class="QWidget" name="page_2"> <layout class="QVBoxLayout" name="verticalLayout_3"> @@ -290,7 +290,7 @@ </layout> </item> <item> - <widget class="QGroupBox" name="groupBox11"> + <widget class="QGroupBox" name="units_group"> <property name="title"> <string/> </property> @@ -1131,7 +1131,7 @@ <connection> <sender>personalize</sender> <signal>toggled(bool)</signal> - <receiver>groupBox</receiver> + <receiver>units_group</receiver> <slot>setEnabled(bool)</slot> <hints> <hint type="sourcelabel"> |