[chronojump] Improvements on force sensor at preferences

[Xavier de Blas <xaviblas src gnome org>]

commit 9a7b9cd1a3194cf91420b3a2135925de88b20d17
Author: Xavier de Blas <xaviblas gmail com>
Date:   Thu Apr 20 11:55:40 2017 +0200

    Improvements on force sensor at preferences

 glade/preferences_win.glade |   16 ++++++++--------
 src/gui/preferences.cs      |   35 +++++++++++++++++++++++------------
 2 files changed, 31 insertions(+), 20 deletions(-)
---
diff --git a/glade/preferences_win.glade b/glade/preferences_win.glade
index 1f40f36..d5c4de1 100644
--- a/glade/preferences_win.glade
+++ b/glade/preferences_win.glade
@@ -2763,7 +2763,7 @@ Other</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal name="clicked" handler="on_check_force_1_clicked" swapped="no"/>
+                                    <signal name="clicked" handler="on_check_force_clicked" swapped="no"/>
                                     <child>
                                       <widget class="GtkHBox" id="hbox30">
                                         <property name="visible">True</property>
@@ -2934,7 +2934,7 @@ Fitted</property>
                                           <widget class="GtkLabel" id="label86">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label">%</property>
+                                            <property name="label">% maximum force</property>
                                           </widget>
                                           <packing>
                                             <property name="expand">True</property>
@@ -3088,7 +3088,7 @@ Fitted</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal name="clicked" handler="on_check_force_2_clicked" swapped="no"/>
+                                    <signal name="clicked" handler="on_check_force_clicked" swapped="no"/>
                                     <child>
                                       <widget class="GtkHBox" id="hbox31">
                                         <property name="visible">True</property>
@@ -3259,7 +3259,7 @@ Fitted</property>
                                           <widget class="GtkLabel" id="label90">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label">%</property>
+                                            <property name="label">% maximum force</property>
                                           </widget>
                                           <packing>
                                             <property name="expand">True</property>
@@ -3413,7 +3413,7 @@ Fitted</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal name="clicked" handler="on_check_force_3_clicked" swapped="no"/>
+                                    <signal name="clicked" handler="on_check_force_clicked" swapped="no"/>
                                     <child>
                                       <widget class="GtkHBox" id="hbox32">
                                         <property name="visible">True</property>
@@ -3584,7 +3584,7 @@ Fitted</property>
                                           <widget class="GtkLabel" id="label94">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label">%</property>
+                                            <property name="label">% maximum force</property>
                                           </widget>
                                           <packing>
                                             <property name="expand">True</property>
@@ -3738,7 +3738,7 @@ Fitted</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal name="clicked" handler="on_check_force_4_clicked" swapped="no"/>
+                                    <signal name="clicked" handler="on_check_force_clicked" swapped="no"/>
                                     <child>
                                       <widget class="GtkHBox" id="hbox33">
                                         <property name="visible">True</property>
@@ -3909,7 +3909,7 @@ Fitted</property>
                                           <widget class="GtkLabel" id="label98">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label">%</property>
+                                            <property name="label">% maximum force</property>
                                           </widget>
                                           <packing>
                                             <property name="expand">True</property>
diff --git a/src/gui/preferences.cs b/src/gui/preferences.cs
index 8bcdb95..6a00c3c 100644
--- a/src/gui/preferences.cs
+++ b/src/gui/preferences.cs
@@ -232,6 +232,8 @@ public class PreferencesWindow
                        PreferencesWindowBox.notebook.GetNthPage(ENCODERCAPTUREPAGE).Hide();
                        PreferencesWindowBox.notebook.GetNthPage(ENCODEROTHERPAGE).Hide();
                }
+               if(menu_mode != Constants.Menuitem_modes.FORCESENSOR)
+                       PreferencesWindowBox.notebook.GetNthPage(FORCEPAGE).Hide();
 
                PreferencesWindowBox.preferences = preferences;
 
@@ -419,7 +421,7 @@ public class PreferencesWindow
                PreferencesWindowBox.label_encoder_con.Text = (0.7).ToString();
        
                //force
-               PreferencesWindowBox.createForceCombos();
+               PreferencesWindowBox.initForceSensor();
 
                //language -->
                if(preferences.language == "")
@@ -492,26 +494,30 @@ public class PreferencesWindow
 
        // ---- Force sensor stuff
 
-       private void on_check_force_1_clicked (object o, EventArgs args)
+       private void initForceSensor ()
        {
-               hbox_force_1.Visible = (check_force_1.Active);
+               createForceCombos();
+
+               check_force_visibilities();
+
        }
-       private void on_check_force_2_clicked (object o, EventArgs args)
+
+       private void check_force_visibilities()
        {
+               hbox_force_1.Visible = (check_force_1.Active);
                hbox_force_2.Visible = (check_force_2.Active);
-       }
-       private void on_check_force_3_clicked (object o, EventArgs args)
-       {
                hbox_force_3.Visible = (check_force_3.Active);
+               hbox_force_4.Visible = (check_force_4.Active);
        }
-       private void on_check_force_4_clicked (object o, EventArgs args)
+
+       private void on_check_force_clicked (object o, EventArgs args)
        {
-               hbox_force_4.Visible = (check_force_4.Active);
+               check_force_visibilities();
        }
 
-       private static string [] forceTypes = {
-               "Instantaneous", "Average", "% Force max", "RFD max"
-       };
+       //private static string [] forceTypes = {
+       //      "Instantaneous", "Average", "% Force max", "RFD max"
+       //};
        private static string [] forceTypesTranslated = {
                Catalog.GetString("Instantaneous"), Catalog.GetString("Average"),
                Catalog.GetString("% Force max"), Catalog.GetString("RFD max")
@@ -527,6 +533,11 @@ public class PreferencesWindow
                UtilGtk.ComboUpdate(combo_force_2_type, forceTypesTranslated, "");
                UtilGtk.ComboUpdate(combo_force_3_type, forceTypesTranslated, "");
                UtilGtk.ComboUpdate(combo_force_4_type, forceTypesTranslated, "");
+
+               combo_force_1_type.Active = 0;
+               combo_force_2_type.Active = 0;
+               combo_force_3_type.Active = 0;
+               combo_force_4_type.Active = 0;
        }
 
        private void on_combo_force_type_changed (object o, EventArgs args)