[chronojump] force sensor open folder moved to session menu

[Xavier de Blas <xaviblas src gnome org>]

commit 0b9b98be0e1d8b44e8409427969c13021e8303be
Author: Xavier de Blas <xaviblas gmail com>
Date:   Sat Nov 4 16:20:25 2017 +0100

    force sensor open folder moved to session menu

 glade/app1.glade       |   43 +++++++++++++++++++++++++------------------
 src/gui/forceSensor.cs |   11 ++++++++++-
 2 files changed, 35 insertions(+), 19 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 716967e..12c3971 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -175,6 +175,22 @@
                       </widget>
                     </child>
                     <child>
+                      <widget class="GtkImageMenuItem" id="menuitem_force_sensor_open_folder">
+                        <property name="label" translatable="yes">Force sensor - Open data folder</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_stock">False</property>
+                        <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">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="stock">gtk-open</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
                       <widget class="GtkSeparatorMenuItem" id="separador6">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -1420,6 +1436,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>
@@ -4617,7 +4636,7 @@ EncoderInertialCapture</property>
                                                             <widget class="GtkHBox" id="hbox_force_buttons">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
-                                                            <property name="spacing">40</property>
+                                                            <property name="spacing">30</property>
                                                             <child>
                                                             <widget class="GtkButton" 
id="button_force_sensor_load">
                                                             <property name="label" translatable="yes">Load 
file</property>
@@ -4636,10 +4655,9 @@ EncoderInertialCapture</property>
                                                             <widget class="GtkHBox" id="hbox152">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
-                                                            <property name="spacing">20</property>
+                                                            <property name="spacing">10</property>
                                                             <child>
                                                             <widget class="GtkLabel" id="label111">
-                                                            <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
                                                             <property name="label" 
translatable="yes">Adjust:</property>
                                                             </widget>
@@ -4653,7 +4671,7 @@ EncoderInertialCapture</property>
                                                             <widget class="GtkHBox" id="hbox207">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
-                                                            <property name="spacing">20</property>
+                                                            <property name="spacing">12</property>
                                                             <child>
                                                             <widget class="GtkButton" 
id="button_force_sensor_tare">
                                                             <property name="label" 
translatable="yes">Tare</property>
@@ -4774,20 +4792,6 @@ EncoderInertialCapture</property>
                                                             <property name="position">1</property>
                                                             </packing>
                                                             </child>
-                                                            <child>
-                                                            <widget class="GtkButton" 
id="button_force_sensor_data_folder">
-                                                            <property name="label" translatable="yes">Open 
data folder</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_data_folder_clicked" swapped="no"/>
-                                                            </widget>
-                                                            <packing>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">False</property>
-                                                            <property name="position">2</property>
-                                                            </packing>
-                                                            </child>
                                                             </widget>
                                                             </child>
                                                           </widget>
@@ -21791,6 +21795,9 @@ then click this button.</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
diff --git a/src/gui/forceSensor.cs b/src/gui/forceSensor.cs
index bc67a15..d26d9e5 100644
--- a/src/gui/forceSensor.cs
+++ b/src/gui/forceSensor.cs
@@ -61,6 +61,7 @@ public class ForceSensorValues
 
 public partial class ChronoJumpWindow 
 {
+       [Widget] Gtk.MenuItem menuitem_force_sensor_open_folder;
        [Widget] Gtk.HBox hbox_force_buttons;
        [Widget] Gtk.Button button_force_sensor_tare;
        [Widget] Gtk.Button button_force_sensor_calibrate;
@@ -1055,8 +1056,14 @@ LogB.Information(" fc R ");
        }
 
 
-       private void on_button_force_sensor_data_folder_clicked (object o, EventArgs args)
+       private void on_menuitem_force_sensor_open_folder_activate (object o, EventArgs args)
        {
+               if(currentSession == null || currentSession.UniqueID == null)
+               {
+                       System.Diagnostics.Process.Start(ForceSensorGraph.GetDataDir(-1));
+                       return;
+               }
+
                string dataDir = ForceSensorGraph.GetDataDir(currentSession.UniqueID);
                if(dataDir != "")
                        System.Diagnostics.Process.Start(dataDir);
@@ -1072,6 +1079,8 @@ LogB.Information(" fc R ");
 
                button_threshold.Visible = ! modeForceSensor;
                button_force_sensor_check_version.Visible = modeForceSensor;
+
+               menuitem_force_sensor_open_folder.Visible = modeForceSensor;
        }
 
        private void on_button_force_sensor_adjust_help_clicked (object o, EventArgs args)