commit e1c7615f6003396d43eb0f56dd6514e31f6b29d8
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Feb 11 23:23:10 2021 +0100
Force sensor analyze AB sliders with new arrow icons
glade/app1.glade | 158 +++++++++++++++++++++++++++++++------
src/gui/app1/forceSensorAnalyze.cs | 8 +-
src/gui/app1/icons.cs | 34 ++++++++
3 files changed, 170 insertions(+), 30 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 9657904d..8b30f60c 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -21489,7 +21489,7 @@ Concentric</property>
<widget class="GtkHBox" id="hbox234">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="spacing">3</property>
<child>
<widget class="GtkButton"
id="button_hscale_force_sensor_ai_a_first">
<property name="visible">True</property>
@@ -21497,7 +21497,7 @@ Concentric</property>
<property name="receives_default">True</property>
<signal name="clicked"
handler="on_button_hscale_force_sensor_ai_a_first_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image7">
+ <widget class="GtkImage"
id="image_hscale_force_sensor_ai_a_first">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-goto-first</property>
@@ -21518,15 +21518,40 @@ Concentric</property>
<property name="receives_default">True</property>
<signal name="clicked"
handler="on_button_hscale_force_sensor_ai_a_pre_1s_clicked" swapped="no"/>
<child>
+ <widget class="GtkHBox" id="hbox465">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage"
id="image_hscale_force_sensor_ai_a_pre_1s">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-go-back</property>
+ <property name="icon-size">1</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="label_hscale_force_sensor_ai_a_pre_1s">
<property name="visible">True</property>
<property name="can_focus">False</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -21537,7 +21562,7 @@ Concentric</property>
<property name="receives_default">True</property>
<signal name="clicked"
handler="on_button_hscale_force_sensor_ai_a_pre_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image1">
+ <widget class="GtkImage"
id="image_hscale_force_sensor_ai_a_pre">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-go-back</property>
@@ -21562,7 +21587,7 @@ Concentric</property>
<widget class="GtkHBox" id="hbox235">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="spacing">3</property>
<child>
<widget class="GtkButton"
id="button_hscale_force_sensor_ai_a_post">
<property name="visible">True</property>
@@ -21570,7 +21595,7 @@ Concentric</property>
<property name="receives_default">True</property>
<signal name="clicked"
handler="on_button_hscale_force_sensor_ai_a_post_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image3">
+ <widget class="GtkImage"
id="image_hscale_force_sensor_ai_a_post">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-go-forward</property>
@@ -21591,10 +21616,35 @@ Concentric</property>
<property name="receives_default">True</property>
<signal name="clicked"
handler="on_button_hscale_force_sensor_ai_a_post_1s_clicked" swapped="no"/>
<child>
+ <widget class="GtkHBox" id="hbox466">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
<widget class="GtkLabel"
id="label_hscale_force_sensor_ai_a_post_1s">
<property name="visible">True</property>
<property name="can_focus">False</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_hscale_force_sensor_ai_a_post_1s">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-go-forward</property>
+ <property name="icon-size">1</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
<packing>
@@ -21610,7 +21660,7 @@ Concentric</property>
<property name="receives_default">True</property>
<signal name="clicked"
handler="on_button_hscale_force_sensor_ai_a_last_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image8">
+ <widget class="GtkImage"
id="image_hscale_force_sensor_ai_a_last">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-goto-last</property>
@@ -21647,7 +21697,7 @@ Concentric</property>
<widget class="GtkHBox" id="hbox270">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="spacing">3</property>
<child>
<widget class="GtkButton"
id="button_hscale_force_sensor_ai_b_first">
<property name="visible">True</property>
@@ -21655,7 +21705,7 @@ Concentric</property>
<property name="receives_default">True</property>
<signal name="clicked"
handler="on_button_hscale_force_sensor_ai_b_first_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image9">
+ <widget class="GtkImage"
id="image_hscale_force_sensor_ai_b_first">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-goto-first</property>
@@ -21676,10 +21726,35 @@ Concentric</property>
<property name="receives_default">True</property>
<signal name="clicked"
handler="on_button_hscale_force_sensor_ai_b_pre_1s_clicked" swapped="no"/>
<child>
+ <widget class="GtkHBox" id="hbox467">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage"
id="image_hscale_force_sensor_ai_b_pre_1s">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-go-back</property>
+ <property name="icon-size">1</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="label_hscale_force_sensor_ai_b_pre_1s">
<property name="visible">True</property>
<property name="can_focus">False</property>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
<packing>
@@ -21695,7 +21770,7 @@ Concentric</property>
<property name="receives_default">True</property>
<signal name="clicked"
handler="on_button_hscale_force_sensor_ai_b_pre_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image4">
+ <widget class="GtkImage"
id="image_hscale_force_sensor_ai_b_pre">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-go-back</property>
@@ -21720,7 +21795,7 @@ Concentric</property>
<widget class="GtkHBox" id="hbox286">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="spacing">3</property>
<child>
<widget class="GtkButton"
id="button_hscale_force_sensor_ai_b_post">
<property name="visible">True</property>
@@ -21728,7 +21803,7 @@ Concentric</property>
<property name="receives_default">True</property>
<signal name="clicked"
handler="on_button_hscale_force_sensor_ai_b_post_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image5">
+ <widget class="GtkImage"
id="image_hscale_force_sensor_ai_b_post">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-go-forward</property>
@@ -21749,10 +21824,35 @@ Concentric</property>
<property name="receives_default">True</property>
<signal name="clicked"
handler="on_button_hscale_force_sensor_ai_b_post_1s_clicked" swapped="no"/>
<child>
+ <widget class="GtkHBox" id="hbox468">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
<widget class="GtkLabel"
id="label_hscale_force_sensor_ai_b_post_1s">
<property name="visible">True</property>
<property name="can_focus">False</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_hscale_force_sensor_ai_b_post_1s">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-go-forward</property>
+ <property name="icon-size">1</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
<packing>
@@ -21768,7 +21868,7 @@ Concentric</property>
<property name="receives_default">True</property>
<signal name="clicked"
handler="on_button_hscale_force_sensor_ai_b_last_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image10">
+ <widget class="GtkImage"
id="image_hscale_force_sensor_ai_b_last">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-goto-last</property>
@@ -23873,6 +23973,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -29025,6 +29128,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>
@@ -29061,18 +29176,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>
@@ -37373,6 +37476,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/forceSensorAnalyze.cs b/src/gui/app1/forceSensorAnalyze.cs
index 80e55c81..6375c650 100644
--- a/src/gui/app1/forceSensorAnalyze.cs
+++ b/src/gui/app1/forceSensorAnalyze.cs
@@ -613,10 +613,10 @@ public partial class ChronoJumpWindow
private void setForceSensorAnalyzeABSliderIncrements()
{
- label_hscale_force_sensor_ai_a_pre_1s.Text = string.Format("-{0}s",
preferences.forceSensorAnalyzeABSliderIncrement);
- label_hscale_force_sensor_ai_a_post_1s.Text = string.Format("+{0}s",
preferences.forceSensorAnalyzeABSliderIncrement);
- label_hscale_force_sensor_ai_b_pre_1s.Text = string.Format("-{0}s",
preferences.forceSensorAnalyzeABSliderIncrement);
- label_hscale_force_sensor_ai_b_post_1s.Text = string.Format("+{0}s",
preferences.forceSensorAnalyzeABSliderIncrement);
+ label_hscale_force_sensor_ai_a_pre_1s.Text = string.Format("{0}s",
preferences.forceSensorAnalyzeABSliderIncrement);
+ label_hscale_force_sensor_ai_a_post_1s.Text = string.Format("{0}s",
preferences.forceSensorAnalyzeABSliderIncrement);
+ label_hscale_force_sensor_ai_b_pre_1s.Text = string.Format("{0}s",
preferences.forceSensorAnalyzeABSliderIncrement);
+ label_hscale_force_sensor_ai_b_post_1s.Text = string.Format("{0}s",
preferences.forceSensorAnalyzeABSliderIncrement);
}
private void on_button_force_rfd_default_clicked (object o, EventArgs args)
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index a4487778..2ae93850 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -184,6 +184,20 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_force_sensor_ai_chained_link;
[Widget] Gtk.Image image_force_sensor_ai_chained_link_off;
+ [Widget] Gtk.Image image_hscale_force_sensor_ai_a_first;
+ [Widget] Gtk.Image image_hscale_force_sensor_ai_a_last;
+ [Widget] Gtk.Image image_hscale_force_sensor_ai_a_pre;
+ [Widget] Gtk.Image image_hscale_force_sensor_ai_a_pre_1s;
+ [Widget] Gtk.Image image_hscale_force_sensor_ai_a_post;
+ [Widget] Gtk.Image image_hscale_force_sensor_ai_a_post_1s;
+
+ [Widget] Gtk.Image image_hscale_force_sensor_ai_b_first;
+ [Widget] Gtk.Image image_hscale_force_sensor_ai_b_last;
+ [Widget] Gtk.Image image_hscale_force_sensor_ai_b_pre;
+ [Widget] Gtk.Image image_hscale_force_sensor_ai_b_pre_1s;
+ [Widget] Gtk.Image image_hscale_force_sensor_ai_b_post;
+ [Widget] Gtk.Image image_hscale_force_sensor_ai_b_post_1s;
+
//race encoder
[Widget] Gtk.Image image_run_encoder_exercise_edit;
[Widget] Gtk.Image image_run_encoder_exercise_add;
@@ -895,6 +909,26 @@ public partial class ChronoJumpWindow
//pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameLogo320); //changed
to 270 for the presentation
//image_presentation_logo.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf(null, Util.GetImagePath(false) + "first.png");
+ image_hscale_force_sensor_ai_a_first.Pixbuf = pixbuf;
+ image_hscale_force_sensor_ai_b_first.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf(null, Util.GetImagePath(false) + "left_cut.png");
+ image_hscale_force_sensor_ai_a_pre_1s.Pixbuf = pixbuf;
+ image_hscale_force_sensor_ai_b_pre_1s.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf(null, Util.GetImagePath(false) + "left.png");
+ image_hscale_force_sensor_ai_a_pre.Pixbuf = pixbuf;
+ image_hscale_force_sensor_ai_b_pre.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf(null, Util.GetImagePath(false) + "right.png");
+ image_hscale_force_sensor_ai_a_post.Pixbuf = pixbuf;
+ image_hscale_force_sensor_ai_b_post.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf(null, Util.GetImagePath(false) + "right_cut.png");
+ image_hscale_force_sensor_ai_a_post_1s.Pixbuf = pixbuf;
+ image_hscale_force_sensor_ai_b_post_1s.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf(null, Util.GetImagePath(false) + "last.png");
+ image_hscale_force_sensor_ai_a_last.Pixbuf = pixbuf;
+ image_hscale_force_sensor_ai_b_last.Pixbuf = pixbuf;
+
image_force_sensor_ai_chained_link.Pixbuf = new Pixbuf(null, Util.GetImagePath(false) +
"link.png");
image_force_sensor_ai_chained_link_off.Pixbuf = new Pixbuf(null, Util.GetImagePath(false) +
"link_off.png");
}