[chronojump] forceSensor: check version on menu with icon and icon for open folder
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] forceSensor: check version on menu with icon and icon for open folder
- Date: Tue, 19 Dec 2017 16:02:19 +0000 (UTC)
commit cf89ea74babf9a6a3a54fe823746d7fb71e69db7
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Dec 19 17:01:38 2017 +0100
forceSensor: check version on menu with icon and icon for open folder
glade/app1.glade | 40 ++++++++++++++++-----------
images/md/ic_folder_check_blue_24dp_1x.png | Bin 0 -> 493 bytes
images/md/ic_zoom_blue_24dp_1x.png | Bin 0 -> 471 bytes
src/Makefile.am | 2 +
src/gui/chronojumpIcons.cs | 7 +++++
src/gui/forceSensor.cs | 4 +-
6 files changed, 35 insertions(+), 18 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 01fe82a..478c9c0 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -182,7 +182,7 @@
<property name="always_show_image">True</property>
<signal name="activate" handler="on_menuitem_force_sensor_open_folder_activate"
swapped="no"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3">
+ <widget class="GtkImage" id="image_force_sensor_open_folder">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-open</property>
@@ -191,6 +191,23 @@
</widget>
</child>
<child>
+ <widget class="GtkImageMenuItem" id="menuitem_force_sensor_check_version">
+ <property name="label" translatable="yes">Force sensor - Check version</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip" translatable="yes">Check version of force sensor
firmware.</property>
+ <property name="use_stock">False</property>
+ <property name="always_show_image">True</property>
+ <signal name="activate" handler="on_buttons_force_sensor_clicked" swapped="no"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image_force_sensor_check_version">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
<widget class="GtkSeparatorMenuItem" id="separador6">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1521,6 +1538,9 @@
<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>
@@ -5486,21 +5506,6 @@ EncoderInertialCapture</property>
<property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkButton"
id="button_force_sensor_check_version">
- <property name="label" translatable="yes">Check
version</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip"
translatable="yes">Check version of force sensor firmware.</property>
- <signal name="clicked"
handler="on_buttons_force_sensor_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
</widget>
</child>
</widget>
@@ -22390,6 +22395,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/images/md/ic_folder_check_blue_24dp_1x.png b/images/md/ic_folder_check_blue_24dp_1x.png
new file mode 100644
index 0000000..74e8ca1
Binary files /dev/null and b/images/md/ic_folder_check_blue_24dp_1x.png differ
diff --git a/images/md/ic_zoom_blue_24dp_1x.png b/images/md/ic_zoom_blue_24dp_1x.png
new file mode 100644
index 0000000..e70ee3f
Binary files /dev/null and b/images/md/ic_zoom_blue_24dp_1x.png differ
diff --git a/src/Makefile.am b/src/Makefile.am
index bfd8fdc..c9dbc48 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -428,6 +428,8 @@ RESOURCES = \
../images/md/inertial_half_rolled.png,inertial_half_rolled.png \
../images/md/inertial_extended.png,inertial_extended.png \
../images/md/calibrate.png,calibrate.png \
+ ../images/md/ic_folder_check_blue_24dp_1x.png,folder_check.png \
+ ../images/md/ic_zoom_blue_24dp_1x.png,zoom.png \
../images/chronojump_icon.png,chronojump_icon.png \
../images/chronojump_icon_graph.png,chronojump_icon_graph.png \
../images/stock_right.png,stock_right.png \
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index 499ebcf..9424e4f 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -111,6 +111,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_force_sensor_analyze_load;
[Widget] Gtk.Image image_force_sensor_tare;
[Widget] Gtk.Image image_force_sensor_calibrate;
+ [Widget] Gtk.Image image_force_sensor_open_folder;
+ [Widget] Gtk.Image image_force_sensor_check_version;
private void putNonStandardIcons()
{
@@ -172,6 +174,11 @@ public partial class ChronoJumpWindow
image_encoder_inertial_weights.Pixbuf = pixbuf;
image_force_sensor_calibrate.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "folder_check.png");
+ image_force_sensor_open_folder.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "zoom.png");
+ image_force_sensor_check_version.Pixbuf = pixbuf;
+
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_gravity.png");
image_mode_encoder_gravitatory.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_inertia.png");
diff --git a/src/gui/forceSensor.cs b/src/gui/forceSensor.cs
index 919cf09..9040896 100644
--- a/src/gui/forceSensor.cs
+++ b/src/gui/forceSensor.cs
@@ -62,6 +62,7 @@ public class ForceSensorValues
public partial class ChronoJumpWindow
{
[Widget] Gtk.MenuItem menuitem_force_sensor_open_folder;
+ [Widget] Gtk.MenuItem menuitem_force_sensor_check_version;
//capture tab tab
[Widget] Gtk.HBox hbox_force_buttons;
@@ -72,7 +73,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label label_force_sensor_value_min;
//[Widget] Gtk.VScale vscale_force_sensor;
[Widget] Gtk.SpinButton spin_force_sensor_calibration_kg_value;
- [Widget] Gtk.Button button_force_sensor_check_version;
[Widget] Gtk.Button button_force_sensor_image_save_signal;
[Widget] Gtk.DrawingArea force_capture_drawingarea;
Gdk.Pixmap force_capture_pixmap = null;
@@ -1246,9 +1246,9 @@ LogB.Information(" fc R ");
notebook_options_top.Visible = ! modeForceSensor;
button_threshold.Visible = ! modeForceSensor;
- button_force_sensor_check_version.Visible = modeForceSensor;
menuitem_force_sensor_open_folder.Visible = modeForceSensor;
+ menuitem_force_sensor_check_version.Visible = modeForceSensor;
}
private void on_button_force_sensor_adjust_help_clicked (object o, EventArgs args)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
