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

Fix units boxes in preference panel

Browse source 
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>
This commit is contained in:
Anton Lundin 2013-12-08 14:18:26 +01:00 • committed by Dirk Hohndel
parent f84e4ef4ee
commit e39ec4e564
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
qt-ui/preferences.cpp
View file

@ -68,7 +68,7 @@ void PreferencesDialog::setUiFromPrefs()
ui.all_tissues->setChecked(prefs.calc_all_tissues); ui.all_tissues->setChecked(prefs.calc_all_tissues);
ui.calc_ndl_tts->setEnabled(ui.calculated_ceiling->isChecked()); ui.calc_ndl_tts->setEnabled(ui.calculated_ceiling->isChecked());
ui.calc_ndl_tts->setChecked(prefs.calc_ndl_tts); 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.gflow->setValue(prefs.gflow);
ui.gfhigh->setValue(prefs.gfhigh); ui.gfhigh->setValue(prefs.gfhigh);
@ -92,6 +92,7 @@ void PreferencesDialog::setUiFromPrefs()
ui.cuft->setChecked(prefs.units.volume == units::CUFT); ui.cuft->setChecked(prefs.units.volume == units::CUFT);
ui.kgs->setChecked(prefs.units.weight == units::KG); ui.kgs->setChecked(prefs.units.weight == units::KG);
ui.lbs->setChecked(prefs.units.weight == units::LBS); ui.lbs->setChecked(prefs.units.weight == units::LBS);
ui.font->setFont(QString(prefs.divelist_font)); ui.font->setFont(QString(prefs.divelist_font));
ui.fontsize->setValue(prefs.font_size); ui.fontsize->setValue(prefs.font_size);
ui.defaultfilename->setText(prefs.default_filename); ui.defaultfilename->setText(prefs.default_filename);

6
qt-ui/preferences.ui
View file

@ -131,7 +131,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>3</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="page_2"> <widget class="QWidget" name="page_2">
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
@ -290,7 +290,7 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupBox11"> <widget class="QGroupBox" name="units_group">
<property name="title"> <property name="title">
<string/> <string/>
</property> </property>
@ -1131,7 +1131,7 @@
<connection> <connection>
<sender>personalize</sender> <sender>personalize</sender>
<signal>toggled(bool)</signal> <signal>toggled(bool)</signal>
<receiver>groupBox</receiver> <receiver>units_group</receiver>
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">