[chronojump] gui change(jump extra win on main gui)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] gui change(jump extra win on main gui)
- Date: Fri, 18 Mar 2011 14:04:35 +0000 (UTC)
commit 4de3deb8459feb6cfe3e541c1fd5d5029736ff1f
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Mar 18 15:04:04 2011 +0100
gui change(jump extra win on main gui)
glade/chronojump.glade | 1400 ++++++++++++++++++++++++++----------------------
src/gui/chronojump.cs | 145 +-----
src/gui/jump.cs | 328 +++++++-----
3 files changed, 959 insertions(+), 914 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 18bf3c8..aad693e 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -2420,217 +2420,7 @@ show elevation as:</property>
</packing>
</child>
<child>
- <widget class="GtkTable" id="table11">
- <property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">4</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">6</property>
- <child>
- <widget class="GtkLabel" id="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="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">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="GtkRadioButton" id="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="draw_indicator">True</property>
- <signal name="toggled" handler="on_radiobutton_kg_toggled"/>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</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="GtkRadioButton" id="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">radiobutton_kg</property>
- <signal name="toggled" handler="on_radiobutton_weight_toggled"/>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</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="label_cm">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">cm</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</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="GtkSpinButton" id="spinbutton_weight">
- <property name="visible">True</property>
- <property name="can_focus">True</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="left_attach">1</property>
- <property name="right_attach">2</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="GtkSpinButton" id="spinbutton_fall">
- <property name="visible">True</property>
- <property name="can_focus">True</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="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="GtkLabel" id="label_limit_units">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="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="GtkSpinButton" id="spinbutton_limit">
- <property name="visible">True</property>
- <property name="can_focus">True</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="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="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">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="GtkCheckButton" id="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="draw_indicator">True</property>
- </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="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
+ <placeholder/>
</child>
<child>
<widget class="GtkHButtonBox" id="hbuttonbox7">
@@ -17249,113 +17039,60 @@ by you</property>
<child>
<widget class="GtkMenu" id="menu_jumps_menu">
<child>
- <widget class="GtkMenuItem" id="menu_execute_simple_jumps1">
+ <widget class="GtkMenuItem" id="menu_execute_repetitive_jumps1">
<property name="visible">True</property>
- <property name="label" translatable="yes">Execute simple jump</property>
+ <property name="label" translatable="yes">Execute reactive jump</property>
<property name="use_underline">True</property>
<child>
- <widget class="GtkMenu" id="execute_simple_jumps1_menu">
- <child>
- <widget class="GtkMenuItem" id="menuitem_jump_free">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Free Jump</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_normal_jump_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="sj">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Squat Jump</property>
- <property name="label" translatable="yes">SJ</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_normal_jump_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="sj_l">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Squat Jump with extra weight</property>
- <property name="label" translatable="yes">SJl</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_jump_extra_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="cmj">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">CounterMovement Jump</property>
- <property name="label" translatable="yes">CMJ</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_normal_jump_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="cmj_l">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">CounterMovement Jump with extra weight</property>
- <property name="label" translatable="yes">CMJl</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_jump_extra_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="abk">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Abalakov Jump (CounterMovement using arms)</property>
- <property name="label" translatable="yes">ABK</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_normal_jump_activate"/>
- </widget>
- </child>
+ <widget class="GtkMenu" id="execute_repetitive_jumps1_menu">
<child>
- <widget class="GtkMenuItem" id="jumps_max">
+ <widget class="GtkMenuItem" id="rj_j">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Maximum Jump (like Abalakov but with free technique)</property>
- <property name="label" translatable="yes">Max</property>
+ <property name="tooltip" translatable="yes">Reactive Jump limited by Jumps</property>
+ <property name="label" translatable="yes">RJ(j)</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_normal_jump_activate"/>
+ <signal name="activate" handler="on_rj_activate"/>
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="dj">
+ <widget class="GtkMenuItem" id="rj_t">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Drop Jump</property>
- <property name="label" translatable="yes">DJ</property>
+ <property name="tooltip" translatable="yes">Reactive Jump limited by Time</property>
+ <property name="label" translatable="yes">RJ(t)</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_jump_extra_activate"/>
+ <signal name="activate" handler="on_rj_activate"/>
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="menuitem_jump_rocket">
+ <widget class="GtkMenuItem" id="rj_unlimited">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Rocket Jump</property>
- <property name="label" translatable="yes">Rocket</property>
+ <property name="tooltip" translatable="yes">Reactive Jump unlimited (until finish button is clicked)</property>
+ <property name="label" translatable="yes">RJ(unlimited)</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_normal_jump_activate"/>
+ <signal name="activate" handler="on_rj_activate"/>
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="menuitem_take_off">
+ <widget class="GtkMenuItem" id="menuitem_hexagon">
<property name="visible">True</property>
- <property name="label" translatable="yes">Take Off</property>
+ <property name="label" translatable="yes">Hexagon</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_normal_jump_activate"/>
+ <signal name="activate" handler="on_rj_activate"/>
</widget>
</child>
<child>
- <widget class="GtkSeparatorMenuItem" id="separador21">
+ <widget class="GtkSeparatorMenuItem" id="separador20">
<property name="visible">True</property>
</widget>
</child>
<child>
- <widget class="GtkImageMenuItem" id="more_simple_jumps">
- <property name="label" translatable="yes">More simple jumps</property>
+ <widget class="GtkImageMenuItem" id="more_rj">
+ <property name="label" translatable="yes">More reactive jumps</property>
<property name="visible">True</property>
<property name="use_stock">False</property>
- <signal name="activate" handler="on_button_more_clicked"/>
+ <signal name="activate" handler="on_button_more_rj_clicked"/>
<child internal-child="image">
- <widget class="GtkImage" id="image26">
+ <widget class="GtkImage" id="image27">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
</widget>
@@ -17367,13 +17104,13 @@ by you</property>
</widget>
</child>
<child>
- <widget class="GtkImageMenuItem" id="menuitem_edit_selected_jump">
- <property name="label" translatable="yes">Edit selected jump</property>
+ <widget class="GtkImageMenuItem" id="menuitem_edit_selected_jump_rj">
+ <property name="label" translatable="yes">Edit selected RJ jump</property>
<property name="visible">True</property>
<property name="use_stock">False</property>
- <signal name="activate" handler="on_edit_selected_jump_clicked"/>
+ <signal name="activate" handler="on_edit_selected_jump_rj_clicked"/>
<child internal-child="image">
- <widget class="GtkImage" id="image23">
+ <widget class="GtkImage" id="image24">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
</widget>
@@ -17381,13 +17118,27 @@ by you</property>
</widget>
</child>
<child>
- <widget class="GtkImageMenuItem" id="menuitem_delete_selected_jump">
- <property name="label" translatable="yes">Delete selected jump</property>
+ <widget class="GtkImageMenuItem" id="menuitem_repair_selected_jump_rj">
+ <property name="label" translatable="yes">Repair selected RJ jump</property>
+ <property name="visible">True</property>
+ <property name="use_stock">False</property>
+ <signal name="activate" handler="on_repair_selected_jump_rj_clicked"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image25">
+ <property name="visible">True</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkImageMenuItem" id="menuitem_delete_selected_jump_rj">
+ <property name="label" translatable="yes">Delete selected RJ jump</property>
<property name="visible">True</property>
<property name="use_stock">False</property>
- <signal name="activate" handler="on_delete_selected_jump_clicked"/>
+ <signal name="activate" handler="on_delete_selected_jump_rj_clicked"/>
<child internal-child="image">
- <widget class="GtkImage" id="image21">
+ <widget class="GtkImage" id="image22">
<property name="visible">True</property>
<property name="stock">gtk-delete</property>
</widget>
@@ -17395,158 +17146,13 @@ by you</property>
</widget>
</child>
<child>
- <widget class="GtkSeparatorMenuItem" id="separador7">
+ <widget class="GtkSeparatorMenuItem" id="separador2">
<property name="visible">True</property>
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="menu_execute_repetitive_jumps1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Execute reactive jump</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="execute_repetitive_jumps1_menu">
- <child>
- <widget class="GtkMenuItem" id="rj_j">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Reactive Jump limited by Jumps</property>
- <property name="label" translatable="yes">RJ(j)</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_rj_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="rj_t">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Reactive Jump limited by Time</property>
- <property name="label" translatable="yes">RJ(t)</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_rj_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="rj_unlimited">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Reactive Jump unlimited (until finish button is clicked)</property>
- <property name="label" translatable="yes">RJ(unlimited)</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_rj_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="menuitem_hexagon">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Hexagon</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_rj_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separador20">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="more_rj">
- <property name="label" translatable="yes">More reactive jumps</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="on_button_more_rj_clicked"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image27">
- <property name="visible">True</property>
- <property name="stock">gtk-add</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem_edit_selected_jump_rj">
- <property name="label" translatable="yes">Edit selected RJ jump</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="on_edit_selected_jump_rj_clicked"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image24">
- <property name="visible">True</property>
- <property name="stock">gtk-edit</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem_repair_selected_jump_rj">
- <property name="label" translatable="yes">Repair selected RJ jump</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="on_repair_selected_jump_rj_clicked"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image25">
- <property name="visible">True</property>
- <property name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem_delete_selected_jump_rj">
- <property name="label" translatable="yes">Delete selected RJ jump</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="on_delete_selected_jump_rj_clicked"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image22">
- <property name="visible">True</property>
- <property name="stock">gtk-delete</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separador8">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem_jump_type_add">
- <property name="label" translatable="yes">Add jump type</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="on_jump_type_add_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image5">
- <property name="visible">True</property>
- <property name="stock">gtk-new</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separador2">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem_jump_type_delete_simple">
- <property name="label" translatable="yes">Delete simple jump type</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="on_jump_type_delete_simple_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="stock">gtk-delete</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem_jump_type_delete_reactive">
- <property name="label" translatable="yes">Delete reactive jump type</property>
+ <widget class="GtkImageMenuItem" id="menuitem_jump_type_delete_reactive">
+ <property name="label" translatable="yes">Delete reactive jump type</property>
<property name="visible">True</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_jump_type_delete_reactive_activate"/>
@@ -18823,234 +18429,281 @@ Chronopic</property>
<property name="can_focus">True</property>
<property name="show_tabs">False</property>
<child>
- <widget class="GtkHBox" id="hbox_jumps">
+ <widget class="GtkFrame" id="frame2">
<property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">out</property>
<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>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment2">
+ <widget class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="left_padding">6</property>
<child>
- <widget class="GtkVBox" id="vbox10">
+ <widget class="GtkVBox" id="vbox14">
<property name="visible">True</property>
<child>
- <widget class="GtkButton" id="button_more">
+ <widget class="GtkHBox" id="hbox19">
<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_button_more_clicked"/>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkImage" id="image3167">
+ <widget class="GtkHBox" id="hbox21">
<property name="visible">True</property>
- <property name="stock">gtk-add</property>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_jump_free">
+ <property name="label" translatable="yes">Free</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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"/>
+ </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_radio_jump_sj">
+ <property name="label" translatable="yes">SJ</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_jump_sjl">
+ <property name="label" translatable="yes">SJl</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_jump_cmj">
+ <property name="label" translatable="yes">CMJ</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_jump_cmjl">
+ <property name="label" translatable="yes">CMJl</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_jump_abk">
+ <property name="label" translatable="yes">ABK</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_jump_dj">
+ <property name="label" translatable="yes">DJ</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_jump_rocket">
+ <property name="label" translatable="yes">Rocket</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">7</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_jump_takeoff">
+ <property name="label" translatable="yes">TakeOff</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">8</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_jump_more">
+ <property name="label" translatable="yes">More jumps</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">9</property>
+ </packing>
+ </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="hbox20">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkButton" id="button20">
+ <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">Add jump type</property>
+ <signal name="clicked" handler="on_jump_type_add_activate"/>
+ <child>
+ <widget class="GtkImage" id="image3210">
+ <property name="visible">True</property>
+ <property name="stock">gtk-new</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="GtkButton" id="button_jump_type_delete_simple">
+ <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">Delete jump type</property>
+ <signal name="clicked" handler="on_jump_type_delete_simple_clicked"/>
+ <child>
+ <widget class="GtkImage" id="image5">
+ <property name="visible">True</property>
+ <property name="stock">gtk-remove</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
</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="hbox12">
+ <widget class="GtkHBox" id="hbox18">
<property name="visible">True</property>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkButton" id="button_last">
+ <widget class="GtkLabel" id="label19">
<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">Repeat last</property>
- <signal name="clicked" handler="on_button_last_clicked"/>
- <child>
- <widget class="GtkImage" id="image3168">
- <property name="visible">True</property>
- <property name="stock">gtk-redo</property>
- </widget>
- </child>
+ <property name="label" translatable="yes">Selected:</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button20">
+ <widget class="GtkLabel" id="extra_window_label_selected_jump">
<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">Add jump type</property>
- <signal name="clicked" handler="on_jump_type_add_activate"/>
- <child>
- <widget class="GtkImage" id="image3210">
- <property name="visible">True</property>
- <property name="stock">gtk-new</property>
- </widget>
- </child>
+ <property name="label" translatable="yes">the selected test</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -19062,16 +18715,18 @@ Chronopic</property>
</widget>
</child>
</widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label13">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Select test</b></property>
+ <property name="use_markup">True</property>
+ </widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">9</property>
+ <property name="type">label_item</property>
</packing>
</child>
</widget>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
</child>
<child>
<widget class="GtkLabel" id="label1">
@@ -20171,17 +19826,244 @@ Chronopic</property>
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">3</property>
+ <property name="column_spacing">6</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="shadow_type">none</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>
- <placeholder/>
+ <widget class="GtkTable" id="table_extra_window">
+ <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>
+ <child>
+ <widget class="GtkHBox" id="hbox22">
+ <property name="visible">True</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkSpinButton" id="extra_window_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_label_limit_units">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="position">1</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>
+ <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"/>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radiobutton_weight">
+ <property name="label" translatable="yes">% body
+weight</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">extra_window_radiobutton_kg</property>
+ <signal name="toggled" handler="on_radiobutton_weight_toggled"/>
+ </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">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>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</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>
+ </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_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_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">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">
+ <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>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
</child>
</widget>
</child>
@@ -20198,6 +20080,7 @@ Chronopic</property>
</widget>
<packing>
<property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -20304,12 +20187,15 @@ window</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label13">
+ <widget class="GtkButton" id="button_execute_test">
+ <property name="label" translatable="yes">Execute test</property>
<property name="visible">True</property>
- <property name="label">button execute test
-(auto clicked if no options)</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_button_execute_test_clicked"/>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -20378,6 +20264,218 @@ the test done</property>
<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>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkVBox" id="vbox10">
+ <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">
+ <property name="visible">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">9</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index dab8b4f..a65f979 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -32,7 +32,7 @@ using LongoMatch.Video.Capturer;
using LongoMatch.Video.Common;
-public class ChronoJumpWindow
+public partial class ChronoJumpWindow
{
[Widget] Gtk.Window app1;
@@ -105,10 +105,6 @@ public class ChronoJumpWindow
//tests
//jumps
- [Widget] Gtk.MenuItem menu_execute_simple_jumps1;
- [Widget] Gtk.MenuItem menuitem_edit_selected_jump;
- [Widget] Gtk.MenuItem menuitem_delete_selected_jump;
- [Widget] Gtk.MenuItem menu_execute_repetitive_jumps1;
[Widget] Gtk.MenuItem menuitem_edit_selected_jump_rj;
[Widget] Gtk.MenuItem menuitem_repair_selected_jump_rj;
[Widget] Gtk.MenuItem menuitem_delete_selected_jump_rj;
@@ -120,19 +116,8 @@ public class ChronoJumpWindow
[Widget] Gtk.Button button_delete_selected_jump_rj;
[Widget] Gtk.Button button_repair_selected_jump_rj;
[Widget] Gtk.MenuItem menuitem_jump_type_add;
- [Widget] Gtk.MenuItem menuitem_jump_type_delete_simple;
[Widget] Gtk.MenuItem menuitem_jump_type_delete_reactive;
- [Widget] Gtk.MenuItem menuitem_jump_free;
- [Widget] Gtk.MenuItem sj;
- [Widget] Gtk.MenuItem sj_l;
- [Widget] Gtk.MenuItem cmj;
- [Widget] Gtk.MenuItem cmj_l;
- [Widget] Gtk.MenuItem abk;
- [Widget] Gtk.MenuItem dj;
- [Widget] Gtk.MenuItem menuitem_jump_rocket;
- [Widget] Gtk.MenuItem menuitem_take_off;
- [Widget] Gtk.MenuItem more_simple_jumps;
[Widget] Gtk.MenuItem more_rj;
[Widget] Gtk.MenuItem rj_j;
[Widget] Gtk.MenuItem rj_t;
@@ -259,7 +244,6 @@ public class ChronoJumpWindow
//[Widget] Gtk.Button button_pulse_more;
- [Widget] Gtk.Button button_last;
[Widget] Gtk.Button button_rj_last;
[Widget] Gtk.Button button_run_last;
[Widget] Gtk.Button button_run_interval_last;
@@ -374,7 +358,6 @@ public class ChronoJumpWindow
PersonAddMultipleWindow personAddMultipleWin;
JumpsMoreWindow jumpsMoreWin;
JumpsRjMoreWindow jumpsRjMoreWin;
- JumpExtraWindow jumpExtraWin; //for normal and repetitive jumps
EditJumpWindow editJumpWin;
EditJumpRjWindow editJumpRjWin;
RepairJumpRjWindow repairJumpRjWin;
@@ -487,6 +470,8 @@ public class ChronoJumpWindow
createComboPulses();
createComboMultiChronopic();
createdStatsWin = false;
+
+ on_extra_window_test_changed(new object(), new EventArgs());
repetitiveConditionsWin = RepetitiveConditionsWindow.Create();
@@ -2775,7 +2760,9 @@ Console.WriteLine("X");
}
+
private void on_button_enter (object o, EventArgs args) {
+ /*
//jump simple
if(o == (object) button_free || o == (object) menuitem_jump_free) {
currentEventType = new JumpType("Free");
@@ -2859,6 +2846,7 @@ Console.WriteLine("X");
}
changeTestImage(currentEventType.Type.ToString(), currentEventType.Name, currentEventType.ImageFileName);
+ */
}
@@ -2924,122 +2912,27 @@ Console.WriteLine("X");
* --------------------------------------------------------
*/
- private void on_button_more_clicked (object o, EventArgs args)
- {
- jumpsMoreWin = JumpsMoreWindow.Show(app1, true);
- jumpsMoreWin.Button_accept.Clicked += new EventHandler(on_more_jumps_accepted);
- jumpsMoreWin.Button_selected.Clicked += new EventHandler(on_more_jumps_draw_image_test);
- }
-
- private void on_more_jumps_draw_image_test (object o, EventArgs args) {
- currentEventType = new JumpType(jumpsMoreWin.SelectedEventName);
- changeTestImage(currentEventType.Type.ToString(), currentEventType.Name, currentEventType.ImageFileName);
- }
-
- private void on_button_last_clicked (object o, EventArgs args)
- {
- //currentJumpType contains the last jump type
- if( ! currentJumpType.StartIn || currentJumpType.HasWeight) {
- on_jump_extra_activate(o, args);
- } else {
- on_normal_jump_activate(o, args);
- }
- }
-
- //used from the dialogue "jumps more"
- private void on_more_jumps_accepted (object o, EventArgs args)
- {
- jumpsMoreWin.Button_accept.Clicked -= new EventHandler(on_more_jumps_accepted);
-
- currentJumpType = new JumpType(
- //jumpsMoreWin.SelectedJumpType,
- jumpsMoreWin.SelectedEventName, //type of jump
- //SelectedEventType would be: jump, or run, ...
- jumpsMoreWin.SelectedStartIn,
- jumpsMoreWin.SelectedExtraWeight,
- false, //isRepetitive
- false, //jumpsLimited (false, because is not repetitive)
- 0, //limitValue
- false, //unlimited
- jumpsMoreWin.SelectedDescription,
- SqliteEvent.GraphLinkSelectFileName("jump", jumpsMoreWin.SelectedEventName)
- );
-
- //destroy the win for not having updating problems if a new jump type is created
- //jumpsMoreWin = null; //don't work
- jumpsMoreWin.Destroy(); //works ;)
-
- if( ! currentJumpType.StartIn || currentJumpType.HasWeight) {
- on_jump_extra_activate(o, args);
- } else {
- on_normal_jump_activate(o, args);
- }
- }
//here comes the SJl, DJ and every jump that has weight or fall or both. Also the reactive jumps (for defining is limited value or weight or fall)
private void on_jump_extra_activate (object o, EventArgs args)
{
- Log.WriteLine("jump extra");
- if(o == (object) button_sj_l || o == (object) sj_l) {
- currentJumpType = new JumpType("SJl");
- } else if(o == (object) button_dj || o == (object) dj) {
- currentJumpType = new JumpType("DJ");
- } else if(o == (object) button_cmj_l || o == (object) cmj_l) {
- currentJumpType = new JumpType("CMJl");
-// currently no abk_l button or menu
-// } else if(o == (object) button_abk_l || o == (object) abk_l) {
-// currentJumpType = new JumpType("ABKl");
- } else {
- }
-
- jumpExtraWin = JumpExtraWindow.Show(app1, currentJumpType);
- if( currentJumpType.IsRepetitive ) {
- jumpExtraWin.Button_accept.Clicked += new EventHandler(on_rj_accepted);
- } else {
- jumpExtraWin.Button_accept.Clicked += new EventHandler(on_normal_jump_activate);
- }
}
//suitable for all jumps not repetitive
private void on_normal_jump_activate (object o, EventArgs args)
{
- if(o == (object) button_free || o == (object) menuitem_jump_free) {
- currentJumpType = new JumpType("Free");
- }else if(o == (object) button_sj || o == (object) sj) {
- currentJumpType = new JumpType("SJ");
- } else if (o == (object) button_cmj || o == (object) cmj) {
- currentJumpType = new JumpType("CMJ");
- } else if (o == (object) button_abk || o == (object) abk) {
- currentJumpType = new JumpType("ABK");
- } else if (o == (object) button_rocket || o == (object) menuitem_jump_rocket) {
- currentJumpType = new JumpType("Rocket");
- } else if (o == (object) button_take_off || o == (object) menuitem_take_off) {
- currentJumpType = new JumpType(Constants.TakeOffName);
- } else {
- }
-
- //jumpType is a DJ?... with or without arms?
- if(currentJumpType.Name == "DJ") {
- if(jumpExtraWin.Arms)
- currentJumpType = new JumpType("DJa");
- else
- currentJumpType = new JumpType("DJna");
- }
-
- changeTestImage(EventType.Types.JUMP.ToString(), currentJumpType.Name, currentJumpType.ImageFileName);
-
double jumpWeight = 0;
if(currentJumpType.HasWeight) {
- if(jumpExtraWin.Option == "%")
- jumpWeight = jumpExtraWin.Weight;
+ if(extra_window_option == "%")
+ jumpWeight = extra_window_weight;
else
- jumpWeight = Util.WeightFromKgToPercent(jumpExtraWin.Weight, currentPersonSession.Weight);
+ jumpWeight = Util.WeightFromKgToPercent(extra_window_weight, currentPersonSession.Weight);
}
double myFall = 0;
if(currentJumpType.Name == Constants.TakeOffName || currentJumpType.Name == Constants.TakeOffWeightName)
myFall = 0;
else if( ! currentJumpType.StartIn) {
- myFall = jumpExtraWin.Fall;
+ myFall = extra_window_fall;
}
@@ -3195,6 +3088,7 @@ Console.WriteLine("X");
}
private void on_rj_activate (object o, EventArgs args) {
+ /*
if(o == (object) button_rj_j || o == (object) rj_j)
{
currentJumpType = new JumpType("RJ(j)");
@@ -3218,9 +3112,11 @@ Console.WriteLine("X");
//in this jump type, don't ask for limit of jumps or seconds
on_rj_accepted(o, args);
}
+ */
}
private void on_rj_accepted (object o, EventArgs args)
{
+ /*
changeTestImage(EventType.Types.JUMP.ToString(), currentJumpType.Name, currentJumpType.ImageFileName);
double myLimit = 0;
@@ -3294,6 +3190,7 @@ Console.WriteLine("X");
currentEventExecute.Manage();
currentEventExecute.FakeButtonFinished.Clicked += new EventHandler(on_jump_rj_finished);
+ */
}
private void on_jump_rj_finished (object o, EventArgs args)
@@ -4947,7 +4844,7 @@ Console.WriteLine("X");
* --------------------------------------------------------
*/
- private void on_jump_type_delete_simple_activate (object o, EventArgs args) {
+ private void on_jump_type_delete_simple_clicked (object o, EventArgs args) {
jumpsMoreWin = JumpsMoreWindow.Show(app1, false); //delete jump type
}
@@ -5160,15 +5057,9 @@ Console.WriteLine("X");
private void menuJumpsSensitive(bool option)
{
- menu_execute_simple_jumps1.Sensitive = option;
- menuitem_edit_selected_jump.Sensitive = option;
- menuitem_delete_selected_jump.Sensitive = option;
- menu_execute_repetitive_jumps1.Sensitive = option;
menuitem_edit_selected_jump_rj.Sensitive = option;
menuitem_repair_selected_jump_rj.Sensitive = option;
menuitem_delete_selected_jump_rj.Sensitive = option;
- menuitem_jump_type_add.Sensitive = option;
- menuitem_jump_type_delete_simple.Sensitive = option;
menuitem_jump_type_delete_reactive.Sensitive = option;
}
@@ -5229,7 +5120,7 @@ Console.WriteLine("X");
notebook_execute.Sensitive = false;
notebook_results.Sensitive = false;
- button_last.Sensitive = false;
+ //button_last.Sensitive = false;
button_rj_last.Sensitive=false;
button_run_last.Sensitive=false;
button_run_interval_last.Sensitive=false;
@@ -5317,9 +5208,7 @@ Console.WriteLine("X");
case EventType.Types.JUMP:
if(currentJumpType.IsRepetitive) {
button_rj_last.Sensitive = true;
- button_last.Sensitive = false;
} else {
- button_last.Sensitive = true;
button_rj_last.Sensitive = false;
}
break;
@@ -5356,8 +5245,6 @@ Console.WriteLine("X");
private void showHideActionEventButtons(bool show, string type) {
bool success = false;
if(type == "ALL" || type == "Jump") {
- menuitem_edit_selected_jump.Sensitive = show;
- menuitem_delete_selected_jump.Sensitive = show;
button_edit_selected_jump.Sensitive = show;
button_delete_selected_jump.Sensitive = show;
diff --git a/src/gui/jump.cs b/src/gui/jump.cs
index 8c7bd72..8e1ba29 100644
--- a/src/gui/jump.cs
+++ b/src/gui/jump.cs
@@ -780,199 +780,259 @@ public class RepairJumpRjWindow
//---------------- jump extra WIDGET --------------------
//--------------------------------------------------------
-public class JumpExtraWindow
+partial class ChronoJumpWindow
{
- [Widget] Gtk.Window jump_extra;
- [Widget] Gtk.Label label_limit;
- [Widget] Gtk.SpinButton spinbutton_limit;
- [Widget] Gtk.Label label_limit_units;
- [Widget] Gtk.SpinButton spinbutton_weight;
- [Widget] Gtk.SpinButton spinbutton_fall;
- [Widget] Gtk.Button button_accept;
- [Widget] Gtk.RadioButton radiobutton_kg;
- [Widget] Gtk.RadioButton radiobutton_weight;
- [Widget] Gtk.Label label_weight;
- [Widget] Gtk.Label label_fall;
- [Widget] Gtk.Label label_cm;
-
- [Widget] Gtk.Label label_dj_arms;
- [Widget] Gtk.CheckButton check_dj_arms;
+ [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;
+
+ [Widget] Gtk.RadioButton extra_window_radio_jump_free;
+ [Widget] Gtk.RadioButton extra_window_radio_jump_sj;
+ [Widget] Gtk.RadioButton extra_window_radio_jump_sjl;
+ [Widget] Gtk.RadioButton extra_window_radio_jump_cmj;
+ [Widget] Gtk.RadioButton extra_window_radio_jump_cmjl;
+ [Widget] Gtk.RadioButton extra_window_radio_jump_abk;
+ [Widget] Gtk.RadioButton extra_window_radio_jump_dj;
+ [Widget] Gtk.RadioButton extra_window_radio_jump_rocket;
+ [Widget] Gtk.RadioButton extra_window_radio_jump_takeoff;
+ [Widget] Gtk.RadioButton extra_window_radio_jump_more;
+
+ [Widget] Gtk.Label extra_window_label_selected_jump;
//for RunAnalysis
//but will be used and recorded with "fall"
//static double distance;
- static string option = "Kg";
- static double limited = 10;
- static bool jumpsLimited;
- static double weight = 20;
- static bool arms = false;
- static double fall = 20;
+ 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;
- static JumpExtraWindow JumpExtraWindowBox;
- Gtk.Window parent;
-
- JumpExtraWindow (Gtk.Window parent) {
- Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "jump_extra", null);
- gladeXML.Autoconnect(this);
- this.parent = parent;
-
- //put an icon to window
- UtilGtk.IconWindow(jump_extra);
- }
- static public JumpExtraWindow Show (Gtk.Window parent, JumpType myJumpType)
+ private void on_extra_window_test_changed(object o, EventArgs args)
{
- if (JumpExtraWindowBox == null) {
- JumpExtraWindowBox = new JumpExtraWindow (parent);
+ bool initializeNow = true;
+ if(extra_window_radio_jump_free.Active) currentJumpType = new JumpType("Free");
+ else if(extra_window_radio_jump_sj.Active) currentJumpType = new JumpType("SJ");
+ else if(extra_window_radio_jump_sjl.Active) currentJumpType = new JumpType("SJl");
+ else if(extra_window_radio_jump_cmj.Active) currentJumpType = new JumpType("CMJ");
+ else if(extra_window_radio_jump_cmjl.Active) currentJumpType = new JumpType("CMJl");
+ else if(extra_window_radio_jump_abk.Active) currentJumpType = new JumpType("ABK");
+ else if(extra_window_radio_jump_dj.Active) currentJumpType = new JumpType("DJ");
+ else if(extra_window_radio_jump_rocket.Active) currentJumpType = new JumpType("Rocket");
+ else if(extra_window_radio_jump_takeoff.Active) currentJumpType = new JumpType(Constants.TakeOffName);
+ else if(extra_window_radio_jump_more.Active) {
+ jumpsMoreWin = JumpsMoreWindow.Show(app1, true);
+ jumpsMoreWin.Button_accept.Clicked += new EventHandler(on_more_jumps_accepted);
+ jumpsMoreWin.Button_selected.Clicked += new EventHandler(on_more_jumps_draw_image_test);
}
+ else if(extra_window_radio_jump_more.Active == false) {
+ //if we arrive here
+ //a test changed
+ //but is none of above
+ //also more is not activated
+ //it means that we click again more
+ //because we want to see again the more jumps option
+ extra_window_radio_jump_more.Active = true;
+ //this will come here again and the more.Active will be run
+ initializeNow = false;
+ //in fact, we never arrive here, becase radio_jump_more callback is clicked instead of toggled
+ }
+
+ if(initializeNow)
+ extra_window_initialize(currentJumpType);
+ }
+
+
+ private void extra_window_initialize(JumpType myJumpType)
+ {
+ extra_window_label_selected_jump.Text = "<b>" + Catalog.GetString(currentJumpType.Name) + "</b>";
+ extra_window_label_selected_jump.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) {
- jumpsLimited = true;
- JumpExtraWindowBox.label_limit_units.Text = jumpsName;
+ extra_window_jumpsLimited = true;
+ extra_window_label_limit_units.Text = jumpsName;
} else {
- jumpsLimited = false;
- JumpExtraWindowBox.label_limit_units.Text = secondsName;
+ extra_window_jumpsLimited = false;
+ extra_window_label_limit_units.Text = secondsName;
}
if(myJumpType.FixedValue > 0) {
- JumpExtraWindowBox.spinbutton_limit.Sensitive = false;
- JumpExtraWindowBox.spinbutton_limit.Value = myJumpType.FixedValue;
+ extra_window_spinbutton_limit.Sensitive = false;
+ extra_window_spinbutton_limit.Value = myJumpType.FixedValue;
} else
- JumpExtraWindowBox.spinbutton_limit.Value = limited;
- } else {
- hideRepetitiveData();
- }
- if(! myJumpType.HasWeight) {
- hideWeightData();
- }
+ extra_window_spinbutton_limit.Value = extra_window_limited;
+ extra_window_showRepetitiveData(true);
+ } else
+ extra_window_showRepetitiveData(false);
+
+ if(myJumpType.HasWeight)
+ extra_window_showWeightData(true);
+ else
+ extra_window_showWeightData(false);
+
if(myJumpType.StartIn || myJumpType.Name == Constants.TakeOffName ||
myJumpType.Name == Constants.TakeOffWeightName)
- hideFallData();
+ extra_window_showFallData(false);
+ else
+ extra_window_showFallData(true);
//show technique (arms) only in DJ
//on DJa and DJna (coming from More jumps) don't need to show technique data
if(myJumpType.StartIn || myJumpType.IsRepetitive ||
myJumpType.Name == "DJa" || myJumpType.Name == "DJna" ||
myJumpType.Name == Constants.TakeOffName || myJumpType.Name == Constants.TakeOffWeightName)
- hideTechniqueArmsData();
+ extra_window_showTechniqueArmsData(false);
+ else
+ extra_window_showTechniqueArmsData(true);
- JumpExtraWindowBox.check_dj_arms.Active = arms;
- JumpExtraWindowBox.spinbutton_weight.Value = weight;
- JumpExtraWindowBox.spinbutton_fall.Value = fall;
- if (option == "Kg") {
- JumpExtraWindowBox.radiobutton_kg.Active = 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;
} else {
- JumpExtraWindowBox.radiobutton_weight.Active = true;
+ extra_window_radiobutton_weight.Active = true;
}
-
- JumpExtraWindowBox.jump_extra.Show ();
+ }
- return JumpExtraWindowBox;
+ private void on_extra_window_button_more_clicked (object o, EventArgs args)
+ {
}
- static void hideRepetitiveData () {
- JumpExtraWindowBox.label_limit.Hide();
- JumpExtraWindowBox.spinbutton_limit.Hide();
- JumpExtraWindowBox.label_limit_units.Hide();
+ private void on_more_jumps_draw_image_test (object o, EventArgs args) {
+ currentEventType = new JumpType(jumpsMoreWin.SelectedEventName);
+ changeTestImage(currentEventType.Type.ToString(), currentEventType.Name, currentEventType.ImageFileName);
}
- static void hideWeightData () {
- JumpExtraWindowBox.label_weight.Hide();
- JumpExtraWindowBox.spinbutton_weight.Hide();
- JumpExtraWindowBox.radiobutton_kg.Hide();
- JumpExtraWindowBox.radiobutton_weight.Hide();
- }
+ //used from the dialogue "jumps more"
+ private void on_more_jumps_accepted (object o, EventArgs args)
+ {
+ jumpsMoreWin.Button_accept.Clicked -= new EventHandler(on_more_jumps_accepted);
+
+ currentJumpType = new JumpType(
+ //jumpsMoreWin.SelectedJumpType,
+ jumpsMoreWin.SelectedEventName, //type of jump
+ //SelectedEventType would be: jump, or run, ...
+ jumpsMoreWin.SelectedStartIn,
+ jumpsMoreWin.SelectedExtraWeight,
+ false, //isRepetitive
+ false, //jumpsLimited (false, because is not repetitive)
+ 0, //limitValue
+ false, //unlimited
+ jumpsMoreWin.SelectedDescription,
+ SqliteEvent.GraphLinkSelectFileName("jump", jumpsMoreWin.SelectedEventName)
+ );
- static void hideTechniqueArmsData () {
- JumpExtraWindowBox.label_dj_arms.Hide();
- JumpExtraWindowBox.check_dj_arms.Hide();
+ 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 ;)
+ }
+
+ private void extra_window_toogle_desired_button_on_toolbar(JumpType type) {
+ if(type.Name == "Free") extra_window_radio_jump_free.Active = true;
+ else if(type.Name == "SJ") extra_window_radio_jump_sj.Active = true;
+ else if(type.Name == "SJl") extra_window_radio_jump_sjl.Active = true;
+ else if(type.Name == "CMJ") extra_window_radio_jump_cmj.Active = true;
+ else if(type.Name == "CMJl") extra_window_radio_jump_cmjl.Active = true;
+ else if(type.Name == "ABK") extra_window_radio_jump_abk.Active = true;
+ else if(type.Name == "DJ") extra_window_radio_jump_dj.Active = true;
+ else if(type.Name == "Rocket") extra_window_radio_jump_rocket.Active = true;
+ else if(type.Name == Constants.TakeOffName) extra_window_radio_jump_takeoff.Active = true;
+ else {
+ //don't do this:
+ //extra_window_radio_jump_more.Active = true;
+ //because it will be a loop
+ //only do:
+ extra_window_initialize(type);
+ }
}
- static void hideFallData () {
- JumpExtraWindowBox.label_fall.Hide();
- JumpExtraWindowBox.spinbutton_fall.Hide();
- JumpExtraWindowBox.label_cm.Hide();
+ 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;
}
- void on_button_cancel_clicked (object o, EventArgs args)
- {
- JumpExtraWindowBox.jump_extra.Hide();
- JumpExtraWindowBox = null;
+ 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;
}
- void on_jump_extra_delete_event (object o, DeleteEventArgs args)
- {
- JumpExtraWindowBox.jump_extra.Hide();
- JumpExtraWindowBox = null;
+ private void extra_window_showTechniqueArmsData (bool show) {
+ extra_window_label_dj_arms.Visible = show;
+ extra_window_check_dj_arms.Visible = show;
}
- void on_button_accept_clicked (object o, EventArgs args)
- {
- limited = (double) spinbutton_limit.Value;
- weight = (double) spinbutton_weight.Value;
- fall = (double) spinbutton_fall.Value;
- //distance = (double) spinbutton_fall.Value;
- arms = check_dj_arms.Active;
-
- JumpExtraWindowBox.jump_extra.Hide();
- JumpExtraWindowBox = null;
+ 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;
}
- void on_radiobutton_kg_toggled (object o, EventArgs args)
- {
- option = "Kg";
- Log.WriteLine(string.Format("option: {0}", option));
- }
-
- void on_radiobutton_weight_toggled (object o, EventArgs args)
- {
- option = "%";
- Log.WriteLine(string.Format("option: {0}", option));
- }
- public Button Button_accept
- {
- set { button_accept = value; }
- get { return button_accept; }
- }
+ 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;
- public string Option {
- get { return option; }
- }
+ //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");
+ }
- public bool JumpsLimited {
- get { return jumpsLimited; }
- }
-
- public double Limited {
- get { return limited; }
+ on_normal_jump_activate(o, args);
}
-
- public string LimitString
+
+
+ private void on_radiobutton_kg_toggled (object o, EventArgs args)
{
- get {
- if(jumpsLimited)
- return limited.ToString() + "J";
- else
- return Limited.ToString() + "T";
- }
+ extra_window_option = "Kg";
+ Log.WriteLine(string.Format("option: {0}", extra_window_option));
}
- public double Weight {
- get { return weight; }
+ private void on_radiobutton_weight_toggled (object o, EventArgs args)
+ {
+ extra_window_option = "%";
+ Log.WriteLine(string.Format("option: {0}", extra_window_option));
}
- public bool Arms {
- get { return arms; }
+ private string limitString()
+ {
+ if(extra_window_jumpsLimited)
+ return extra_window_limited.ToString() + "J";
+ else
+ return extra_window_limited.ToString() + "T";
}
- public double Fall {
- get { return fall; }
- }
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
