[chronojump] ForceSensorElasticBands better GUI WIP

[Xavier de Blas <xaviblas src gnome org>]

commit 3d54b99c78ddb655fe362bd4d6e6a4a11746015a
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri Jun 19 18:34:06 2020 +0200

    ForceSensorElasticBands better GUI WIP

 glade/force_sensor_elastic_bands.glade | 17 ++++++++---------
 src/gui/forceSensorElasticBands.cs     | 11 ++---------
 2 files changed, 10 insertions(+), 18 deletions(-)
---
diff --git a/glade/force_sensor_elastic_bands.glade b/glade/force_sensor_elastic_bands.glade
index 8b548f2e..6b442685 100644
--- a/glade/force_sensor_elastic_bands.glade
+++ b/glade/force_sensor_elastic_bands.glade
@@ -68,7 +68,7 @@
               <widget class="GtkVBox" id="vbox5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="spacing">12</property>
+                <property name="spacing">20</property>
                 <child>
                   <widget class="GtkHBox" id="hbox2">
                     <property name="visible">True</property>
@@ -190,9 +190,8 @@
                 <child>
                   <widget class="GtkFrame" id="frame_in_use">
                     <property name="visible">True</property>
-                    <property name="sensitive">False</property>
                     <property name="can_focus">False</property>
-                    <property name="label_xalign">0.5</property>
+                    <property name="label_xalign">0</property>
                     <property name="shadow_type">out</property>
                     <child>
                       <widget class="GtkVBox" id="vbox6">
@@ -374,7 +373,7 @@
                           </widget>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="fill">True</property>
+                            <property name="fill">False</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
@@ -452,7 +451,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="label10">
+                                      <widget class="GtkLabel" id="label18">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">Delete</property>
@@ -476,16 +475,14 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="pack_type">end</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label_edit_or_add1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                      </widget>
+                      <placeholder/>
                       <packing>
                         <property name="type">label_item</property>
                       </packing>
@@ -967,6 +964,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="pack_type">end</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -1178,6 +1176,7 @@ you will have to create again the elastic band.</property>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="pack_type">end</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
diff --git a/src/gui/forceSensorElasticBands.cs b/src/gui/forceSensorElasticBands.cs
index 6d8b3126..a54d2b13 100644
--- a/src/gui/forceSensorElasticBands.cs
+++ b/src/gui/forceSensorElasticBands.cs
@@ -41,7 +41,6 @@ public class ForceSensorElasticBandsWindow
        [Widget] Gtk.Image image_save;
        [Widget] Gtk.Image image_cancel;
        [Widget] Gtk.Button button_edit_save;
-       [Widget] Gtk.Button button_delete;
        [Widget] Gtk.CheckButton check_active_view;
        [Widget] Gtk.CheckButton check_active_edit;
        [Widget] Gtk.HBox hbox_active_view;
@@ -271,7 +270,6 @@ public class ForceSensorElasticBandsWindow
                if (treeview.Selection.GetSelected (out myModel, out iter))
                {
                        currentMode = modes.EDITING;
-               //      button_delete.Sensitive = true;
                        label_edit_or_add.Text = Catalog.GetString("Edit selected");
                        ForceSensorElasticBand fseb = getSelectedForceSensorElasticBand();
                        fill_frame(fseb);
@@ -308,9 +306,7 @@ public class ForceSensorElasticBandsWindow
                currentMode = modes.ADDING;
                empty_frame(); //empty all
                label_edit_or_add.Text = Catalog.GetString("Add new elastic band/tube");
-               frame_in_use.Sensitive = true;
                treeview.Selection.UnselectAll();
-               //button_delete.Sensitive = false;
 
                notebook.CurrentPage = 1;
        }
@@ -371,14 +367,12 @@ public class ForceSensorElasticBandsWindow
 
        private void on_button_edit_cancel_clicked (object o, EventArgs args)
        {
-               //unsensitivize frame_in_use
-               //frame_in_use.Sensitive = false;
-               //button_delete.Sensitive = false;
+               if(currentMode == modes.ADDING)
+                       frame_in_use.Sensitive = false;
 
                notebook.CurrentPage = 0;
        }
 
-
        private void on_button_delete_clicked (object o, EventArgs args)
        {
                //TODO: only if there are captures done with this
@@ -403,7 +397,6 @@ public class ForceSensorElasticBandsWindow
                //4) fix the rest of the gui
                empty_frame(); //empty all
                frame_in_use.Sensitive = false;
-               //button_delete.Sensitive = false;
 
                notebook.CurrentPage = 0;
        }