commit a377ccf63de5475b414032a0001860f6ca7917b9
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Jan 13 13:20:49 2015 +0100
Fixed jumpRj with weight was not differentiating % body weight or Kg
glade/chronojump.glade | 73 +++++++++++++++++++++++++++++++++++++++++++----
src/gui/jump.cs | 2 +-
2 files changed, 67 insertions(+), 8 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 2a07059..7b335bb 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -4226,14 +4226,16 @@ weight</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_rj_radiobutton_kg">
- <property name="label">Kg</property>
+ <widget class="GtkRadioButton"
id="extra_window_jumps_rj_radiobutton_weight">
+ <property name="label" translatable="yes">% body
+weight</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="active">True</property>
<property name="draw_indicator">True</property>
+ <property
name="group">extra_window_jumps_rj_radiobutton_kg</property>
+ <signal name="toggled"
handler="on_extra_window_jumps_rj_radiobutton_weight_toggled" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -4242,15 +4244,15 @@ weight</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_rj_radiobutton_weight">
- <property name="label" translatable="yes">% body
-weight</property>
+ <widget class="GtkRadioButton"
id="extra_window_jumps_rj_radiobutton_kg">
+ <property name="label">Kg</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="active">True</property>
<property name="draw_indicator">True</property>
- <property
name="group">extra_window_jumps_rj_radiobutton_kg</property>
+ <signal name="toggled"
handler="on_extra_window_jumps_rj_radiobutton_kg_toggled" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -6384,6 +6386,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -7144,6 +7149,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -8156,6 +8164,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -8809,6 +8820,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -18992,6 +19006,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -19553,6 +19570,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -20606,6 +20626,9 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -20716,6 +20739,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -29770,6 +29796,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -31711,6 +31755,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -32310,6 +32357,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -34875,6 +34925,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -35100,6 +35153,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -35340,6 +35396,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/jump.cs b/src/gui/jump.cs
index 37b99aa..2d97ced 100644
--- a/src/gui/jump.cs
+++ b/src/gui/jump.cs
@@ -1031,7 +1031,7 @@ partial class ChronoJumpWindow
//jumps_rj
double extra_window_jumps_rj_limited = 10;
bool extra_window_jumps_rj_jumpsLimited;
- string extra_window_jumps_rj_option = "Kg";
+ string extra_window_jumps_rj_option = "%";
double extra_window_jumps_rj_weight = 20;
double extra_window_jumps_rj_fall = 20;