[chronojump] slCMJ defaults dominance unknown, fall both
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] slCMJ defaults dominance unknown, fall both
- Date: Fri, 24 Oct 2014 13:07:32 +0000 (UTC)
commit b7dadca89c1599cb5cad051730e493e037ebe443
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Oct 23 11:30:07 2014 -0300
slCMJ defaults dominance unknown, fall both
glade/chronojump.glade | 144 +++++++++++++++++++++++++++++++++++-------------
src/gui/jump.cs | 10 ++--
2 files changed, 110 insertions(+), 44 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index a6dec9b..77b1909 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -3569,12 +3569,11 @@ weight</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_dominance_this_limb">
- <property name="label" translatable="yes">This
limb</property>
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_dominance_unknown">
+ <property name="label"
translatable="yes">Unknown</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
@@ -3585,13 +3584,14 @@ weight</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_dominance_opposite">
- <property name="label"
translatable="yes">Opposite</property>
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_dominance_this_limb">
+ <property name="label" translatable="yes">This
limb</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <property
name="group">extra_window_jumps_radiobutton_single_leg_dominance_this_limb</property>
+ <property
name="group">extra_window_jumps_radiobutton_single_leg_dominance_unknown</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -3600,13 +3600,13 @@ weight</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_dominance_unknown">
- <property name="label"
translatable="yes">Unknown</property>
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_dominance_opposite">
+ <property name="label"
translatable="yes">Opposite</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <property
name="group">extra_window_jumps_radiobutton_single_leg_dominance_this_limb</property>
+ <property
name="group">extra_window_jumps_radiobutton_single_leg_dominance_unknown</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -3658,12 +3658,11 @@ weight</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_fall_this_limb">
- <property name="label" translatable="yes">This
limb</property>
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_fall_both">
+ <property name="label"
translatable="yes">Both</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
@@ -3674,13 +3673,14 @@ weight</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_fall_opposite">
- <property name="label"
translatable="yes">Opposite</property>
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_fall_this_limb">
+ <property name="label" translatable="yes">This
limb</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <property
name="group">extra_window_jumps_radiobutton_single_leg_fall_this_limb</property>
+ <property
name="group">extra_window_jumps_radiobutton_single_leg_fall_both</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -3689,13 +3689,13 @@ weight</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_fall_both">
- <property name="label"
translatable="yes">Both</property>
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_fall_opposite">
+ <property name="label"
translatable="yes">Opposite</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <property
name="group">extra_window_jumps_radiobutton_single_leg_fall_this_limb</property>
+ <property
name="group">extra_window_jumps_radiobutton_single_leg_fall_both</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -6251,6 +6251,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -6954,6 +6957,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -7791,6 +7797,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -8387,6 +8396,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -18109,6 +18121,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -18613,6 +18628,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -19609,6 +19627,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 +19683,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -21226,12 +21250,11 @@ comments</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkRadioButton"
id="jumps_radiobutton_single_leg_dominance_this_limb">
- <property name="label" translatable="yes">This limb</property>
+ <widget class="GtkRadioButton"
id="jumps_radiobutton_single_leg_dominance_unknown">
+ <property name="label" translatable="yes">Unknown</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_radio_single_leg_2_toggled" swapped="no"/>
@@ -21243,13 +21266,14 @@ comments</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="jumps_radiobutton_single_leg_dominance_opposite">
- <property name="label" translatable="yes">Opposite</property>
+ <widget class="GtkRadioButton"
id="jumps_radiobutton_single_leg_dominance_this_limb">
+ <property name="label" translatable="yes">This limb</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <property
name="group">jumps_radiobutton_single_leg_dominance_this_limb</property>
+ <property
name="group">jumps_radiobutton_single_leg_dominance_unknown</property>
<signal name="toggled" handler="on_radio_single_leg_2_toggled" swapped="no"/>
</widget>
<packing>
@@ -21259,13 +21283,13 @@ comments</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="jumps_radiobutton_single_leg_dominance_unknown">
- <property name="label" translatable="yes">Unknown</property>
+ <widget class="GtkRadioButton"
id="jumps_radiobutton_single_leg_dominance_opposite">
+ <property name="label" translatable="yes">Opposite</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <property
name="group">jumps_radiobutton_single_leg_dominance_this_limb</property>
+ <property
name="group">jumps_radiobutton_single_leg_dominance_unknown</property>
<signal name="toggled" handler="on_radio_single_leg_2_toggled" swapped="no"/>
</widget>
<packing>
@@ -21319,12 +21343,11 @@ comments</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkRadioButton"
id="jumps_radiobutton_single_leg_fall_this_limb">
- <property name="label" translatable="yes">This limb</property>
+ <widget class="GtkRadioButton" id="jumps_radiobutton_single_leg_fall_both">
+ <property name="label" translatable="yes">Both</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_radio_single_leg_3_toggled" swapped="no"/>
@@ -21336,13 +21359,14 @@ comments</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="jumps_radiobutton_single_leg_fall_opposite">
- <property name="label" translatable="yes">Opposite</property>
+ <widget class="GtkRadioButton"
id="jumps_radiobutton_single_leg_fall_this_limb">
+ <property name="label" translatable="yes">This limb</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <property name="group">jumps_radiobutton_single_leg_fall_this_limb</property>
+ <property name="group">jumps_radiobutton_single_leg_fall_both</property>
<signal name="toggled" handler="on_radio_single_leg_3_toggled" swapped="no"/>
</widget>
<packing>
@@ -21352,13 +21376,13 @@ comments</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="jumps_radiobutton_single_leg_fall_both">
- <property name="label" translatable="yes">Both</property>
+ <widget class="GtkRadioButton" id="jumps_radiobutton_single_leg_fall_opposite">
+ <property name="label" translatable="yes">Opposite</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <property name="group">jumps_radiobutton_single_leg_fall_this_limb</property>
+ <property name="group">jumps_radiobutton_single_leg_fall_both</property>
<signal name="toggled" handler="on_radio_single_leg_3_toggled" swapped="no"/>
</widget>
<packing>
@@ -28351,6 +28375,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>
@@ -29743,6 +29785,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -29922,9 +29967,6 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<property name="y_options">GTK_FILL</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -30235,6 +30277,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>
@@ -30289,6 +30334,15 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkLabel" id="label48">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -30768,6 +30822,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>
@@ -33304,6 +33361,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -33472,6 +33532,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -33655,6 +33718,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 8e31f04..5cbd9e3 100644
--- a/src/gui/jump.cs
+++ b/src/gui/jump.cs
@@ -213,7 +213,7 @@ public class EditJumpWindow : EditEventWindow
return true;
}
private string slCMJDescriptionDefault() {
- string descDefault = "Vertical This This 0 90";
+ string descDefault = "Vertical Unknown Both 0 90";
entry_description.Text = descDefault;
return descDefault;
}
@@ -298,7 +298,7 @@ public class EditJumpWindow : EditEventWindow
else if(jumps_radiobutton_single_leg_dominance_opposite.Active)
d[1] = "Opposite";
else
- d[1] = "Unknown";
+ d[1] = "Unknown"; //default since 1.4.8
entry_description.Text =
d[0] + " " + d[1] + " " + d[2] + " " + d[3] + " " + d[4];
@@ -318,7 +318,7 @@ public class EditJumpWindow : EditEventWindow
else if(jumps_radiobutton_single_leg_fall_opposite.Active)
d[2] = "Opposite";
else
- d[2] = "Both";
+ d[2] = "Both"; //default since 1.4.8
entry_description.Text =
d[0] + " " + d[1] + " " + d[2] + " " + d[3] + " " + d[4];
@@ -1367,11 +1367,11 @@ partial class ChronoJumpWindow
if(extra_window_jumps_radiobutton_single_leg_dominance_this_limb.Active) str += " This";
else if(extra_window_jumps_radiobutton_single_leg_dominance_opposite.Active) str += "
Opposite";
- else str += " Unknown";
+ else str += " Unknown"; //default since 1.4.8
if(extra_window_jumps_radiobutton_single_leg_fall_this_limb.Active) str += " This";
else if(extra_window_jumps_radiobutton_single_leg_fall_opposite.Active) str += " Opposite";
- else str += " Both";
+ else str += " Both"; //default since 1.4.8
return str;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
