commit 9e7c05011168a3ca7d9ec114fe2ccdd00a075680
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Apr 27 13:36:22 2018 +0200
Better GUI at force sensor adjust
glade/app1.glade | 438 +++++++++++++++++++++++++-------------------
src/gui/chronojump.cs | 5 +-
src/gui/chronojumpIcons.cs | 5 +-
src/gui/encoder.cs | 1 -
src/gui/forceSensor.cs | 43 ++++-
src/gui/jump.cs | 4 +-
6 files changed, 289 insertions(+), 207 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index e995de3..713b190 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1685,6 +1685,12 @@
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkLabel"
id="label_start_selector_jumps">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -5186,52 +5192,18 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox152">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkLabel" id="label111">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Adjust:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox207">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">20</property>
- <child>
- <widget class="GtkButton"
id="button_force_sensor_tare">
+ <widget class="GtkButton"
id="button_force_sensor_adjust">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked"
handler="on_buttons_force_sensor_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_force_sensor_adjust_clicked" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox238">
+ <widget class="GtkHBox" id="hbox152">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label299">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">[1]</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage"
id="image_force_sensor_tare">
+ <widget class="GtkImage"
id="image_force_sensor_capture_adjust">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -5239,170 +5211,22 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label256">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Tare</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- </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="hbox230">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkHBox"
id="hbox_spin_force_sensor">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkSpinButton"
id="spin_force_sensor_calibration_kg_value">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property
name="invisible_char_set">True</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
- <property name="adjustment">20 1 500 1 10
0</property>
- <property name="climb_rate">1</property>
- <property name="digits">2</property>
- <property name="numeric">True</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="calibration_factor_kg_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label">Kg</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</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="GtkButton"
id="button_force_sensor_calibrate">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_buttons_force_sensor_clicked" swapped="no"/>
- <child>
- <widget class="GtkHBox" id="hbox237">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label301">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">[2]</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage"
id="image_force_sensor_calibrate">
- <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">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label164">
+ <widget class="GtkLabel" id="label51">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Calibrate</property>
+ <property name="label"
translatable="yes">Adjust</property>
</widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_force_sensor_adjust_help">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_force_sensor_adjust_help_clicked" swapped="no"/>
- <child>
- <widget class="GtkImage"
id="image_force_sensor_adjust_help">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
</child>
</widget>
<packing>
@@ -5909,6 +5733,7 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<child>
<widget class="GtkHBox" id="hbox_options_top">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">25</property>
<child>
@@ -7229,17 +7054,238 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment26">
+ <widget class="GtkAlignment"
id="alignment_force_sensor_adjust">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xscale">0</property>
- <property name="top_padding">8</property>
<child>
- <widget class="GtkLabel" id="label51">
+ <widget class="GtkHBox" id="hbox207">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">30</property>
+ <child>
+ <widget class="GtkButton"
id="button_force_sensor_adjust_close">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_force_sensor_adjust_close_clicked" swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
+ <child>
+ <widget class="GtkHBox" id="hbox269">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage"
id="image_force_sensor_capture_adjust_close">
+ <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="label299">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">unused</property>
+ <property name="label" translatable="yes">Close
options</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">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVSeparator" id="vseparator6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_force_sensor_tare">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_buttons_force_sensor_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox238">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage"
id="image_force_sensor_tare">
+ <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="label256">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Tare</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">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox230">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkHBox"
id="hbox_spin_force_sensor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkSpinButton"
id="spin_force_sensor_calibration_kg_value">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property
name="invisible_char_set">True</property>
+ <property
name="primary_icon_activatable">False</property>
+ <property
name="secondary_icon_activatable">False</property>
+ <property
name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">True</property>
+ <property name="adjustment">20 1 500 1 10
0</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">2</property>
+ <property name="numeric">True</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="calibration_factor_kg_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">Kg</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</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="GtkButton"
id="button_force_sensor_calibrate">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_buttons_force_sensor_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox237">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage"
id="image_force_sensor_calibrate">
+ <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="label164">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Calibrate</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">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_force_sensor_adjust_help">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_force_sensor_adjust_help_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_force_sensor_adjust_help">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -8248,7 +8294,7 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkNotebook"
id="notebook_options_after_execute">
+ <widget class="GtkNotebook"
id="notebook_options_at_execute_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="show_tabs">False</property>
@@ -25729,6 +25775,12 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 9531844..52f6d94 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -312,7 +312,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Notebook notebook_execute;
[Widget] Gtk.Notebook notebook_results;
- [Widget] Gtk.HBox hbox_options_top;
[Widget] Gtk.Notebook notebook_options_top;
[Widget] Gtk.Frame frame_share_data;
@@ -4218,7 +4217,7 @@ public partial class ChronoJumpWindow
//unsensitive slCMJ options
hbox_extra_window_jumps_single_leg_radios.Sensitive = false;
//but show the input cm
- notebook_options_after_execute.CurrentPage = 1;
+ notebook_options_at_execute_button.CurrentPage = 1;
}
SqliteJump.UpdateDescription(Constants.JumpTable,
currentJump.UniqueID, currentJump.Description);
@@ -6663,7 +6662,7 @@ LogB.Debug("X");
} else if(mode == Constants.Menuitem_modes.FORCESENSOR)
{
notebook_execute.CurrentPage = 4;
- notebook_options_top.CurrentPage = 4; //but at FORCESENSOR this notebook is not shown
+ notebook_options_top.CurrentPage = 4; //but at FORCESENSOR this notebook is not shown
until adjust button is clicked
notebook_results.CurrentPage = 4;
changeTestImage("", "", "FORCESENSOR");
event_execute_button_finish.Sensitive = false;
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index aae7d7e..fbc8a19 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -133,6 +133,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_force_sensor_calibrate;
[Widget] Gtk.Image image_force_sensor_open_folder;
[Widget] Gtk.Image image_force_sensor_check_version;
+ [Widget] Gtk.Image image_force_sensor_capture_adjust;
+ [Widget] Gtk.Image image_force_sensor_capture_adjust_close;
[Widget] Gtk.Image image_force_sensor_analyze_options;
[Widget] Gtk.Image image_force_sensor_analyze_options_close;
[Widget] Gtk.Image image_force_sensor_analyze_recalculate;
@@ -266,6 +268,7 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_build_24.png");
image_encoder_configuration.Pixbuf = pixbuf;
+ image_force_sensor_capture_adjust.Pixbuf = pixbuf;
image_force_sensor_analyze_options.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_build_16.png");
image_encoder_analyze_mode_options.Pixbuf = pixbuf;
@@ -311,7 +314,7 @@ public partial class ChronoJumpWindow
image_encoder_exercise1.Pixbuf = pixbuf;
image_force_sensor_analyze_options_close.Pixbuf = pixbuf;
image_encoder_analyze_mode_options_close.Pixbuf = pixbuf;
-
+ image_force_sensor_capture_adjust_close.Pixbuf = pixbuf;
/*
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index dc79075..1bb1f83 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -159,7 +159,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.CheckButton check_encoder_analyze_show_time_to_peak_power;
[Widget] Gtk.CheckButton check_encoder_analyze_show_range;
- [Widget] Gtk.Button button_encoder_analyze_mode_options;
[Widget] Gtk.HBox hbox_encoder_analyze_instantaneous;
[Widget] Gtk.CheckButton check_encoder_analyze_show_position;
[Widget] Gtk.CheckButton check_encoder_analyze_show_speed;
diff --git a/src/gui/forceSensor.cs b/src/gui/forceSensor.cs
index 362fae5..b6d32f4 100644
--- a/src/gui/forceSensor.cs
+++ b/src/gui/forceSensor.cs
@@ -285,7 +285,6 @@ public partial class ChronoJumpWindow
}
capturingForce = forceStatus.STOP;
- forceSensorButtonsSensitive(false);
forceSensorTimeStart = DateTime.Now;
forceSensorOtherMessageShowSeconds = true;
@@ -304,10 +303,12 @@ public partial class ChronoJumpWindow
}
else if (o == (object) button_execute_test)
{
+ forceSensorButtonsSensitive(false);
forceSensorOtherMode = forceSensorOtherModeEnum.CAPTURE_PRE;
forceOtherThread = new Thread(new ThreadStart(forceSensorCapturePre));
}
else { //if (o == (object) button_check_version)
+ forceSensorButtonsSensitive(false);
forceSensorOtherMode = forceSensorOtherModeEnum.CHECK_VERSION;
forceOtherThread = new Thread(new ThreadStart(forceSensorCheckVersionPre));
}
@@ -353,10 +354,10 @@ public partial class ChronoJumpWindow
event_execute_label_message.Text = forceSensorOtherMessage;
LogB.ThreadEnding();
- if(
- forceSensorOtherMode == forceSensorOtherModeEnum.TARE ||
- forceSensorOtherMode == forceSensorOtherModeEnum.CALIBRATE ||
- forceSensorOtherMode == forceSensorOtherModeEnum.CHECK_VERSION)
+ if(forceSensorOtherMode == forceSensorOtherModeEnum.TARE ||
+ forceSensorOtherMode == forceSensorOtherModeEnum.CALIBRATE)
+ return false;
+ else if(forceSensorOtherMode == forceSensorOtherModeEnum.CHECK_VERSION)
forceSensorButtonsSensitive(true);
else //if(forceSensorOtherMode == forceSensorOtherModeEnum.CAPTURE_PRE)
forceSensorCapturePre2();
@@ -1309,7 +1310,7 @@ LogB.Information(" fc R ");
private void showHideForceSensorControls(bool modeForceSensor)
{
hbox_capture_phases_time_record.Visible = ! modeForceSensor;
- hbox_options_top.Visible = ! modeForceSensor;
+ button_image_test_zoom.Visible = ! modeForceSensor;
notebook_options_top.Visible = ! modeForceSensor;
button_threshold.Visible = ! modeForceSensor;
@@ -1318,10 +1319,38 @@ LogB.Information(" fc R ");
menuitem_force_sensor_check_version.Visible = modeForceSensor;
}
+ private void on_button_force_sensor_adjust_clicked (object o, EventArgs args)
+ {
+ notebook_options_top.Visible = true;
+ notebook_options_at_execute_button.CurrentPage = 2;
+ forceSensorCaptureAdjustSensitivity(false);
+ event_execute_label_message.Text = Catalog.GetString("We recommend to tare before
calibrating.");
+ }
+ private void on_button_force_sensor_adjust_close_clicked (object o, EventArgs args)
+ {
+ notebook_options_top.Visible = false;
+ notebook_options_at_execute_button.CurrentPage = 0;
+ forceSensorCaptureAdjustSensitivity(true);
+ }
+
+ private void forceSensorCaptureAdjustSensitivity(bool s) //s for sensitive. When adjusting s = false
+ {
+ hbox_force_buttons.Sensitive = s;
+
+ button_activate_chronopics.Sensitive = s;
+ image_test.Sensitive = s;
+ button_execute_test.Sensitive = s;
+ button_force_sensor_image_save_signal.Sensitive = s;
+
+ main_menu.Sensitive = s;
+ notebook_session_person.Sensitive = s;
+ hbox_contacts_sup_capture_analyze_two_buttons.Sensitive = s;
+ hbox_top_person.Sensitive = s;
+ }
+
private void on_button_force_sensor_adjust_help_clicked (object o, EventArgs args)
{
new DialogMessage("Force sensor adjust data", Constants.MessageTypes.INFO,
- Catalog.GetString("We recommend to tare before calibrating.") + "\n" +
preferences.GetForceSensorAdjustString());
}
diff --git a/src/gui/jump.cs b/src/gui/jump.cs
index 02843f9..c72b5ca 100644
--- a/src/gui/jump.cs
+++ b/src/gui/jump.cs
@@ -988,7 +988,7 @@ public partial class ChronoJumpWindow
//slCMJ
[Widget] Gtk.Box hbox_extra_window_jumps_single_leg_radios;
- [Widget] Gtk.Notebook notebook_options_after_execute;
+ [Widget] Gtk.Notebook notebook_options_at_execute_button;
[Widget] Gtk.RadioButton extra_window_jumps_radiobutton_single_leg_mode_vertical;
[Widget] Gtk.RadioButton extra_window_jumps_radiobutton_single_leg_mode_horizontal;
[Widget] Gtk.RadioButton extra_window_jumps_radiobutton_single_leg_dominance_this_limb;
@@ -1489,7 +1489,7 @@ public partial class ChronoJumpWindow
hbox_extra_window_jumps_single_leg_radios.Sensitive = true;
//hide slCMJ distance stuff and show button execute test again
- notebook_options_after_execute.CurrentPage = 0;
+ notebook_options_at_execute_button.CurrentPage = 0;
}
}