commit e0e44e6569d8185d3d92f545d20854b1010eb5b8
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Nov 11 13:39:43 2017 +0100
force sensor load_file buttons with image
glade/app1.glade | 70 ++++++++++++++++++++++++++++++++++++++++++-
src/gui/chronojumpIcons.cs | 4 ++
src/gui/forceSensor.cs | 2 +-
3 files changed, 73 insertions(+), 3 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index f9c2f98..5b5ddf6 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1466,6 +1466,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>
@@ -4727,11 +4730,41 @@ EncoderInertialCapture</property>
<property name="spacing">30</property>
<child>
<widget class="GtkButton"
id="button_force_sensor_capture_load">
- <property name="label" translatable="yes">Load
file</property>
<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_load_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox236">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="label157">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Load
file</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_capture_load">
+ <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>
@@ -15029,11 +15062,41 @@ Concentric</property>
<property name="spacing">12</property>
<child>
<widget class="GtkButton"
id="button_force_sensor_analyze_load">
- <property name="label" translatable="yes">Load
file</property>
<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_load_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox205">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="label140">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Load
file</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_analyze_load">
+ <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>
@@ -21997,6 +22060,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 109a029..9652911 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -100,6 +100,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_inertial_extended;
[Widget] Gtk.Image image_encoder_calibrate;
[Widget] Gtk.Image image_encoder_recalibrate;
+ [Widget] Gtk.Image image_force_sensor_capture_load;
+ [Widget] Gtk.Image image_force_sensor_analyze_load;
private void putNonStandardIcons()
{
@@ -218,6 +220,8 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "folder_open.png");
image_encoder_capture_open.Pixbuf = pixbuf;
image_encoder_capture_open1.Pixbuf = pixbuf;
+ image_force_sensor_capture_load.Pixbuf = pixbuf;
+ image_force_sensor_analyze_load.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "one.png");
image_encoder_capture_1set.Pixbuf = pixbuf;
diff --git a/src/gui/forceSensor.cs b/src/gui/forceSensor.cs
index 18c6308..fc4d775 100644
--- a/src/gui/forceSensor.cs
+++ b/src/gui/forceSensor.cs
@@ -1069,7 +1069,7 @@ LogB.Information(" fc R ");
private void on_menuitem_force_sensor_open_folder_activate (object o, EventArgs args)
{
- if(currentSession == null || currentSession.UniqueID == null)
+ if(currentSession == null || currentSession.UniqueID == -1)
{
System.Diagnostics.Process.Start(ForceSensorGraph.GetDataDir(-1));
return;