commit 4bb547ed8363a743ae6935d0d5591cf94a12a012
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Oct 24 00:01:08 2014 -0300
DJna DJa default use calculate fall height. show start in or out
glade/chronojump.glade | 144 +++++++++++++++++++++++++++++++++++++++++++----
src/gui/jump.cs | 25 +++++---
2 files changed, 147 insertions(+), 22 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 77b1909..ff41a9f 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -3199,23 +3199,56 @@
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkVBox" id="vbox59">
- <property name="visible">True</property>
+ <widget class="GtkVBox"
id="extra_window_jumps_vbox_fall">
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radio_dj_fall_calculate">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="xalign">0.40000000596046448</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled"
handler="on_extra_window_jumps_radio_dj_fall_calculate_toggled" swapped="no"/>
+ <child>
+ <widget class="GtkLabel" id="label99">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Calculate falling height using a previous jump</property>
+ <property name="label"
translatable="yes">Calculate falling height using a previous jump</property>
+ <property name="wrap">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox" id="hbox136">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">8</property>
<child>
<widget class="GtkRadioButton"
id="extra_window_jumps_radio_dj_fall_predefined">
- <property name="label" translatable="yes">Fall
from a predefined height</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
+ <property
name="group">extra_window_jumps_radio_dj_fall_calculate</property>
+ <signal name="toggled"
handler="on_extra_window_jumps_radio_dj_fall_predefined_toggled" swapped="no"/>
+ <child>
+ <widget class="GtkLabel" id="label113">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip" translatable="yes">Fall
from a predefined height</property>
+ <property name="label" translatable="yes">Fall
from a predefined height</property>
+ <property name="wrap">True</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -3273,26 +3306,54 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radio_dj_fall_calculate">
- <property name="label"
translatable="yes">Calculate falling height using a previous jump</property>
+ <widget class="GtkAlignment" id="alignment12">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property
name="xalign">0.40000000596046448</property>
- <property name="draw_indicator">True</property>
- <property
name="group">extra_window_jumps_radio_dj_fall_predefined</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">4</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">12</property>
+ <child>
+ <widget class="GtkHBox" id="hbox98">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkLabel"
id="extra_window_jumps_label_dj_start_inside">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Start
inside</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="extra_window_jumps_label_dj_start_outside">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Start
outside</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
@@ -6254,6 +6315,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -6960,6 +7024,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -7800,6 +7867,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -8399,6 +8469,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -18124,6 +18197,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -18631,6 +18707,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -19630,6 +19709,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>
@@ -19686,6 +19768,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -28393,6 +28478,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>
@@ -30280,6 +30383,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>
@@ -30825,6 +30931,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>
@@ -33364,6 +33473,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -33535,6 +33647,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -33721,6 +33836,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 5cbd9e3..542e27d 100644
--- a/src/gui/jump.cs
+++ b/src/gui/jump.cs
@@ -973,8 +973,11 @@ partial class ChronoJumpWindow
{
//options jumps
[Widget] Gtk.SpinButton extra_window_jumps_spinbutton_weight;
+ [Widget] Gtk.Box extra_window_jumps_vbox_fall;
[Widget] Gtk.RadioButton extra_window_jumps_radio_dj_fall_predefined;
[Widget] Gtk.RadioButton extra_window_jumps_radio_dj_fall_calculate;
+ [Widget] Gtk.Label extra_window_jumps_label_dj_start_inside;
+ [Widget] Gtk.Label extra_window_jumps_label_dj_start_outside;
[Widget] Gtk.SpinButton extra_window_jumps_spinbutton_fall;
[Widget] Gtk.RadioButton extra_window_jumps_radiobutton_kg;
[Widget] Gtk.RadioButton extra_window_jumps_radiobutton_weight;
@@ -1052,7 +1055,16 @@ partial class ChronoJumpWindow
}
return t;
}
-
+
+
+ private void on_extra_window_jumps_radio_dj_fall_calculate_toggled (object o, EventArgs args) {
+ extra_window_jumps_label_dj_start_inside.Visible = true;
+ extra_window_jumps_label_dj_start_outside.Visible = false;
+ }
+ private void on_extra_window_jumps_radio_dj_fall_predefined_toggled (object o, EventArgs args) {
+ extra_window_jumps_label_dj_start_inside.Visible = false;
+ extra_window_jumps_label_dj_start_outside.Visible = true;
+ }
private void on_extra_window_jumps_test_changed(object o, EventArgs args)
{
@@ -1299,14 +1311,9 @@ partial class ChronoJumpWindow
extra_window_jumps_rj_label_cm.Visible = show;
//only on simple jumps
- extra_window_jumps_radio_dj_fall_predefined.Visible = false;
- extra_window_jumps_radio_dj_fall_calculate.Visible = false;
- } else {
- extra_window_jumps_radio_dj_fall_predefined.Visible = show;
- extra_window_jumps_radio_dj_fall_calculate.Visible = show;
- extra_window_jumps_spinbutton_fall.Visible = show;
- extra_window_jumps_label_cm.Visible = show;
- }
+ extra_window_jumps_vbox_fall.Visible = false;
+ } else
+ extra_window_jumps_vbox_fall.Visible = show;
}
private void extra_window_showLimitData (bool show) {