commit cc8244ff840045533f9f40a67288dc1f5a79e6e8
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Dec 11 15:23:14 2020 +0100
JumpRj exercise options show if start inside or outside
glade/app1.glade | 90 ++++++++++++++++++++++++++++++++++++++++++++--------
src/gui/app1/jump.cs | 11 +++++--
2 files changed, 86 insertions(+), 15 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index fd3c9635..821f3a75 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -14088,6 +14088,64 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<property name="spacing">30</property>
<child>
+ <widget class="GtkHBox" id="hbox444">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel" id="label580">
+ <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">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="extra_window_jumps_label_rj_start_inside">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Start
inside</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="extra_window_jumps_label_rj_start_outside">
+ <property name="can_focus">False</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="label581">
+ <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>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox" id="hbox158">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -14153,7 +14211,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
@@ -23345,6 +23403,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -28166,18 +28227,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>
@@ -28214,6 +28263,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>
@@ -36427,6 +36488,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/jump.cs b/src/gui/app1/jump.cs
index 855d2f2c..e08b3d16 100644
--- a/src/gui/app1/jump.cs
+++ b/src/gui/app1/jump.cs
@@ -74,6 +74,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label extra_window_jumps_rj_label_weight;
[Widget] Gtk.Label extra_window_jumps_rj_label_fall;
[Widget] Gtk.Label extra_window_jumps_rj_label_cm;
+ [Widget] Gtk.Label extra_window_jumps_label_rj_start_inside;
+ [Widget] Gtk.Label extra_window_jumps_label_rj_start_outside;
[Widget] Gtk.CheckButton checkbutton_allow_finish_rj_after_time;
@@ -447,11 +449,16 @@ public partial class ChronoJumpWindow
extra_window_jumps_check_dj_arms.Sensitive = sensitive;
}
- private void extra_window_showFallData (JumpType myJumpType, bool show) {
- if(myJumpType.IsRepetitive) {
+ private void extra_window_showFallData (JumpType myJumpType, bool show)
+ {
+ if(myJumpType.IsRepetitive)
+ {
extra_window_jumps_rj_label_fall.Visible = show;
extra_window_jumps_rj_spinbutton_fall.Visible = show;
extra_window_jumps_rj_label_cm.Visible = show;
+
+ extra_window_jumps_label_rj_start_inside.Visible = ! show;
+ extra_window_jumps_label_rj_start_outside.Visible = show;
//only on simple jumps
extra_window_jumps_hbox_fall.Visible = false;