[chronojump] force sensor Added tare/calibrate images
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] force sensor Added tare/calibrate images
- Date: Sat, 11 Nov 2017 18:17:24 +0000 (UTC)
commit 7229f017bb3a5895bc89ca6ac69a8b6176360b28
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Nov 11 14:04:26 2017 +0100
force sensor Added tare/calibrate images
glade/app1.glade | 66 ++++++++++++++++++++++++++++-
images/md/ic_looks_zero_blue_24dp_1x.png | Bin 0 -> 288 bytes
src/Makefile.am | 1 +
src/gui/chronojumpIcons.cs | 11 ++++-
4 files changed, 73 insertions(+), 5 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 5b5ddf6..6799551 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -4792,14 +4792,44 @@ EncoderInertialCapture</property>
<widget class="GtkHBox" id="hbox207">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">20</property>
<child>
<widget class="GtkButton"
id="button_force_sensor_tare">
- <property name="label"
translatable="yes">Tare</property>
<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="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">0</property>
+ </packing>
+ </child>
+ <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">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -4860,11 +4890,41 @@ EncoderInertialCapture</property>
</child>
<child>
<widget class="GtkButton"
id="button_force_sensor_calibrate">
- <property name="label"
translatable="yes">Calibrate</property>
<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="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">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>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/images/md/ic_looks_zero_blue_24dp_1x.png b/images/md/ic_looks_zero_blue_24dp_1x.png
new file mode 100644
index 0000000..ecb1f3e
Binary files /dev/null and b/images/md/ic_looks_zero_blue_24dp_1x.png differ
diff --git a/src/Makefile.am b/src/Makefile.am
index fdd82a6..05ea577 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -407,6 +407,7 @@ RESOURCES = \
../images/md/ic_person_outline_blue_24dp_1x.png,image_person_outline.png \
../images/md/ic_people_outline_blue_24dp_1x.png,image_group_outline.png \
../images/md/ic_weekend_blue_24dp_1x.png,image_rest.png \
+ ../images/md/ic_looks_zero_blue_24dp_1x.png,zero.png \
../images/md/ic_looks_one_blue_24dp_1x.png,one.png \
../images/md/ic_add_circle_blue_24dp_1x.png,image_add_test.png \
../images/md/ic_all_inclusive_blue_24dp_1x.png,cont.png \
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index 9652911..ab65a87 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -55,7 +55,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_info2;
[Widget] Gtk.Image image_info3;
[Widget] Gtk.Image image_info4;
- [Widget] Gtk.Image image_force_sensor_adjust_help;
[Widget] Gtk.Image image_info_sessions_info;
[Widget] Gtk.Image image_add_test1;
[Widget] Gtk.Image image_add_test2;
@@ -65,7 +64,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_selector_start_jumps;
[Widget] Gtk.Image image_selector_start_runs;
[Widget] Gtk.Image image_selector_start_encoder;
- [Widget] Gtk.Image image_selector_start_force_sensor;
[Widget] Gtk.Image image_selector_start_rt;
[Widget] Gtk.Image image_selector_start_other;
[Widget] Gtk.Image image_selector_start_cancel;
@@ -100,8 +98,14 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_inertial_extended;
[Widget] Gtk.Image image_encoder_calibrate;
[Widget] Gtk.Image image_encoder_recalibrate;
+
+ //force sensor
+ [Widget] Gtk.Image image_selector_start_force_sensor;
+ [Widget] Gtk.Image image_force_sensor_adjust_help;
[Widget] Gtk.Image image_force_sensor_capture_load;
[Widget] Gtk.Image image_force_sensor_analyze_load;
+ [Widget] Gtk.Image image_force_sensor_tare;
+ [Widget] Gtk.Image image_force_sensor_calibrate;
private void putNonStandardIcons()
{
@@ -159,6 +163,7 @@ public partial class ChronoJumpWindow
image_extra_mass.Pixbuf = pixbuf;
image_encoder_inertial_top_weights.Pixbuf = pixbuf;
image_encoder_inertial_weights.Pixbuf = pixbuf;
+ image_force_sensor_calibrate.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_gravity.png");
image_mode_encoder_gravitatory.Pixbuf = pixbuf;
@@ -223,6 +228,8 @@ public partial class ChronoJumpWindow
image_force_sensor_capture_load.Pixbuf = pixbuf;
image_force_sensor_analyze_load.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "zero.png");
+ image_force_sensor_tare.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "one.png");
image_encoder_capture_1set.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "cont.png");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
