commit 225ed5789213a5d1e7af0842304a5b9f6f9601a0
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Aug 26 13:14:44 2022 +0200
jumps/jumpsRj exercise options with fall -10,-1,1,10 buttons
glade/app1.glade | 231 ++++++++++++++++++++++++++++++++++++++++++++++-----
src/gui/app1/jump.cs | 63 +++++++++++---
2 files changed, 261 insertions(+), 33 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index bf2864298..6e2bdcfe8 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -12389,7 +12389,7 @@ EncoderInertialCapture</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="relief">half</property>
- <signal name="clicked"
handler="on_button_jumps_all_extra_weight_accelerators_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_jumps_params_accelerators_clicked" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -12407,7 +12407,7 @@ EncoderInertialCapture</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="relief">half</property>
- <signal name="clicked"
handler="on_button_jumps_all_extra_weight_accelerators_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_jumps_params_accelerators_clicked" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -12425,7 +12425,7 @@ EncoderInertialCapture</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="relief">half</property>
- <signal name="clicked"
handler="on_button_jumps_all_extra_weight_accelerators_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_jumps_params_accelerators_clicked" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -12443,7 +12443,7 @@ EncoderInertialCapture</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="relief">half</property>
- <signal name="clicked"
handler="on_button_jumps_all_extra_weight_accelerators_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_jumps_params_accelerators_clicked" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -12723,6 +12723,97 @@ EncoderInertialCapture</property>
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <widget class="GtkAlignment" id="alignment21">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">10</property>
+ <child>
+ <widget class="GtkHBox" id="hbox158">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkButton"
id="button_jumps_extra_fall_minus_10">
+ <property name="label">-10</property>
+ <property name="width_request">50</property>
+ <property name="height_request">40</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="relief">half</property>
+ <signal name="clicked"
handler="on_button_jumps_params_accelerators_clicked" swapped="no"/>
+ </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_jumps_extra_fall_minus_1">
+ <property name="label"> -1 </property>
+ <property name="width_request">40</property>
+ <property name="height_request">40</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="relief">half</property>
+ <signal name="clicked"
handler="on_button_jumps_params_accelerators_clicked" swapped="no"/>
+ </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_jumps_extra_fall_plus_1">
+ <property name="label"> +1 </property>
+ <property name="width_request">40</property>
+ <property name="height_request">40</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="relief">half</property>
+ <signal name="clicked"
handler="on_button_jumps_params_accelerators_clicked" swapped="no"/>
+ </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_jumps_extra_fall_plus_10">
+ <property name="label">+10</property>
+ <property name="width_request">50</property>
+ <property name="height_request">40</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="relief">half</property>
+ <signal name="clicked"
handler="on_button_jumps_params_accelerators_clicked" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -13251,7 +13342,7 @@ EncoderInertialCapture</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="relief">half</property>
- <signal name="clicked"
handler="on_button_jumps_all_extra_weight_accelerators_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_jumps_params_accelerators_clicked" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -13269,7 +13360,7 @@ EncoderInertialCapture</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="relief">half</property>
- <signal name="clicked"
handler="on_button_jumps_all_extra_weight_accelerators_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_jumps_params_accelerators_clicked" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -13287,7 +13378,7 @@ EncoderInertialCapture</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="relief">half</property>
- <signal name="clicked"
handler="on_button_jumps_all_extra_weight_accelerators_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_jumps_params_accelerators_clicked" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -13305,7 +13396,7 @@ EncoderInertialCapture</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="relief">half</property>
- <signal name="clicked"
handler="on_button_jumps_all_extra_weight_accelerators_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_jumps_params_accelerators_clicked" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -13487,6 +13578,97 @@ EncoderInertialCapture</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkAlignment" id="alignment27">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">10</property>
+ <child>
+ <widget class="GtkHBox" id="hbox572">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkButton"
id="button_jumps_rj_extra_fall_minus_10">
+ <property name="label">-10</property>
+ <property name="width_request">50</property>
+ <property name="height_request">40</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="relief">half</property>
+ <signal name="clicked"
handler="on_button_jumps_params_accelerators_clicked" swapped="no"/>
+ </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_jumps_rj_extra_fall_minus_1">
+ <property name="label"> -1 </property>
+ <property name="width_request">40</property>
+ <property name="height_request">40</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="relief">half</property>
+ <signal name="clicked"
handler="on_button_jumps_params_accelerators_clicked" swapped="no"/>
+ </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_jumps_rj_extra_fall_plus_1">
+ <property name="label"> +1 </property>
+ <property name="width_request">40</property>
+ <property name="height_request">40</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="relief">half</property>
+ <signal name="clicked"
handler="on_button_jumps_params_accelerators_clicked" swapped="no"/>
+ </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_jumps_rj_extra_fall_plus_10">
+ <property name="label">+10</property>
+ <property name="width_request">50</property>
+ <property name="height_request">40</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="relief">half</property>
+ <signal name="clicked"
handler="on_button_jumps_params_accelerators_clicked" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </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>
@@ -26582,6 +26764,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -33381,18 +33566,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>
@@ -33429,6 +33602,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>
@@ -42888,6 +43073,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -50979,6 +51167,9 @@ Since Chronojump 2.1.3, backups contain the complete data.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/app1/jump.cs b/src/gui/app1/jump.cs
index b3a2635e6..d15230834 100644
--- a/src/gui/app1/jump.cs
+++ b/src/gui/app1/jump.cs
@@ -629,35 +629,72 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_jumps_rj_extra_weight_minus_1;
[Widget] Gtk.Button button_jumps_rj_extra_weight_plus_1;
[Widget] Gtk.Button button_jumps_rj_extra_weight_plus_10;
-
- private void on_button_jumps_all_extra_weight_accelerators_clicked (object o, EventArgs args)
- {
+ [Widget] Gtk.Button button_jumps_extra_fall_minus_10;
+ [Widget] Gtk.Button button_jumps_extra_fall_minus_1;
+ [Widget] Gtk.Button button_jumps_extra_fall_plus_1;
+ [Widget] Gtk.Button button_jumps_extra_fall_plus_10;
+ [Widget] Gtk.Button button_jumps_rj_extra_fall_minus_10;
+ [Widget] Gtk.Button button_jumps_rj_extra_fall_minus_1;
+ [Widget] Gtk.Button button_jumps_rj_extra_fall_plus_1;
+ [Widget] Gtk.Button button_jumps_rj_extra_fall_plus_10;
+
+ private void on_button_jumps_params_accelerators_clicked (object o, EventArgs args)
+ {
+ //jumps simple, weight
if (o == (object) button_jumps_extra_weight_minus_10)
- button_jumps_all_extra_weight_accelerators_do
+ button_jumps_params_accelerators_do
(extra_window_jumps_spinbutton_weight, -10);
else if (o == (object) button_jumps_extra_weight_minus_1)
- button_jumps_all_extra_weight_accelerators_do
+ button_jumps_params_accelerators_do
(extra_window_jumps_spinbutton_weight, -1);
else if (o == (object) button_jumps_extra_weight_plus_1)
- button_jumps_all_extra_weight_accelerators_do
+ button_jumps_params_accelerators_do
(extra_window_jumps_spinbutton_weight, 1);
else if (o == (object) button_jumps_extra_weight_plus_10)
- button_jumps_all_extra_weight_accelerators_do
+ button_jumps_params_accelerators_do
(extra_window_jumps_spinbutton_weight, 10);
+ //jumps rj weight
else if (o == (object) button_jumps_rj_extra_weight_minus_10)
- button_jumps_all_extra_weight_accelerators_do
+ button_jumps_params_accelerators_do
(extra_window_jumps_rj_spinbutton_weight, -10);
else if (o == (object) button_jumps_rj_extra_weight_minus_1)
- button_jumps_all_extra_weight_accelerators_do
+ button_jumps_params_accelerators_do
(extra_window_jumps_rj_spinbutton_weight, -1);
else if (o == (object) button_jumps_rj_extra_weight_plus_1)
- button_jumps_all_extra_weight_accelerators_do
+ button_jumps_params_accelerators_do
(extra_window_jumps_rj_spinbutton_weight, 1);
else if (o == (object) button_jumps_rj_extra_weight_plus_10)
- button_jumps_all_extra_weight_accelerators_do
+ button_jumps_params_accelerators_do
(extra_window_jumps_rj_spinbutton_weight, 10);
- }
- private void button_jumps_all_extra_weight_accelerators_do (Gtk.SpinButton spin, int change)
+ //jumps simple fall
+ else if (o == (object) button_jumps_extra_fall_minus_10)
+ button_jumps_params_accelerators_do
+ (extra_window_jumps_spinbutton_fall, -10);
+ else if (o == (object) button_jumps_extra_fall_minus_1)
+ button_jumps_params_accelerators_do
+ (extra_window_jumps_spinbutton_fall, -1);
+ else if (o == (object) button_jumps_extra_fall_plus_1)
+ button_jumps_params_accelerators_do
+ (extra_window_jumps_spinbutton_fall, 1);
+ else if (o == (object) button_jumps_extra_fall_plus_10)
+ button_jumps_params_accelerators_do
+ (extra_window_jumps_spinbutton_fall, 10);
+ //jumps rj fall
+ else if (o == (object) button_jumps_rj_extra_fall_minus_10)
+ button_jumps_params_accelerators_do
+ (extra_window_jumps_rj_spinbutton_fall, -10);
+ else if (o == (object) button_jumps_rj_extra_fall_minus_1)
+ button_jumps_params_accelerators_do
+ (extra_window_jumps_rj_spinbutton_fall, -1);
+ else if (o == (object) button_jumps_rj_extra_fall_plus_1)
+ button_jumps_params_accelerators_do
+ (extra_window_jumps_rj_spinbutton_fall, 1);
+ else if (o == (object) button_jumps_rj_extra_fall_plus_10)
+ button_jumps_params_accelerators_do
+ (extra_window_jumps_rj_spinbutton_fall, 10);
+ }
+
+ private void button_jumps_params_accelerators_do (Gtk.SpinButton spin, int change)
{
double newValue = spin.Value + change;