commit 9df6f05241182a1255b25da52d152a692a784281
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Feb 4 16:47:05 2020 +0100
ForceSensor RFD options with button: close_and_analyze
glade/app1.glade | 72 ++++++++++++++++++++++++++++++++++++--
src/gui/app1/forceSensorAnalyze.cs | 6 ++++
src/gui/app1/icons.cs | 2 ++
3 files changed, 77 insertions(+), 3 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index e0977a0f..aa55ec5d 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -20091,8 +20091,8 @@ Concentric</property>
<widget class="GtkFrame" id="frame6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="label_xalign">0.5</property>
+ <property name="shadow_type">in</property>
<child>
<widget class="GtkAlignment" id="alignment40">
<property name="visible">True</property>
@@ -21691,6 +21691,11 @@ Concentric</property>
</packing>
</child>
<child>
+ <widget class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">10</property>
+ <child>
<widget class="GtkHButtonBox" id="hbuttonbox12">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -21711,6 +21716,8 @@ Concentric</property>
</packing>
</child>
</widget>
+ </child>
+ </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -21744,6 +21751,11 @@ Concentric</property>
</widget>
</child>
<child>
+ <widget class="GtkHBox" id="hbox251">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">30</property>
+ <child>
<widget class="GtkButton"
id="button_force_sensor_analyze_options_close">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -21751,7 +21763,7 @@ Concentric</property>
<signal name="clicked"
handler="on_button_force_sensor_analyze_options_close_clicked" swapped="no"/>
<accelerator key="Escape" signal="clicked"/>
<child>
- <widget class="GtkHBox" id="hbox251">
+ <widget class="GtkHBox" id="hbox361">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -21783,6 +21795,60 @@ Concentric</property>
</child>
</widget>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_force_sensor_analyze_options_close_and_analyze">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip"
translatable="yes">Close</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_force_sensor_analyze_options_close_and_analyze_clicked" swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
+ <child>
+ <widget class="GtkHBox" id="hbox362">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkImage"
id="image_force_sensor_analyze_options_close_and_analyze">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label441">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Close
and analyze</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
<property name="type">label_item</property>
</packing>
</child>
diff --git a/src/gui/app1/forceSensorAnalyze.cs b/src/gui/app1/forceSensorAnalyze.cs
index ec736adc..83c0ac83 100644
--- a/src/gui/app1/forceSensorAnalyze.cs
+++ b/src/gui/app1/forceSensorAnalyze.cs
@@ -215,6 +215,12 @@ public partial class ChronoJumpWindow
forceSensorAnalyzeOptionsSensitivity(true);
}
+ private void on_button_force_sensor_analyze_options_close_and_analyze_clicked (object o, EventArgs
args)
+ {
+ on_button_force_sensor_analyze_options_close_clicked (o, args);
+ on_button_force_sensor_analyze_analyze_clicked (o, args);
+ }
+
private void check_force_visibilities()
{
hbox_force_1.Visible = (check_force_1.Active);
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index f821c5cb..1c1fde28 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -182,6 +182,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_force_sensor_analyze_options;
[Widget] Gtk.Image image_force_sensor_analyze_options_close;
[Widget] Gtk.Image image_force_sensor_analyze_analyze;
+ [Widget] Gtk.Image image_force_sensor_analyze_options_close_and_analyze;
[Widget] Gtk.Image image_force_sensor_exercise_edit;
[Widget] Gtk.Image image_force_sensor_exercise_delete;
[Widget] Gtk.Image image_force_sensor_laterality_both;
@@ -687,6 +688,7 @@ public partial class ChronoJumpWindow
image_forcesensor_analyze_save_rfd_auto.Pixbuf = pixbuf;
image_forcesensor_analyze_save_rfd_manual.Pixbuf = pixbuf;
image_force_sensor_analyze_analyze.Pixbuf = pixbuf;
+ image_force_sensor_analyze_options_close_and_analyze.Pixbuf = pixbuf;
image_jumps_profile_save.Pixbuf = pixbuf;
image_jumps_dj_optimal_fall_save.Pixbuf = pixbuf;
image_jumps_weight_fv_profile_save.Pixbuf = pixbuf;