commit 7f3835ae70c05fd1542fa0a2146ebfa6fb40e5d6
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Oct 18 15:44:49 2014 -0300
weight jumps have 100% weight by default
glade/chronojump.glade | 78 +++++++++++++++++++++++++++++++++++++++++------
src/gui/jump.cs | 4 +-
2 files changed, 70 insertions(+), 12 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index e658214..6314324 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -3332,7 +3332,7 @@
<property
name="secondary_icon_activatable">False</property>
<property
name="primary_icon_sensitive">True</property>
<property
name="secondary_icon_sensitive">True</property>
- <property name="adjustment">10 0 200 1 10
0</property>
+ <property name="adjustment">100 0 200 1 10
0</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="numeric">True</property>
@@ -3345,38 +3345,39 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_kg">
- <property name="label">Kg</property>
+ <widget class="GtkRadioButton"
id="extra_window_jumps_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>
- <signal name="toggled"
handler="on_extra_window_jumps_radiobutton_kg_toggled" swapped="no"/>
+ <property
name="group">extra_window_jumps_radiobutton_kg</property>
+ <signal name="toggled"
handler="on_extra_window_jumps_radiobutton_weight_toggled" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_weight">
- <property name="label" translatable="yes">% body
-weight</property>
+ <widget class="GtkRadioButton"
id="extra_window_jumps_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_radiobutton_kg</property>
- <signal name="toggled"
handler="on_extra_window_jumps_radiobutton_weight_toggled" swapped="no"/>
+ <signal name="toggled"
handler="on_extra_window_jumps_radiobutton_kg_toggled" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="padding">6</property>
<property name="position">2</property>
</packing>
</child>
@@ -6314,6 +6315,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -7008,6 +7012,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -7836,6 +7843,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -8423,6 +8433,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -18136,6 +18149,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -18631,6 +18647,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -19618,6 +19637,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>
@@ -19662,6 +19684,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -28373,6 +28398,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>
@@ -30258,6 +30301,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>
@@ -30812,6 +30858,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>
@@ -33339,6 +33388,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -33498,6 +33550,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -33672,6 +33727,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 4b1f6ba..7418a78 100644
--- a/src/gui/jump.cs
+++ b/src/gui/jump.cs
@@ -1047,7 +1047,7 @@ partial class ChronoJumpWindow
//static double distance;
//jumps
- string extra_window_jumps_option = "Kg";
+ string extra_window_jumps_option = "%";
//double extra_window_jumps_weight = 20;
double extra_window_jumps_fall = 20;
bool extra_window_jumps_arms = false;
@@ -1155,7 +1155,7 @@ partial class ChronoJumpWindow
} else
extra_window_showTechniqueArmsData(false, false); //visible, sensitive
- extra_window_jumps_spinbutton_weight.Value = 20;
+ extra_window_jumps_spinbutton_weight.Value = 100;
extra_window_jumps_spinbutton_fall.Value = extra_window_jumps_fall;
if (extra_window_jumps_option == "Kg") {
extra_window_jumps_radiobutton_kg.Active = true;