[chronojump] gui change (cont)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] gui change (cont)
- Date: Mon, 21 Mar 2011 21:16:57 +0000 (UTC)
commit f9fc77a9c1978e95f3c938dfd8df321ca653d6ce
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Mar 21 22:16:11 2011 +0100
gui change (cont)
glade/chronojump.glade | 989 +++++++++++++++++++++++++++---------------------
src/gui/chronojump.cs | 20 +-
src/gui/jump.cs | 262 ++++++++-----
3 files changed, 733 insertions(+), 538 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index aad693e..5fe82e7 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -18428,10 +18428,12 @@ Chronopic</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="show_tabs">False</property>
+ <property name="show_border">False</property>
<child>
<widget class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="label_xalign">0</property>
+ <property name="label_yalign">0.69999998807907104</property>
<property name="shadow_type">out</property>
<child>
<widget class="GtkAlignment" id="alignment7">
@@ -18441,11 +18443,11 @@ Chronopic</property>
<widget class="GtkVBox" id="vbox14">
<property name="visible">True</property>
<child>
- <widget class="GtkHBox" id="hbox19">
+ <widget class="GtkHBox" id="hbox_jumps">
<property name="visible">True</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkHBox" id="hbox21">
+ <widget class="GtkHBox" id="hbox 20">
<property name="visible">True</property>
<child>
<widget class="GtkRadioButton" id="extra_window_radio_jump_free">
@@ -18453,10 +18455,11 @@ Chronopic</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="tooltip" translatable="yes">Simple jump with no special technique</property>
<property name="relief">none</property>
<property name="active">True</property>
<property name="draw_indicator">False</property>
- <signal name="toggled" handler="on_extra_window_test_changed"/>
+ <signal name="toggled" handler="on_extra_window_jumps_test_changed"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -18470,10 +18473,11 @@ Chronopic</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="tooltip" translatable="yes">Squat Jump</property>
<property name="relief">none</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_free</property>
- <signal name="toggled" handler="on_extra_window_test_changed"/>
+ <signal name="toggled" handler="on_extra_window_jumps_test_changed"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -18487,10 +18491,11 @@ Chronopic</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="tooltip" translatable="yes">Squat Jump with extra weight</property>
<property name="relief">none</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_free</property>
- <signal name="toggled" handler="on_extra_window_test_changed"/>
+ <signal name="toggled" handler="on_extra_window_jumps_test_changed"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -18504,10 +18509,11 @@ Chronopic</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="tooltip" translatable="yes">CounterMovement Jump</property>
<property name="relief">none</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_free</property>
- <signal name="toggled" handler="on_extra_window_test_changed"/>
+ <signal name="toggled" handler="on_extra_window_jumps_test_changed"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -18521,10 +18527,11 @@ Chronopic</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="tooltip" translatable="yes">CounterMovement Jump with extra weight</property>
<property name="relief">none</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_free</property>
- <signal name="toggled" handler="on_extra_window_test_changed"/>
+ <signal name="toggled" handler="on_extra_window_jumps_test_changed"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -18538,10 +18545,11 @@ Chronopic</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="tooltip" translatable="yes">Abalakov Jump</property>
<property name="relief">none</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_free</property>
- <signal name="toggled" handler="on_extra_window_test_changed"/>
+ <signal name="toggled" handler="on_extra_window_jumps_test_changed"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -18555,10 +18563,11 @@ Chronopic</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="tooltip" translatable="yes">Drop Jump</property>
<property name="relief">none</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_free</property>
- <signal name="toggled" handler="on_extra_window_test_changed"/>
+ <signal name="toggled" handler="on_extra_window_jumps_test_changed"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -18572,10 +18581,11 @@ Chronopic</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="tooltip" translatable="yes">Rocket Jump</property>
<property name="relief">none</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_free</property>
- <signal name="toggled" handler="on_extra_window_test_changed"/>
+ <signal name="toggled" handler="on_extra_window_jumps_test_changed"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -18589,10 +18599,11 @@ Chronopic</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="tooltip" translatable="yes">Only first contact time is recorded</property>
<property name="relief">none</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_free</property>
- <signal name="toggled" handler="on_extra_window_test_changed"/>
+ <signal name="toggled" handler="on_extra_window_jumps_test_changed"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -18606,10 +18617,11 @@ Chronopic</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="tooltip" translatable="yes">More simple jumps</property>
<property name="relief">none</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_free</property>
- <signal name="clicked" handler="on_extra_window_test_changed"/>
+ <signal name="clicked" handler="on_extra_window_jumps_test_changed"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -18698,7 +18710,7 @@ Chronopic</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="extra_window_label_selected_jump">
+ <widget class="GtkLabel" id="extra_window_jumps_label_selected">
<property name="visible">True</property>
<property name="label" translatable="yes">the selected test</property>
</widget>
@@ -19830,223 +19842,415 @@ Chronopic</property>
<property name="row_spacing">6</property>
<child>
<widget class="GtkFrame" id="frame1">
- <property name="width_request">250</property>
<property name="visible">True</property>
<property name="label_xalign">0</property>
+ <property name="label_yalign">0.69999998807907104</property>
<property name="shadow_type">out</property>
<child>
<widget class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
<property name="left_padding">6</property>
<child>
- <widget class="GtkTable" id="table_extra_window">
+ <widget class="GtkNotebook" id="notebook_options">
<property name="visible">True</property>
- <property name="n_rows">5</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
- <child>
- <widget class="GtkLabel" id="extra_window_label_weight">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Additional weight</property>
- <property name="wrap">True</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="extra_window_label_fall">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Falling height</property>
- </widget>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="extra_window_label_limit">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Limited by</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="extra_window_label_dj_arms">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Technique</property>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
<child>
- <widget class="GtkHBox" id="hbox22">
+ <widget class="GtkTable" id="table_extra_window_jumps">
<property name="visible">True</property>
- <property name="spacing">4</property>
+ <property name="border_width">4</property>
+ <property name="n_rows">4</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
<child>
- <widget class="GtkSpinButton" id="extra_window_spinbutton_limit">
+ <widget class="GtkLabel" id="extra_window_jumps_label_weight">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â??</property>
- <property name="adjustment">10 1 100 1 10 0</property>
- <property name="digits">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Additional weight</property>
<property name="wrap">True</property>
- <property name="update_policy">if-valid</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="extra_window_label_limit_units">
+ <widget class="GtkLabel" id="extra_window_jumps_label_dj_arms">
<property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Technique</property>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox24">
- <property name="visible">True</property>
- <property name="spacing">4</property>
<child>
- <widget class="GtkRadioButton" id="extra_window_radiobutton_kg">
- <property name="label">Kg</property>
+ <widget class="GtkHBox" id="hbox24">
<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_radiobutton_kg_toggled"/>
+ <property name="spacing">6</property>
+ <child>
+ <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>
+ <signal name="toggled" handler="on_extra_window_jumps_radiobutton_kg_toggled"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <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="draw_indicator">True</property>
+ <property name="group">extra_window_jumps_radiobutton_kg</property>
+ <signal name="toggled" handler="on_extra_window_jumps_radiobutton_weight_toggled"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="position">0</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="extra_window_radiobutton_weight">
- <property name="label" translatable="yes">% body
-weight</property>
+ <widget class="GtkCheckButton" id="extra_window_jumps_check_dj_arms">
+ <property name="label" translatable="yes">Using arms</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_radiobutton_kg</property>
- <signal name="toggled" handler="on_radiobutton_weight_toggled"/>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
+ <child>
+ <widget class="GtkHBox" id="hbox26">
+ <property name="visible">True</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkSpinButton" id="extra_window_jumps_spinbutton_weight">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â??</property>
+ <property name="adjustment">10 0 200 1 10 0</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">1</property>
+ <property name="numeric">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="extra_window_jumps_label_fall">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Falling height</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox25">
+ <property name="visible">True</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkSpinButton" id="extra_window_jumps_spinbutton_fall">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â??</property>
+ <property name="adjustment">20 0 200 1 10 0</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">1</property>
+ <property name="numeric">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="extra_window_jumps_label_cm">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label">cm</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
</child>
<child>
- <widget class="GtkCheckButton" id="extra_window_check_dj_arms">
- <property name="label" translatable="yes">Using arms</property>
+ <widget class="GtkLabel" id="label20">
<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="label" translatable="yes">1</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox25">
+ <widget class="GtkTable" id="table_extra_window_jumps_rj">
<property name="visible">True</property>
- <property name="spacing">4</property>
+ <property name="border_width">4</property>
+ <property name="n_rows">4</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
<child>
- <widget class="GtkSpinButton" id="extra_window_spinbutton_fall">
+ <widget class="GtkLabel" id="extra_window_jumps_rj_label_weight">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â??</property>
- <property name="adjustment">20 0 200 1 10 0</property>
- <property name="climb_rate">1</property>
- <property name="digits">1</property>
- <property name="numeric">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Additional weight</property>
+ <property name="wrap">True</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="extra_window_label_cm">
+ <widget class="GtkLabel" id="extra_window_jumps_rj_label_limit">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label">cm</property>
+ <property name="label" translatable="yes">Limited by</property>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox26">
- <property name="visible">True</property>
- <property name="spacing">4</property>
<child>
- <widget class="GtkSpinButton" id="extra_window_spinbutton_weight">
+ <widget class="GtkHBox" id="hbox17">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â??</property>
- <property name="adjustment">10 0 200 1 10 0</property>
- <property name="climb_rate">1</property>
- <property name="digits">1</property>
- <property name="numeric">True</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkSpinButton" id="extra_window_jumps_rj_spinbutton_limit">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â??</property>
+ <property name="adjustment">10 1 100 1 10 0</property>
+ <property name="digits">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ <property name="wrap">True</property>
+ <property name="update_policy">if-valid</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="extra_window_jumps_rj_label_limit_units">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox23">
+ <property name="visible">True</property>
+ <property name="spacing">11</property>
+ <child>
+ <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>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <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="draw_indicator">True</property>
+ <property name="group">extra_window_jumps_rj_radiobutton_kg</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox28">
+ <property name="visible">True</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkSpinButton" id="extra_window_jumps_rj_spinbutton_weight">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â??</property>
+ <property name="adjustment">10 0 200 1 10 0</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">1</property>
+ <property name="numeric">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="extra_window_jumps_rj_label_fall">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Falling height</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox29">
+ <property name="visible">True</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkSpinButton" id="extra_window_jumps_rj_spinbutton_fall">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â??</property>
+ <property name="adjustment">20 0 200 1 10 0</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">1</property>
+ <property name="numeric">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="extra_window_jumps_rj_label_cm">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label">cm</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -20054,105 +20258,138 @@ weight</property>
</child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <placeholder/>
+ <widget class="GtkLabel" id="label21">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">2</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label27">
+ <property name="visible">True</property>
+ <property name="label">c</property>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label22">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">3</property>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label28">
+ <property name="visible">True</property>
+ <property name="label">c</property>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label23">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">4</property>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label29">
+ <property name="visible">True</property>
+ <property name="label">c</property>
+ </widget>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label24">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">5</property>
+ </widget>
+ <packing>
+ <property name="position">4</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
</child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Options</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEventBox" id="eventbox_image_test">
- <property name="visible">True</property>
- <child>
- <widget class="GtkVBox" id="vbox_image_test">
- <property name="visible">True</property>
- <child>
- <widget class="GtkHBox" id="hbox_image_test">
- <property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label_image_test">
+ <widget class="GtkLabel" id="label30">
<property name="visible">True</property>
- <property name="use_markup">True</property>
- <property name="ellipsize">end</property>
- <property name="width_chars">15</property>
+ <property name="label">c</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment106">
+ <widget class="GtkLabel" id="label25">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <child>
- <widget class="GtkButton" id="button_image_test_zoom">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_button_image_test_zoom_clicked"/>
- <child>
- <widget class="GtkImage" id="image_test_zoom">
- <property name="visible">True</property>
- </widget>
- </child>
- </widget>
- </child>
+ <property name="label" translatable="yes">6</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="position">5</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label31">
+ <property name="visible">True</property>
+ <property name="label">c</property>
+ </widget>
+ <packing>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label26">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">7</property>
+ </widget>
+ <packing>
+ <property name="position">6</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="image_test">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
</child>
</widget>
</child>
+ <child>
+ <widget class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Options</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -20214,6 +20451,8 @@ window</property>
<property name="label">progressbars</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -20224,6 +20463,8 @@ window</property>
of execution</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -20233,6 +20474,7 @@ of execution</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -20257,225 +20499,102 @@ the test done</property>
<property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_jumps">
- <child>
- <widget class="GtkButton" id="button_free">
- <property name="label" translatable="yes">Free Jump</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Simple jump with no special technique</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_normal_jump_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_sj">
- <property name="label">SJ</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Squat Jump</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_normal_jump_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_sj_l">
- <property name="label">SJl</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Squat Jump with extra weight</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_jump_extra_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_cmj">
- <property name="label">CMJ</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">CounterMovement Jump</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_normal_jump_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_cmj_l">
- <property name="label" translatable="yes">CMJl</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_jump_extra_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_abk">
- <property name="label">ABK</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Abalakov Jump</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_normal_jump_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_dj">
- <property name="label">DJ</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Drop Jump</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_jump_extra_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">6</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_rocket">
- <property name="label">Rocket</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Rocket Jump</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_normal_jump_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">7</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_take_off">
- <property name="label">TakeOff</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Only first contact time is recorded</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_normal_jump_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">8</property>
+ <property name="y_options">GTK_EXPAND</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment2">
+ <widget class="GtkFrame" id="frame3">
<property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.69999998807907104</property>
+ <property name="shadow_type">out</property>
<child>
- <widget class="GtkVBox" id="vbox10">
+ <widget class="GtkEventBox" id="eventbox_image_test">
<property name="visible">True</property>
<child>
- <widget class="GtkButton" id="extra_window_button_more">
- <property name="label" translatable="yes">More jumps</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">More simple jumps</property>
- <signal name="clicked" handler="on_extra_window_button_more_clicked"/>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox12">
+ <widget class="GtkVBox" id="vbox_image_test">
<property name="visible">True</property>
<child>
- <placeholder/>
+ <widget class="GtkHBox" id="hbox_image_test">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkLabel" id="label_image_test">
+ <property name="visible">True</property>
+ <property name="use_markup">True</property>
+ <property name="ellipsize">end</property>
+ <property name="width_chars">15</property>
+ </widget>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment106">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <child>
+ <widget class="GtkButton" id="button_image_test_zoom">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_button_image_test_zoom_clicked"/>
+ <child>
+ <widget class="GtkImage" id="image_test_zoom">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <placeholder/>
+ <widget class="GtkImage" id="image_test">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</widget>
</child>
+ <child>
+ <widget class="GtkLabel" id="label32">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Graph and explanation</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">9</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
</widget>
<packing>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</widget>
</child>
<child>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index a65f979..6c8034a 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -250,6 +250,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Notebook notebook_execute;
[Widget] Gtk.Notebook notebook_results;
+ [Widget] Gtk.Notebook notebook_options;
[Widget] Gtk.EventBox eventbox_image_test;
[Widget] Gtk.Box vbox_image_test;
@@ -471,7 +472,8 @@ public partial class ChronoJumpWindow
createComboMultiChronopic();
createdStatsWin = false;
- on_extra_window_test_changed(new object(), new EventArgs());
+ on_extra_window_jumps_test_changed(new object(), new EventArgs());
+ //on_extra_window_jumps_rj_test_changed(new object(), new EventArgs());
repetitiveConditionsWin = RepetitiveConditionsWindow.Create();
@@ -2923,16 +2925,16 @@ Console.WriteLine("X");
{
double jumpWeight = 0;
if(currentJumpType.HasWeight) {
- if(extra_window_option == "%")
- jumpWeight = extra_window_weight;
+ if(extra_window_jumps_option == "%")
+ jumpWeight = extra_window_jumps_weight;
else
- jumpWeight = Util.WeightFromKgToPercent(extra_window_weight, currentPersonSession.Weight);
+ jumpWeight = Util.WeightFromKgToPercent(extra_window_jumps_weight, currentPersonSession.Weight);
}
double myFall = 0;
if(currentJumpType.Name == Constants.TakeOffName || currentJumpType.Name == Constants.TakeOffWeightName)
myFall = 0;
else if( ! currentJumpType.StartIn) {
- myFall = extra_window_fall;
+ myFall = extra_window_jumps_fall;
}
@@ -4969,6 +4971,11 @@ Console.WriteLine("X");
notebook_results.NextPage();
while(notebook_results.CurrentPage > desiredPage)
notebook_results.PrevPage();
+
+ while(notebook_options.CurrentPage < desiredPage)
+ notebook_options.NextPage();
+ while(notebook_options.CurrentPage > desiredPage)
+ notebook_options.PrevPage();
}
//changed by user clicking on notebook tabs
@@ -5119,6 +5126,7 @@ Console.WriteLine("X");
//notebooks
notebook_execute.Sensitive = false;
notebook_results.Sensitive = false;
+ notebook_options.Sensitive = false;
//button_last.Sensitive = false;
button_rj_last.Sensitive=false;
@@ -5144,6 +5152,7 @@ Console.WriteLine("X");
private void sensitiveGuiNoPerson () {
notebook_execute.Sensitive = false;
notebook_results.Sensitive = false;
+ notebook_options.Sensitive = false;
treeview_persons.Sensitive = false;
menuPersonSelectedSensitive(false);
@@ -5156,6 +5165,7 @@ Console.WriteLine("X");
private void sensitiveGuiYesPerson () {
notebook_execute.Sensitive = true;
notebook_results.Sensitive = true;
+ notebook_options.Sensitive = true;
treeview_persons.Sensitive = true;
menuPersonSelectedSensitive(true);
diff --git a/src/gui/jump.cs b/src/gui/jump.cs
index 8e1ba29..88f39bf 100644
--- a/src/gui/jump.cs
+++ b/src/gui/jump.cs
@@ -782,19 +782,29 @@ public class RepairJumpRjWindow
partial class ChronoJumpWindow
{
- [Widget] Gtk.Label extra_window_label_limit;
- [Widget] Gtk.SpinButton extra_window_spinbutton_limit;
- [Widget] Gtk.Label extra_window_label_limit_units;
- [Widget] Gtk.SpinButton extra_window_spinbutton_weight;
- [Widget] Gtk.SpinButton extra_window_spinbutton_fall;
- [Widget] Gtk.RadioButton extra_window_radiobutton_kg;
- [Widget] Gtk.RadioButton extra_window_radiobutton_weight;
- [Widget] Gtk.Label extra_window_label_weight;
- [Widget] Gtk.Label extra_window_label_fall;
- [Widget] Gtk.Label extra_window_label_cm;
-
- [Widget] Gtk.Label extra_window_label_dj_arms;
- [Widget] Gtk.CheckButton extra_window_check_dj_arms;
+ //options jumps
+ [Widget] Gtk.SpinButton extra_window_jumps_spinbutton_weight;
+ [Widget] Gtk.SpinButton extra_window_jumps_spinbutton_fall;
+ [Widget] Gtk.RadioButton extra_window_jumps_radiobutton_kg;
+ [Widget] Gtk.RadioButton extra_window_jumps_radiobutton_weight;
+ [Widget] Gtk.Label extra_window_jumps_label_weight;
+ [Widget] Gtk.Label extra_window_jumps_label_fall;
+ [Widget] Gtk.Label extra_window_jumps_label_cm;
+ [Widget] Gtk.Label extra_window_jumps_label_dj_arms;
+ [Widget] Gtk.CheckButton extra_window_jumps_check_dj_arms;
+
+ //options jumps_rj
+ [Widget] Gtk.Label extra_window_jumps_rj_label_limit;
+ [Widget] Gtk.SpinButton extra_window_jumps_rj_spinbutton_limit;
+ [Widget] Gtk.Label extra_window_jumps_rj_label_limit_units;
+ [Widget] Gtk.SpinButton extra_window_jumps_rj_spinbutton_weight;
+ [Widget] Gtk.SpinButton extra_window_jumps_rj_spinbutton_fall;
+ [Widget] Gtk.RadioButton extra_window_jumps_rj_radiobutton_kg;
+ [Widget] Gtk.RadioButton extra_window_jumps_rj_radiobutton_weight;
+ [Widget] Gtk.Label extra_window_jumps_rj_label_weight;
+ [Widget] Gtk.Label extra_window_jumps_rj_label_fall;
+ [Widget] Gtk.Label extra_window_jumps_rj_label_cm;
+
[Widget] Gtk.RadioButton extra_window_radio_jump_free;
[Widget] Gtk.RadioButton extra_window_radio_jump_sj;
@@ -807,21 +817,28 @@ partial class ChronoJumpWindow
[Widget] Gtk.RadioButton extra_window_radio_jump_takeoff;
[Widget] Gtk.RadioButton extra_window_radio_jump_more;
- [Widget] Gtk.Label extra_window_label_selected_jump;
+ [Widget] Gtk.Label extra_window_jumps_label_selected;
+ [Widget] Gtk.Label extra_window_jumps_rj_label_selected;
//for RunAnalysis
//but will be used and recorded with "fall"
//static double distance;
- string extra_window_option = "Kg";
- double extra_window_limited = 10;
- bool extra_window_jumpsLimited;
- double extra_window_weight = 20;
- bool extra_window_arms = false;
- double extra_window_fall = 20;
+ //jumps
+ string extra_window_jumps_option = "Kg";
+ double extra_window_jumps_weight = 20;
+ double extra_window_jumps_fall = 20;
+ bool extra_window_jumps_arms = false;
+
+ //jumps_rj
+ double extra_window_jumps_rj_limited = 10;
+ bool extra_window_jumps_rj_jumpsLimited;
+ string extra_window_jumps_rj_option = "Kg";
+ double extra_window_jumps_rj_weight = 20;
+ double extra_window_jumps_rj_fall = 20;
- private void on_extra_window_test_changed(object o, EventArgs args)
+ private void on_extra_window_jumps_test_changed(object o, EventArgs args)
{
bool initializeNow = true;
if(extra_window_radio_jump_free.Active) currentJumpType = new JumpType("Free");
@@ -852,46 +869,27 @@ partial class ChronoJumpWindow
}
if(initializeNow)
- extra_window_initialize(currentJumpType);
+ extra_window_jumps_initialize(currentJumpType);
}
- private void extra_window_initialize(JumpType myJumpType)
+ private void extra_window_jumps_initialize(JumpType myJumpType)
{
- extra_window_label_selected_jump.Text = "<b>" + Catalog.GetString(currentJumpType.Name) + "</b>";
- extra_window_label_selected_jump.UseMarkup = true;
+ extra_window_jumps_label_selected.Text = "<b>" + Catalog.GetString(currentJumpType.Name) + "</b>";
+ extra_window_jumps_label_selected.UseMarkup = true;
currentEventType = currentJumpType;
changeTestImage(EventType.Types.JUMP.ToString(), currentJumpType.Name, currentJumpType.ImageFileName);
- if(myJumpType.IsRepetitive && myJumpType.FixedValue >= 0) {
- string jumpsName = Catalog.GetString("jumps");
- string secondsName = Catalog.GetString("seconds");
- if(myJumpType.JumpsLimited) {
- extra_window_jumpsLimited = true;
- extra_window_label_limit_units.Text = jumpsName;
- } else {
- extra_window_jumpsLimited = false;
- extra_window_label_limit_units.Text = secondsName;
- }
- if(myJumpType.FixedValue > 0) {
- extra_window_spinbutton_limit.Sensitive = false;
- extra_window_spinbutton_limit.Value = myJumpType.FixedValue;
- } else
- extra_window_spinbutton_limit.Value = extra_window_limited;
- extra_window_showRepetitiveData(true);
- } else
- extra_window_showRepetitiveData(false);
-
if(myJumpType.HasWeight)
- extra_window_showWeightData(true);
+ extra_window_showWeightData(myJumpType, true);
else
- extra_window_showWeightData(false);
+ extra_window_showWeightData(myJumpType, false);
if(myJumpType.StartIn || myJumpType.Name == Constants.TakeOffName ||
myJumpType.Name == Constants.TakeOffWeightName)
- extra_window_showFallData(false);
+ extra_window_showFallData(myJumpType, false);
else
- extra_window_showFallData(true);
+ extra_window_showFallData(myJumpType, true);
//show technique (arms) only in DJ
//on DJa and DJna (coming from More jumps) don't need to show technique data
@@ -902,16 +900,63 @@ partial class ChronoJumpWindow
else
extra_window_showTechniqueArmsData(true);
- extra_window_check_dj_arms.Active = extra_window_arms;
- extra_window_spinbutton_weight.Value = extra_window_weight;
- extra_window_spinbutton_fall.Value = extra_window_fall;
- if (extra_window_option == "Kg") {
- extra_window_radiobutton_kg.Active = true;
+ extra_window_jumps_check_dj_arms.Active = extra_window_jumps_arms;
+ extra_window_jumps_spinbutton_weight.Value = extra_window_jumps_weight;
+ extra_window_jumps_spinbutton_fall.Value = extra_window_jumps_fall;
+ if (extra_window_jumps_option == "Kg") {
+ extra_window_jumps_radiobutton_kg.Active = true;
+ } else {
+ extra_window_jumps_radiobutton_weight.Active = true;
+ }
+ }
+
+ private void extra_window_jumps_rj_initialize(JumpType myJumpType)
+ {
+ extra_window_jumps_rj_label_selected.Text = "<b>" + Catalog.GetString(currentJumpType.Name) + "</b>";
+ extra_window_jumps_rj_label_selected.UseMarkup = true;
+ currentEventType = currentJumpType;
+ changeTestImage(EventType.Types.JUMP.ToString(), currentJumpType.Name, currentJumpType.ImageFileName);
+
+ if(myJumpType.IsRepetitive && myJumpType.FixedValue >= 0) {
+ string jumpsName = Catalog.GetString("jumps");
+ string secondsName = Catalog.GetString("seconds");
+ if(myJumpType.JumpsLimited) {
+ extra_window_jumps_rj_jumpsLimited = true;
+ extra_window_jumps_rj_label_limit_units.Text = jumpsName;
+ } else {
+ extra_window_jumps_rj_jumpsLimited = false;
+ extra_window_jumps_rj_label_limit_units.Text = secondsName;
+ }
+ if(myJumpType.FixedValue > 0) {
+ extra_window_jumps_rj_spinbutton_limit.Sensitive = false;
+ extra_window_jumps_rj_spinbutton_limit.Value = myJumpType.FixedValue;
+ } else
+ extra_window_jumps_rj_spinbutton_limit.Value = extra_window_jumps_rj_limited;
+ //extra_window_showRepetitiveData(true);
+ } //else
+ // extra_window_showRepetitiveData(false);
+
+ if(myJumpType.HasWeight)
+ extra_window_showWeightData(myJumpType, true);
+ else
+ extra_window_showWeightData(myJumpType, false);
+
+ if(myJumpType.StartIn || myJumpType.Name == Constants.TakeOffName ||
+ myJumpType.Name == Constants.TakeOffWeightName)
+ extra_window_showFallData(myJumpType, false);
+ else
+ extra_window_showFallData(myJumpType, true);
+
+ extra_window_jumps_rj_spinbutton_weight.Value = extra_window_jumps_rj_weight;
+ extra_window_jumps_rj_spinbutton_fall.Value = extra_window_jumps_rj_fall;
+ if (extra_window_jumps_rj_option == "Kg") {
+ extra_window_jumps_rj_radiobutton_kg.Active = true;
} else {
- extra_window_radiobutton_weight.Active = true;
+ extra_window_jumps_rj_radiobutton_weight.Active = true;
}
}
+
private void on_extra_window_button_more_clicked (object o, EventArgs args)
{
}
@@ -942,8 +987,6 @@ partial class ChronoJumpWindow
extra_window_toogle_desired_button_on_toolbar(currentJumpType);
- //extra_window_initialize(currentJumpType);
-
//destroy the win for not having updating problems if a new jump type is created
//jumpsMoreWin = null; //don't work
jumpsMoreWin.Destroy(); //works ;)
@@ -964,73 +1007,96 @@ partial class ChronoJumpWindow
//extra_window_radio_jump_more.Active = true;
//because it will be a loop
//only do:
- extra_window_initialize(type);
+ extra_window_jumps_initialize(type);
}
}
-
- private void extra_window_showRepetitiveData (bool show) {
- extra_window_label_limit.Visible = show;
- extra_window_spinbutton_limit.Visible = show;
- extra_window_label_limit_units.Visible = show;
- }
-
- private void extra_window_showWeightData (bool show) {
- extra_window_label_weight.Visible = show;
- extra_window_spinbutton_weight.Visible = show;
- extra_window_radiobutton_kg.Visible = show;
- extra_window_radiobutton_weight.Visible = show;
+
+ private void extra_window_showWeightData (JumpType myJumpType, bool show) {
+ if(myJumpType.IsRepetitive) {
+ extra_window_jumps_rj_label_weight.Visible = show;
+ extra_window_jumps_rj_spinbutton_weight.Visible = show;
+ extra_window_jumps_rj_radiobutton_kg.Visible = show;
+ extra_window_jumps_rj_radiobutton_weight.Visible = show;
+ } else {
+ extra_window_jumps_label_weight.Visible = show;
+ extra_window_jumps_spinbutton_weight.Visible = show;
+ extra_window_jumps_radiobutton_kg.Visible = show;
+ extra_window_jumps_radiobutton_weight.Visible = show;
+ }
}
private void extra_window_showTechniqueArmsData (bool show) {
- extra_window_label_dj_arms.Visible = show;
- extra_window_check_dj_arms.Visible = show;
+ extra_window_jumps_label_dj_arms.Visible = show;
+ extra_window_jumps_check_dj_arms.Visible = show;
}
- private void extra_window_showFallData (bool show) {
- extra_window_label_fall.Visible = show;
- extra_window_spinbutton_fall.Visible = show;
- extra_window_label_cm.Visible = show;
+ private void extra_window_showFallData (JumpType myJumpType, bool show) {
+ if(myJumpType.IsRepetitive) {
+ extra_window_jumps_rj_label_fall.Visible = show;
+ extra_window_jumps_rj_spinbutton_fall.Visible = show;
+ extra_window_jumps_rj_label_cm.Visible = show;
+ } else {
+ extra_window_jumps_label_fall.Visible = show;
+ extra_window_jumps_spinbutton_fall.Visible = show;
+ extra_window_jumps_label_cm.Visible = show;
+ }
}
void on_button_execute_test_clicked (object o, EventArgs args) {
- extra_window_limited = (double) extra_window_spinbutton_limit.Value;
- extra_window_weight = (double) extra_window_spinbutton_weight.Value;
- extra_window_fall = (double) extra_window_spinbutton_fall.Value;
- extra_window_arms = extra_window_check_dj_arms.Active;
-
- //need to check DJ because is what happens when press DJ button
- //need to check other because maybe we changed some option since last jump
- //and currentJumpType.Name is the name of last jump type, eg: DJa
- if(currentJumpType.Name == "DJ" || currentJumpType.Name == "DJa" || currentJumpType.Name == "DJna") {
- if(extra_window_arms)
- currentJumpType = new JumpType("DJa");
- else
- currentJumpType = new JumpType("DJna");
- }
+ if(radio_mode_jumps.Active) {
+ extra_window_jumps_weight = (double) extra_window_jumps_spinbutton_weight.Value;
+ extra_window_jumps_fall = (double) extra_window_jumps_spinbutton_fall.Value;
+ extra_window_jumps_arms = extra_window_jumps_check_dj_arms.Active;
+
+ //need to check DJ because is what happens when press DJ button
+ //need to check other because maybe we changed some option since last jump
+ //and currentJumpType.Name is the name of last jump type, eg: DJa
+ if(currentJumpType.Name == "DJ" ||
+ currentJumpType.Name == "DJa" || currentJumpType.Name == "DJna") {
+ if(extra_window_jumps_arms)
+ currentJumpType = new JumpType("DJa");
+ else
+ currentJumpType = new JumpType("DJna");
+ }
+
+ on_normal_jump_activate(o, args);
+ } else if(radio_mode_jumps_reactive.Active) {
+ extra_window_jumps_rj_limited = (double) extra_window_jumps_rj_spinbutton_limit.Value;
+ extra_window_jumps_rj_weight = (double) extra_window_jumps_rj_spinbutton_weight.Value;
+ extra_window_jumps_rj_fall = (double) extra_window_jumps_rj_spinbutton_fall.Value;
- on_normal_jump_activate(o, args);
+ //on_normal_jump_activate(o, args);
+ }
}
- private void on_radiobutton_kg_toggled (object o, EventArgs args)
+ private void on_extra_window_jumps_radiobutton_kg_toggled (object o, EventArgs args)
+ {
+ extra_window_jumps_option = "Kg";
+ }
+
+ private void on_extra_window_jumps_radiobutton_weight_toggled (object o, EventArgs args)
+ {
+ extra_window_jumps_option = "%";
+ }
+
+ private void on_extra_window_jumps_rj_radiobutton_kg_toggled (object o, EventArgs args)
{
- extra_window_option = "Kg";
- Log.WriteLine(string.Format("option: {0}", extra_window_option));
+ extra_window_jumps_rj_option = "Kg";
}
- private void on_radiobutton_weight_toggled (object o, EventArgs args)
+ private void on_extra_window_jumps_rj_radiobutton_weight_toggled (object o, EventArgs args)
{
- extra_window_option = "%";
- Log.WriteLine(string.Format("option: {0}", extra_window_option));
+ extra_window_jumps_rj_option = "%";
}
private string limitString()
{
- if(extra_window_jumpsLimited)
- return extra_window_limited.ToString() + "J";
+ if(extra_window_jumps_rj_jumpsLimited)
+ return extra_window_jumps_rj_limited.ToString() + "J";
else
- return extra_window_limited.ToString() + "T";
+ return extra_window_jumps_rj_limited.ToString() + "T";
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
