commit 166738ae249d9bbe62fa2ceebeb4e70cc7a730de
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Dec 11 15:38:11 2019 +0100
Several improvements on new gui jumps, jumps_rj
glade/app1.glade | 511 +++++++++++++++++++++------------------------
src/gui/app1/chronojump.cs | 2 +-
src/gui/app1/jump.cs | 20 +-
3 files changed, 247 insertions(+), 286 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 9c107345..76670717 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -12687,9 +12687,8 @@ EncoderInertialCapture</property>
<widget class="GtkVBox" id="vbox25">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
<child>
- <widget class="GtkHBox" id="hbox170">
+ <widget class="GtkHBox"
id="hbox_extra_window_jumps_weight">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">20</property>
@@ -12700,6 +12699,7 @@ EncoderInertialCapture</property>
<property name="spacing">6</property>
<child>
<widget class="GtkLabel"
id="extra_window_jumps_label_weight">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label"
translatable="yes">Additional weight</property>
@@ -12718,6 +12718,7 @@ EncoderInertialCapture</property>
<property name="spacing">6</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="invisible_char_set">True</property>
@@ -12740,6 +12741,7 @@ EncoderInertialCapture</property>
<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>
@@ -12756,6 +12758,7 @@ EncoderInertialCapture</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>
@@ -12801,86 +12804,56 @@ EncoderInertialCapture</property>
<property name="position">0</property>
</packing>
</child>
- <child>
- <widget class="GtkAlignment" id="alignment15">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <child>
- <widget class="GtkHBox"
id="hbox_extra_window_jumps_single_leg_radios">
- <property name="can_focus">False</property>
- <property name="spacing">16</property>
- <child>
- <widget class="GtkHBox" id="hbox173">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkLabel" id="label100">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Dominance</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="padding">5</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox99">
+ <widget class="GtkHBox"
id="extra_window_jumps_hbox_fall">
+ <property name="can_focus">False</property>
+ <property name="spacing">30</property>
+ <child>
+ <widget class="GtkHBox" id="hbox23">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">2</property>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_dominance_unknown">
- <property name="label">Unknown</property>
+ <widget class="GtkCheckButton"
id="extra_window_jumps_check_dj_fall_calculate">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Unknown</property>
+ <property name="image_position">bottom</property>
<property name="active">True</property>
<property name="draw_indicator">False</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <signal name="toggled"
handler="on_extra_window_jumps_check_dj_fall_calculate_toggled" swapped="no"/>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_dominance_this_limb">
- <property name="label"
translatable="yes">This</property>
+ <widget class="GtkHBox" id="hbox216">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="tooltip" translatable="yes">This
limb</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">False</property>
- <property
name="group">extra_window_jumps_radiobutton_single_leg_dominance_unknown</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_dominance_opposite">
- <property name="label"
translatable="yes">Opposite</property>
+ <widget class="GtkImage"
id="extra_windows_jumps_image_dj_fall_calculate">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="draw_indicator">False</property>
- <property
name="group">extra_window_jumps_radiobutton_single_leg_dominance_unknown</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Calculate falling height using a previous jump</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
+ <child>
+ <widget class="GtkImage"
id="extra_windows_jumps_image_dj_fall_predefined">
+ <property name="can_focus">False</property>
+ <property name="tooltip" translatable="yes">Fall
from a predefined height</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -12889,44 +12862,23 @@ EncoderInertialCapture</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="hbox172">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkLabel" id="label101">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Type</property>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox97">
+ <widget class="GtkHBox" id="hbox300">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">2</property>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_mode_vertical">
- <property name="label">V</property>
+ <widget class="GtkLabel" id="label95">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Vertical</property>
- <property name="active">True</property>
- <property name="draw_indicator">False</property>
+ <property name="can_focus">False</property>
+ <property name="label">[</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -12935,14 +12887,11 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_mode_horizontal">
- <property name="label">H</property>
+ <widget class="GtkLabel"
id="extra_window_jumps_label_dj_start_inside">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Horizontal</property>
- <property name="draw_indicator">False</property>
- <property
name="group">extra_window_jumps_radiobutton_single_leg_mode_vertical</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Calculate falling height using a previous jump</property>
+ <property name="label" translatable="yes">Start
inside</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -12951,14 +12900,10 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_mode_lateral">
- <property name="label"
translatable="yes">L</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Lateral</property>
- <property name="draw_indicator">False</property>
- <property
name="group">extra_window_jumps_radiobutton_single_leg_mode_vertical</property>
+ <widget class="GtkLabel"
id="extra_window_jumps_label_dj_start_outside">
+ <property name="can_focus">False</property>
+ <property name="tooltip" translatable="yes">Fall
from a predefined height</property>
+ <property name="label" translatable="yes">Start
outside</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -12966,11 +12911,16 @@ EncoderInertialCapture</property>
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label187">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">]</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
@@ -12980,17 +12930,6 @@ EncoderInertialCapture</property>
<property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkHBox" id="hbox174">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkLabel" id="label102">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Fall</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -12999,18 +12938,14 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox100">
- <property name="visible">True</property>
+ <widget class="GtkHBox"
id="hbox_extra_window_jumps_fall_height">
<property name="can_focus">False</property>
- <property name="spacing">2</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_fall_both">
- <property name="label"
translatable="yes">Both</property>
+ <widget class="GtkLabel" id="label99">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">False</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Falling height</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -13019,15 +12954,20 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_fall_this_limb">
- <property name="label"
translatable="yes">This</property>
+ <widget class="GtkSpinButton"
id="extra_window_jumps_spinbutton_fall">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="tooltip" translatable="yes">This
limb</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">False</property>
- <property
name="group">extra_window_jumps_radiobutton_single_leg_fall_both</property>
+ <property name="invisible_char">●</property>
+ <property
name="invisible_char_set">True</property>
+ <property
name="primary_icon_activatable">False</property>
+ <property
name="secondary_icon_activatable">False</property>
+ <property
name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">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>
+ <signal name="value_changed"
handler="on_contacts_exercise_value_changed" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -13036,13 +12976,11 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_fall_opposite">
- <property name="label"
translatable="yes">Opposite</property>
+ <widget class="GtkLabel"
id="extra_window_jumps_label_cm">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="draw_indicator">False</property>
- <property
name="group">extra_window_jumps_radiobutton_single_leg_fall_both</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">cm</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -13061,54 +12999,69 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
</packing>
</child>
- </widget>
- </child>
+ <child>
+ <widget class="GtkTable"
id="table_extra_window_jumps_single_leg_radios">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">10</property>
+ <property name="row_spacing">10</property>
+ <child>
+ <widget class="GtkLabel" id="label100">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Dominance</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label101">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Type</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>
</packing>
</child>
<child>
- <widget class="GtkHBox"
id="extra_window_jumps_hbox_fall">
+ <widget class="GtkLabel" id="label102">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">30</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Fall</property>
+ </widget>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
<child>
- <widget class="GtkHBox" id="hbox23">
+ <widget class="GtkHBox" id="hbox99">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton"
id="extra_window_jumps_check_dj_fall_calculate">
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_dominance_unknown">
+ <property name="label">Unknown</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="image_position">bottom</property>
+ <property name="tooltip"
translatable="yes">Unknown</property>
<property name="active">True</property>
<property name="draw_indicator">False</property>
- <signal name="toggled"
handler="on_extra_window_jumps_check_dj_fall_calculate_toggled" swapped="no"/>
- <child>
- <widget class="GtkHBox" id="hbox216">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="extra_windows_jumps_image_dj_fall_calculate">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip"
translatable="yes">Calculate falling height using a previous jump</property>
- <property
name="stock">gtk-missing-image</property>
- <property name="icon-size">2</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -13117,11 +13070,15 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkImage"
id="extra_windows_jumps_image_dj_fall_predefined">
- <property name="can_focus">False</property>
- <property name="tooltip" translatable="yes">Fall
from a predefined height</property>
- <property
name="stock">gtk-missing-image</property>
- <property name="icon-size">2</property>
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_dominance_this_limb">
+ <property name="label"
translatable="yes">This</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="tooltip" translatable="yes">This
limb</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">False</property>
+ <property
name="group">extra_window_jumps_radiobutton_single_leg_dominance_unknown</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -13129,24 +13086,41 @@ EncoderInertialCapture</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_dominance_opposite">
+ <property name="label"
translatable="yes">Opposite</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="draw_indicator">False</property>
+ <property
name="group">extra_window_jumps_radiobutton_single_leg_dominance_unknown</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox300">
+ <widget class="GtkHBox" id="hbox97">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label95">
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_mode_vertical">
+ <property name="label"
translatable="yes">Vertical</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">[</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">False</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -13155,11 +13129,13 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="extra_window_jumps_label_dj_start_inside">
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_mode_horizontal">
+ <property name="label"
translatable="yes">Horizontal</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip"
translatable="yes">Calculate falling height using a previous jump</property>
- <property name="label" translatable="yes">Start
inside</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="draw_indicator">False</property>
+ <property
name="group">extra_window_jumps_radiobutton_single_leg_mode_vertical</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -13168,52 +13144,42 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="extra_window_jumps_label_dj_start_outside">
- <property name="can_focus">False</property>
- <property name="tooltip" translatable="yes">Fall
from a predefined height</property>
- <property name="label" translatable="yes">Start
outside</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label187">
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_mode_lateral">
+ <property name="label"
translatable="yes">Lateral</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">]</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="draw_indicator">False</property>
+ <property
name="group">extra_window_jumps_radiobutton_single_leg_mode_vertical</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</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="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkHBox"
id="hbox_extra_window_jumps_fall_height">
+ <widget class="GtkHBox" id="hbox100">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label99">
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_fall_both">
+ <property name="label"
translatable="yes">Both</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Falling height</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">False</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -13222,20 +13188,15 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton"
id="extra_window_jumps_spinbutton_fall">
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_fall_this_limb">
+ <property name="label"
translatable="yes">This</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property
name="invisible_char_set">True</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">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>
- <signal name="value_changed"
handler="on_contacts_exercise_value_changed" swapped="no"/>
+ <property
name="receives_default">False</property>
+ <property name="tooltip" translatable="yes">This
limb</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">False</property>
+ <property
name="group">extra_window_jumps_radiobutton_single_leg_fall_both</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -13244,11 +13205,13 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="extra_window_jumps_label_cm">
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_fall_opposite">
+ <property name="label"
translatable="yes">Opposite</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label">cm</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="draw_indicator">False</property>
+ <property
name="group">extra_window_jumps_radiobutton_single_leg_fall_both</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -13258,16 +13221,19 @@ EncoderInertialCapture</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</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>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="padding">5</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -13287,13 +13253,6 @@ EncoderInertialCapture</property>
<widget class="GtkVBox" id="vbox11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkHBox" id="hbox67">
- <property name="height_request">32</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">30</property>
<child>
<widget class="GtkHBox" id="hbox101">
<property name="visible">True</property>
@@ -13362,16 +13321,36 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="padding">5</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox161">
+ <widget class="GtkCheckButton"
id="checkbutton_allow_finish_rj_after_time">
+ <property name="label" translatable="yes">Allow
finish after time</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">If a
multiple jump is limited by time, and time has running out, allow finish jump</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled"
handler="on_extra_window_checkbutton_allow_finish_rj_after_time_toggled" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox"
id="hbox_extra_window_jumps_rj_weight">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<widget class="GtkLabel"
id="extra_window_jumps_rj_label_weight">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label"
translatable="yes">Additional weight</property>
@@ -13390,6 +13369,7 @@ EncoderInertialCapture</property>
<property name="spacing">6</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="invisible_char_set">True</property>
@@ -13412,6 +13392,7 @@ EncoderInertialCapture</property>
<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>
@@ -13428,6 +13409,7 @@ EncoderInertialCapture</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>
@@ -13470,14 +13452,8 @@ EncoderInertialCapture</property>
<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">True</property>
- <property name="position">0</property>
+ <property name="padding">5</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -13554,28 +13530,12 @@ EncoderInertialCapture</property>
<property name="position">0</property>
</packing>
</child>
- <child>
- <widget class="GtkCheckButton"
id="checkbutton_allow_finish_rj_after_time">
- <property name="label" translatable="yes">Allow
finish after time</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">If a
multiple jump is limited by time, and time has running out, allow finish jump</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled"
handler="on_extra_window_checkbutton_allow_finish_rj_after_time_toggled" swapped="no"/>
- </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>
+ <property name="padding">5</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
@@ -15327,8 +15287,9 @@ Resisted race analyzer</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -22154,6 +22115,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -24401,18 +24365,6 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Tests
will be filmed</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox"
id="hbox_video_encoder_capturing">
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -24449,6 +24401,18 @@ Concentric</property>
</packing>
</child>
<child>
+ <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Tests
will be filmed</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox"
id="hbox_video_encoder_no_capturing">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -31522,6 +31486,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 4b0d5519..1dbf76b4 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -4199,7 +4199,7 @@ public partial class ChronoJumpWindow
currentJump.Description += " 0 90";
//unsensitive slCMJ options
- hbox_extra_window_jumps_single_leg_radios.Sensitive = false;
+ table_extra_window_jumps_single_leg_radios.Sensitive = false;
//but show the input cm
notebook_contacts_capture_doing_wait.CurrentPage = 2;
}
diff --git a/src/gui/app1/jump.cs b/src/gui/app1/jump.cs
index 04e9db76..fa87692a 100644
--- a/src/gui/app1/jump.cs
+++ b/src/gui/app1/jump.cs
@@ -39,6 +39,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label extra_window_jumps_label_dj_start_inside;
[Widget] Gtk.Label extra_window_jumps_label_dj_start_outside;
[Widget] Gtk.SpinButton extra_window_jumps_spinbutton_fall;
+ [Widget] Gtk.HBox hbox_extra_window_jumps_weight;
[Widget] Gtk.RadioButton extra_window_jumps_radiobutton_kg;
[Widget] Gtk.RadioButton extra_window_jumps_radiobutton_weight;
[Widget] Gtk.Label extra_window_jumps_label_weight;
@@ -49,7 +50,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label label_extra_window_jumps_rj_radiobutton_weight_percent_as_kg;
//slCMJ
- [Widget] Gtk.Box hbox_extra_window_jumps_single_leg_radios;
+ [Widget] Gtk.Table table_extra_window_jumps_single_leg_radios;
[Widget] Gtk.RadioButton extra_window_jumps_radiobutton_single_leg_mode_vertical;
[Widget] Gtk.RadioButton extra_window_jumps_radiobutton_single_leg_mode_horizontal;
[Widget] Gtk.RadioButton extra_window_jumps_radiobutton_single_leg_dominance_this_limb;
@@ -67,6 +68,7 @@ public partial class ChronoJumpWindow
[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.HBox hbox_extra_window_jumps_rj_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;
@@ -400,18 +402,10 @@ public partial class ChronoJumpWindow
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;
-
+ hbox_extra_window_jumps_rj_weight.Visible = show;
update_label_extra_window_jumps_rj_radiobutton_weight_percent_as_kg(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;
-
+ hbox_extra_window_jumps_weight.Visible = show;
update_label_extra_window_jumps_radiobutton_weight_percent_as_kg(show);
}
}
@@ -440,7 +434,7 @@ public partial class ChronoJumpWindow
}
private void extra_window_showSingleLegStuff(bool show) {
- hbox_extra_window_jumps_single_leg_radios.Visible = show;
+ table_extra_window_jumps_single_leg_radios.Visible = show;
}
private void on_extra_window_jumps_radiobutton_kg_toggled (object o, EventArgs args)
@@ -563,7 +557,7 @@ public partial class ChronoJumpWindow
myTreeViewJumps.Update(currentJump);
//sensitive slCMJ options
- hbox_extra_window_jumps_single_leg_radios.Sensitive = true;
+ table_extra_window_jumps_single_leg_radios.Sensitive = true;
//hide slCMJ distance stuff and show button execute test again
notebook_contacts_capture_doing_wait.CurrentPage = 0;