commit f1b205ee39354353041036a5de23e76d4391d313
Author: Xavier de Blas <xaviblas gmail com>
Date: Sun Apr 4 13:26:50 2021 +0200
Contacts exercise selection with left/right buttons
glade/app1.glade | 98 +++++++++++++++++++++++++++++++++++++++++++++-------
src/gui/app1/jump.cs | 17 +++++++++
2 files changed, 102 insertions(+), 13 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 9ccd7337..c337a11a 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -12083,6 +12083,33 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
+ <widget class="GtkHBox" id="hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkButton"
id="button_combo_jumps_exercise_capture_left">
+ <property name="width_request">40</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_combo_jumps_exercise_capture_left_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkArrow" id="arrow31">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="arrow_type">left</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox"
id="hbox_combo_select_jumps">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -12091,9 +12118,36 @@ EncoderInertialCapture</property>
</child>
</widget>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_combo_jumps_exercise_capture_right">
+ <property name="width_request">40</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_combo_jumps_exercise_capture_right_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkArrow" id="arrow32">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">-1</property>
</packing>
</child>
<child>
@@ -24754,6 +24808,15 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -30921,18 +30984,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>
@@ -30969,6 +31020,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>
@@ -39388,6 +39451,15 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <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 d8b03520..230a61bb 100644
--- a/src/gui/app1/jump.cs
+++ b/src/gui/app1/jump.cs
@@ -33,6 +33,8 @@ using Mono.Unix;
public partial class ChronoJumpWindow
{
//options jumps
+ [Widget] Gtk.Button button_combo_jumps_exercise_capture_left;
+ [Widget] Gtk.Button button_combo_jumps_exercise_capture_right;
[Widget] Gtk.Button button_jump_type_delete_simple;
[Widget] Gtk.SpinButton extra_window_jumps_spinbutton_weight;
[Widget] Gtk.HBox extra_window_jumps_simple_hbox_start_inside;
@@ -118,6 +120,21 @@ public partial class ChronoJumpWindow
return t;
}
+ private void on_button_combo_jumps_exercise_capture_left_clicked (object o, EventArgs args)
+ {
+ combo_select_jumps = UtilGtk.ComboSelectPrevious(combo_select_jumps);
+
+ button_combo_jumps_exercise_capture_left.Sensitive = (combo_select_jumps.Active > 0);
+ button_combo_jumps_exercise_capture_right.Sensitive = true;
+ }
+ private void on_button_combo_jumps_exercise_capture_right_clicked (object o, EventArgs args)
+ {
+ bool isLast;
+ combo_select_jumps = UtilGtk.ComboSelectNext(combo_select_jumps, out isLast);
+
+ button_combo_jumps_exercise_capture_left.Sensitive = true;
+ button_combo_jumps_exercise_capture_right.Sensitive = ! isLast;
+ }
/*
* when pre-jump from inside, dj fall is calculated