[chronojump] force sensor analyze RFD automatic, recalculate renamed analyze
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] force sensor analyze RFD automatic, recalculate renamed analyze
- Date: Mon, 9 Sep 2019 10:24:19 +0000 (UTC)
commit 181b5b483ca684ce80580deef36682781818a9f9
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Sep 9 12:23:54 2019 +0200
force sensor analyze RFD automatic, recalculate renamed analyze
glade/app1.glade | 38 ++++++++++++++++++++++----------------
src/gui/chronojumpIcons.cs | 4 ++--
src/gui/forceSensor.cs | 10 +++++-----
src/gui/forceSensorAnalyze.cs | 10 +++++-----
4 files changed, 34 insertions(+), 28 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 7585e24e..5bac4182 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -18880,19 +18880,19 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_force_sensor_analyze_recalculate">
+ <widget class="GtkButton"
id="button_force_sensor_analyze_analyze">
<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_force_sensor_analyze_recalculate_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_force_sensor_analyze_analyze_clicked" swapped="no"/>
<child>
<widget class="GtkHBox" id="hbox253">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkImage"
id="image_force_sensor_analyze_recalculate">
+ <widget class="GtkImage"
id="image_force_sensor_analyze_analyze">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -18907,7 +18907,7 @@ Concentric</property>
<widget class="GtkLabel" id="label342">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Recalculate</property>
+ <property name="label"
translatable="yes">Analyze</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -21752,6 +21752,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -23712,6 +23715,18 @@ 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>
@@ -23748,18 +23763,6 @@ 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>
@@ -30625,6 +30628,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index ea1d22e7..fa4822cc 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -171,7 +171,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_capture_recalculate;
- [Widget] Gtk.Image image_force_sensor_analyze_recalculate;
+ [Widget] Gtk.Image image_force_sensor_analyze_analyze;
[Widget] Gtk.Image image_force_sensor_exercise_edit;
[Widget] Gtk.Image image_force_sensor_laterality_both;
[Widget] Gtk.Image image_force_sensor_laterality_r;
@@ -348,7 +348,6 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_recalculate.png");
image_recalculate.Pixbuf = pixbuf;
image_force_sensor_capture_recalculate.Pixbuf = pixbuf;
- image_force_sensor_analyze_recalculate.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_build_24.png");
image_encoder_configuration.Pixbuf = pixbuf;
@@ -641,6 +640,7 @@ public partial class ChronoJumpWindow
image_forcesensor_analyze_save_signal.Pixbuf = pixbuf;
image_forcesensor_analyze_save_rfd_auto.Pixbuf = pixbuf;
image_forcesensor_analyze_save_rfd_manual.Pixbuf = pixbuf;
+ image_force_sensor_analyze_analyze.Pixbuf = pixbuf;
image_jumps_profile_save.Pixbuf = pixbuf;
image_encoder_analyze_image_compujump_send_email_image.Pixbuf = pixbuf;
diff --git a/src/gui/forceSensor.cs b/src/gui/forceSensor.cs
index 5b19e0e2..4c329dc1 100644
--- a/src/gui/forceSensor.cs
+++ b/src/gui/forceSensor.cs
@@ -623,7 +623,7 @@ public partial class ChronoJumpWindow
event_execute_button_finish.Sensitive = true;
event_execute_button_cancel.Sensitive = true;
button_force_sensor_image_save_signal.Sensitive = false;
- button_force_sensor_analyze_recalculate.Sensitive = false;
+ button_force_sensor_analyze_analyze.Sensitive = false;
forceCaptureStartMark = false;
//vscale_force_sensor.Value = 0;
label_force_sensor_value_max.Text = "0";
@@ -964,7 +964,7 @@ LogB.Information(" re C ");
event_execute_label_message.Text = forceSensorNotConnectedString;
button_force_sensor_image_save_signal.Sensitive = false;
- button_force_sensor_analyze_recalculate.Sensitive = false;
+ button_force_sensor_analyze_analyze.Sensitive = false;
button_force_sensor_image_save_rfd_auto.Sensitive = false;
button_force_sensor_image_save_rfd_manual.Sensitive = false;
checkbutton_force_sensor_ai_b.Sensitive = false;
@@ -992,7 +992,7 @@ LogB.Information(" re D ");
forceSensorButtonsSensitive(true);
button_force_sensor_image_save_signal.Sensitive = true;
- button_force_sensor_analyze_recalculate.Sensitive = true;
+ button_force_sensor_analyze_analyze.Sensitive = true;
//finish, cancel: sensitive = false
hideButtons();
@@ -1397,7 +1397,7 @@ LogB.Information(" re R ");
forceSensorCopyTempAndDoGraphs();
}
- private void on_button_force_sensor_analyze_recalculate_clicked (object o, EventArgs args)
+ private void on_button_force_sensor_analyze_analyze_clicked (object o, EventArgs args)
{
if(! Util.FileExists(lastForceSensorFullPath))
{
@@ -1562,7 +1562,7 @@ LogB.Information(" re R ");
label_force_sensor_value_max.Text = forceSensorValues.ForceMax.ToString();
label_force_sensor_value_min.Text = forceSensorValues.ForceMin.ToString();
button_force_sensor_image_save_signal.Sensitive = true;
- button_force_sensor_analyze_recalculate.Sensitive = true;
+ button_force_sensor_analyze_analyze.Sensitive = true;
}
private void setForceSensorTopAtOperationStart()
diff --git a/src/gui/forceSensorAnalyze.cs b/src/gui/forceSensorAnalyze.cs
index 623f7662..eaad76b2 100644
--- a/src/gui/forceSensorAnalyze.cs
+++ b/src/gui/forceSensorAnalyze.cs
@@ -33,7 +33,7 @@ public partial class ChronoJumpWindow
//analyze tab
[Widget] Gtk.HBox hbox_force_sensor_analyze_modes;
[Widget] Gtk.Button button_force_sensor_analyze_load;
- [Widget] Gtk.Button button_force_sensor_analyze_recalculate;
+ [Widget] Gtk.Button button_force_sensor_analyze_analyze;
[Widget] Gtk.Label label_force_sensor_analyze;
[Widget] Gtk.Image image_force_sensor_graph;
[Widget] Gtk.Viewport viewport_force_sensor_graph;
@@ -115,7 +115,7 @@ public partial class ChronoJumpWindow
* analyze options -------------------------->
*/
- private bool button_force_sensor_analyze_recalculate_was_sensitive; //needed this temp variable
+ private bool button_force_sensor_analyze_analyze_was_sensitive; //needed this temp variable
private void forceSensorAnalyzeOptionsSensitivity(bool s) //s for sensitive. When show options frame
is ! s
{
button_force_sensor_analyze_options.Sensitive = s;
@@ -123,10 +123,10 @@ public partial class ChronoJumpWindow
hbox_force_sensor_analyze_modes.Sensitive = s;
if(s)
- button_force_sensor_analyze_recalculate.Sensitive =
button_force_sensor_analyze_recalculate_was_sensitive;
+ button_force_sensor_analyze_analyze.Sensitive =
button_force_sensor_analyze_analyze_was_sensitive;
else {
- button_force_sensor_analyze_recalculate_was_sensitive =
button_force_sensor_analyze_recalculate.Sensitive;
- button_force_sensor_analyze_recalculate.Sensitive = false;
+ button_force_sensor_analyze_analyze_was_sensitive =
button_force_sensor_analyze_analyze.Sensitive;
+ button_force_sensor_analyze_analyze.Sensitive = false;
}
main_menu.Sensitive = s;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
