[PATCH 1/3] Fix units boxes in preference panel

Anton Lundin glance at acc.umu.se
Sun Dec 8 05:18:26 UTC 2013


The groupBox-es got renamed, and thus the unit-systems radio-buttons
was enabling/disabling the wrong buttons.

Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 qt-ui/preferences.cpp | 3 ++-
 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 399d81d..a373ef0 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 bdd37ac..aef83aa 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">
-- 
1.8.3.2



More information about the subsurface mailing list