commit a7916233f1c55dcaf49f19e8526331a05525fec9
Author: Xavier de Blas <xaviblas gmail com>
Date: Sun Apr 4 22:53:40 2021 +0200
ForceSensor exercise selection with left/right buttons
glade/app1.glade | 76 ++++++++++++++++++++++++++++++++++++---------
src/gui/app1/forceSensor.cs | 14 +++++++++
2 files changed, 76 insertions(+), 14 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 2dc25853..6b17ccec 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -13136,7 +13136,29 @@ EncoderInertialCapture</property>
<widget class="GtkHBox" id="hbox_force_sensor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkButton"
id="button_combo_force_sensor_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_force_sensor_exercise_capture_left_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkArrow" id="arrow39">
+ <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_force_sensor_exercise">
<property name="visible">True</property>
@@ -13148,7 +13170,27 @@ 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>
+ <child>
+ <widget class="GtkButton"
id="button_combo_force_sensor_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_force_sensor_exercise_capture_right_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkArrow" id="arrow40">
+ <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>
@@ -24982,6 +25024,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -31149,18 +31194,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>
@@ -31197,6 +31230,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>
@@ -39628,6 +39673,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/forceSensor.cs b/src/gui/app1/forceSensor.cs
index 4813c1a0..3c0d3529 100644
--- a/src/gui/app1/forceSensor.cs
+++ b/src/gui/app1/forceSensor.cs
@@ -35,6 +35,8 @@ using Mono.Unix;
public partial class ChronoJumpWindow
{
//capture tab
+ [Widget] Gtk.Button button_combo_force_sensor_exercise_capture_left;
+ [Widget] Gtk.Button button_combo_force_sensor_exercise_capture_right;
[Widget] Gtk.HBox hbox_force_capture_buttons;
[Widget] Gtk.HBox hbox_combo_force_sensor_exercise;
[Widget] Gtk.ComboBox combo_force_sensor_exercise;
@@ -2786,6 +2788,18 @@ LogB.Information(" fs R ");
combo_force_sensor_button_sensitive_exercise(UtilGtk.ComboGetActive(combo_force_sensor_exercise) != "");
}
+ //left-right buttons on force_sensor combo exercise selection
+ private void on_button_combo_force_sensor_exercise_capture_left_clicked (object o, EventArgs args)
+ {
+ contacts_exercise_left_button (combo_force_sensor_exercise,
+ button_combo_force_sensor_exercise_capture_left,
button_combo_jumps_exercise_capture_right);
+ }
+ private void on_button_combo_force_sensor_exercise_capture_right_clicked (object o, EventArgs args)
+ {
+ contacts_exercise_right_button (combo_force_sensor_exercise,
+ button_combo_force_sensor_exercise_capture_left,
button_combo_jumps_exercise_capture_right);
+ }
+
private void on_combo_force_sensor_exercise_changed (object o, EventArgs args)
{
ArrayList array = SqliteForceSensorExercise.Select (