[chronojump] Fixed: ForceSensorCapture options translated



commit 02f2b18398fda43d9fc74f3756b01e3f6c8009bd
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri Sep 27 12:46:54 2019 +0200

    Fixed: ForceSensorCapture options translated

 glade/app1.glade       | 34 +++++++++++++++++++---------------
 src/forceSensor.cs     | 31 +++++++++++++++++++++++++------
 src/gui/forceSensor.cs | 14 ++++++++++----
 3 files changed, 54 insertions(+), 25 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 3d0aefc0..4f25f9b9 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -9108,9 +9108,7 @@ EncoderInertialCapture</property>
                                                             <widget class="GtkComboBox" 
id="combo_force_sensor_capture_options">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
-                                                            <property name="items" 
translatable="yes">Standard capture
-Absolute values
-Inverted values</property>
+                                                            <property name="items" translatable="yes"/>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -21876,6 +21874,9 @@ Concentric</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -23824,6 +23825,18 @@ Concentric</property>
                                                             <property name="can_focus">False</property>
                                                             <property name="spacing">6</property>
                                                             <child>
+                                                            <widget class="GtkLabel" 
id="label_video_encoder_tests_will_be_filmed">
+                                                            <property name="can_focus">False</property>
+                                                            <property name="label" translatable="yes">Tests 
will be filmed</property>
+                                                            </widget>
+                                                            <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">False</property>
+                                                            <property name="pack_type">end</property>
+                                                            <property name="position">0</property>
+                                                            </packing>
+                                                            </child>
+                                                            <child>
                                                             <widget class="GtkHBox" 
id="hbox_video_encoder_capturing">
                                                             <property name="can_focus">False</property>
                                                             <property name="spacing">4</property>
@@ -23860,18 +23873,6 @@ Concentric</property>
                                                             </packing>
                                                             </child>
                                                             <child>
-                                                            <widget class="GtkLabel" 
id="label_video_encoder_tests_will_be_filmed">
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Tests 
will be filmed</property>
-                                                            </widget>
-                                                            <packing>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">False</property>
-                                                            <property name="pack_type">end</property>
-                                                            <property name="position">0</property>
-                                                            </packing>
-                                                            </child>
-                                                            <child>
                                                             <widget class="GtkHBox" 
id="hbox_video_encoder_no_capturing">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
@@ -30779,6 +30780,9 @@ then click this button.</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
diff --git a/src/forceSensor.cs b/src/forceSensor.cs
index bfd9cdbc..de171798 100644
--- a/src/forceSensor.cs
+++ b/src/forceSensor.cs
@@ -26,9 +26,28 @@ using Mono.Unix;
 public class ForceSensor
 {
        public enum CaptureOptions { NORMAL, ABS, INVERTED }
-       public static string CaptureOptionsStringNORMAL = "Standard capture";
-       public static string CaptureOptionsStringABS =  "Absolute values";
-       public static string CaptureOptionsStringINVERTED =  "Inverted values";
+       public static string CaptureOptionsStringNORMAL()
+       {
+               return Catalog.GetString("Standard capture");
+       }
+       public static string CaptureOptionsStringABS()
+       {
+               return Catalog.GetString("Absolute values");
+       }
+       public static string CaptureOptionsStringINVERTED()
+       {
+               return Catalog.GetString("Inverted values");
+       }
+       public static List<string> CaptureOptionsList()
+       {
+               List<string> l = new List<string>();
+
+               l.Add(CaptureOptionsStringNORMAL());
+               l.Add(CaptureOptionsStringABS());
+               l.Add(CaptureOptionsStringINVERTED());
+
+               return l;
+       }
 
        public static int AngleUndefined = -1000;
 
@@ -156,11 +175,11 @@ public class ForceSensor
        public static string GetCaptureOptionsString(CaptureOptions co)
        {
                if(co == ForceSensor.CaptureOptions.ABS)
-                       return CaptureOptionsStringABS;
+                       return CaptureOptionsStringABS();
                else if(co == ForceSensor.CaptureOptions.INVERTED)
-                       return CaptureOptionsStringINVERTED;
+                       return CaptureOptionsStringINVERTED();
                else
-                       return CaptureOptionsStringNORMAL;
+                       return CaptureOptionsStringNORMAL();
 
        }
 
diff --git a/src/gui/forceSensor.cs b/src/gui/forceSensor.cs
index e4d196f1..6755d23c 100644
--- a/src/gui/forceSensor.cs
+++ b/src/gui/forceSensor.cs
@@ -161,7 +161,7 @@ public partial class ChronoJumpWindow
        {
                notebook_force_sensor_analyze.CurrentPage = 1;  //start on 1: force_general_analysis
                createForceExerciseCombo();
-               combo_force_sensor_capture_options.Active = 0;
+               createComboForceSensorCaptureOptions();
                createForceAnalyzeCombos();
                setRFDValues();
                setImpulseValue();
@@ -2170,6 +2170,12 @@ LogB.Information(" fs R ");
                                preferences.GetForceSensorAdjustString());
        }
 
+       private void createComboForceSensorCaptureOptions()
+       {
+               UtilGtk.ComboUpdate(combo_force_sensor_capture_options, ForceSensor.CaptureOptionsList());
+               combo_force_sensor_capture_options.Active = 0;
+       }
+
        // -------------------------------- exercise stuff --------------------
 
 
@@ -2446,11 +2452,11 @@ LogB.Information(" fs R ");
        private ForceSensor.CaptureOptions getForceSensorCaptureOptions()
        {
                string option = UtilGtk.ComboGetActive(combo_force_sensor_capture_options);
-               if(option == Catalog.GetString(ForceSensor.CaptureOptionsStringABS))
+               if(option == ForceSensor.CaptureOptionsStringABS())
                        return ForceSensor.CaptureOptions.ABS;
-               else if(option == Catalog.GetString(ForceSensor.CaptureOptionsStringINVERTED))
+               else if(option == ForceSensor.CaptureOptionsStringINVERTED())
                        return ForceSensor.CaptureOptions.INVERTED;
-               else //ForceSensor.CaptureOptionsStringNORMAL
+               else //ForceSensor.CaptureOptionsStringNORMAL()
                        return ForceSensor.CaptureOptions.NORMAL;
        }
        private void setForceSensorCaptureOptions(ForceSensor.CaptureOptions co)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]