[chronojump] Doing: able to delete encoder exercise

[Xavier de Blas <xaviblas src gnome org>]

commit e6ee63d682176686cd5df0809d51047d47a36906
Author: Xavier de Blas <xaviblas gmail com>
Date:   Mon Sep 15 18:33:25 2014 +0200

    Doing: able to delete encoder exercise

 glade/chronojump.glade   |   22 +++++++++++++++++++---
 src/gui/encoder.cs       |   19 ++++++++++++++++++-
 src/gui/genericWindow.cs |   32 ++++++++++++++++++++++++--------
 3 files changed, 61 insertions(+), 12 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 6a6196b..cf72921 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -25662,7 +25662,23 @@ One serie can contain several tests.</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">10</property>
-            <property name="layout_style">spread</property>
+            <property name="layout_style">edge</property>
+            <child>
+              <widget class="GtkButton" id="button_delete">
+                <property name="label">gtk-remove</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_button_delete_clicked" swapped="no"/>
+                <accelerator key="Escape" signal="clicked"/>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
             <child>
               <widget class="GtkButton" id="button_cancel">
                 <property name="label">gtk-cancel</property>
@@ -25677,7 +25693,7 @@ One serie can contain several tests.</property>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
@@ -25693,7 +25709,7 @@ One serie can contain several tests.</property>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </widget>
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index fc608c4..ce3a04c 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -3176,7 +3176,10 @@ public partial class ChronoJumpWindow
                genericWin.SetSpin3Range(ex.weightAngle,ex.weightAngle); //done this because IsEditable does 
not affect the cursors
                */
                genericWin.ShowButtonCancel(false);
-
+               
+               genericWin.ShowButtonDelete(true);
+               genericWin.Button_delete.Clicked += new EventHandler(on_button_encoder_exercise_delete);
+               
                genericWin.nameOld = ex.name;
                
                genericWin.Button_accept.Clicked += new 
EventHandler(on_button_encoder_exercise_edit_accepted);
@@ -3292,6 +3295,20 @@ public partial class ChronoJumpWindow
                        Log.WriteLine("done");
                }
        }
+       
+       void on_button_encoder_exercise_delete (object o, EventArgs args) {
+               //TODO:
+               //select if there is encoder stuff with this encoder exercise   
+               //      TRUE: DialogMessage WARNING, or confirmWindow or confirmWindowJumpRun saying that 
there are tests on session X by person Y. Accept and exit
+               //      FALSE: confirmWindow or confirmWindowJumpRun saying that there are no tests. Confirm 
delete or cancel
+               //              CONFIRM: 
+               //                      delete encoder, encoderSignalCurve, encoder1RM table records with 
this exercise. 
+               //                      delete row from encoderExercise
+               //              CANCEL: close
+
+               new DialogMessage(Constants.MessageTypes.WARNING, 
+                               "TODO: Message on deleting exercise.");
+       }
 
 
        /* sensitivity stuff */ 
diff --git a/src/gui/genericWindow.cs b/src/gui/genericWindow.cs
index d9d5791..8c956ec 100644
--- a/src/gui/genericWindow.cs
+++ b/src/gui/genericWindow.cs
@@ -69,6 +69,7 @@ public class GenericWindow
        [Widget] Gtk.TreeView treeview;
        [Widget] Gtk.Button button_accept;
        [Widget] Gtk.Button button_cancel;
+       [Widget] Gtk.Button button_delete; //currently only on encoder exercise edit
        
        //treeview fake buttons
        [Widget] Gtk.Button button_row_edit;
@@ -343,7 +344,7 @@ public class GenericWindow
        }
 
        
-       protected string [] comboCheckBoxesOptions = {
+       private string [] comboCheckBoxesOptions = {
                Catalog.GetString("All"),
                Catalog.GetString("None"),
                Catalog.GetString("Invert"),
@@ -372,7 +373,7 @@ public class GenericWindow
                        UtilGtk.ComboMakeActive(comboCheckBoxesOptions, Catalog.GetString("Selected"));
        }
        
-       protected void on_combo_all_none_selected_changed(object o, EventArgs args) {
+       private void on_combo_all_none_selected_changed(object o, EventArgs args) {
                string myText = UtilGtk.ComboGetActive(combo_all_none_selected);
                        
                if (myText != "" & myText != Catalog.GetString("Selected")) {
@@ -384,7 +385,7 @@ public class GenericWindow
                }
        }
        
-       protected void markSelected(string selected) {
+       private void markSelected(string selected) {
                Gtk.TreeIter iter;
                bool okIter = store.GetIterFirst(out iter);
                if(okIter) {
@@ -546,7 +547,7 @@ Log.WriteLine("aaaaaaaaaaaaaaaa2");
                        return 0;
        }
 
-       protected void createCheckboxes(TreeView tv) 
+       private void createCheckboxes(TreeView tv) 
        {
                CellRendererToggle crt = new CellRendererToggle();
                crt.Visible = true;
@@ -593,7 +594,7 @@ Log.WriteLine("aaaaaaaaaaaaaaaa2");
                }
        }
 
-       protected void ItemToggled(object o, ToggledArgs args) {
+       private void ItemToggled(object o, ToggledArgs args) {
                int column = 1;
                TreeIter iter;
                if (store.GetIter (out iter, new TreePath(args.Path))) 
@@ -707,6 +708,15 @@ Log.WriteLine("aaaaaaaaaaaaaaaa2");
                store = UtilGtk.RemoveRow(treeview, store);
        }
 
+       public void ShowButtonDelete(bool show) {
+               button_delete.Visible = show;
+       }
+       
+       private void on_button_delete_clicked (object o, EventArgs args)
+       {
+               GenericWindowBox.generic_window.Hide();
+               GenericWindowBox = null;
+       }
        
        public void SetButtonAcceptLabel(string str) {
                button_accept.Label=str;
@@ -724,13 +734,13 @@ Log.WriteLine("aaaaaaaaaaaaaaaa2");
                button_cancel.Visible = show;
        }
 
-       protected void on_button_cancel_clicked (object o, EventArgs args)
+       private void on_button_cancel_clicked (object o, EventArgs args)
        {
                GenericWindowBox.generic_window.Hide();
                GenericWindowBox = null;
        }
        
-       protected void on_delete_event (object o, DeleteEventArgs args)
+       private void on_delete_event (object o, DeleteEventArgs args)
        {
                args.RetVal = true;
                        
@@ -738,7 +748,7 @@ Log.WriteLine("aaaaaaaaaaaaaaaa2");
                GenericWindowBox = null;
        }
 
-       protected void on_button_accept_clicked (object o, EventArgs args)
+       private void on_button_accept_clicked (object o, EventArgs args)
        {
                if(HideOnAccept)
                        GenericWindowBox.generic_window.Hide();
@@ -752,6 +762,12 @@ Log.WriteLine("aaaaaaaaaaaaaaaa2");
                GenericWindowBox.generic_window.Hide();
                GenericWindowBox = null;
        }
+       
+       public Button Button_delete {
+               set { button_delete = value; }
+               get { return button_delete; }
+       }
+               
 
        public Button Button_accept {
                set { button_accept = value; }