[chronojump] Encoder: spin curves num -> combobox (100%)

[Xavier de Blas <xaviblas src gnome org>]

commit c6c52ee0db0a316cd63b84ab38e779f61b160278
Author: Xavier de Blas <xaviblas gmail com>
Date:   Sun Nov 18 18:58:06 2012 +0100

    Encoder: spin curves num -> combobox (100%)

 glade/chronojump.glade |   22 +---------------------
 src/gui/encoder.cs     |   25 ++++++++-----------------
 2 files changed, 9 insertions(+), 38 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 2984a88..a54dc4a 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -12510,26 +12510,6 @@ Evaluator can use real name or nickname.</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkSpinButton" id="spin_encoder_analyze_curve_num">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="invisible_char">â</property>
-                                                    <property name="primary_icon_activatable">False</property>
-                                                    <property name="secondary_icon_activatable">False</property>
-                                                    <property name="primary_icon_sensitive">True</property>
-                                                    <property name="secondary_icon_sensitive">True</property>
-                                                    <property name="adjustment">1 1 40 1 10 0</property>
-                                                    <property name="climb_rate">1</property>
-                                                    <property name="snap_to_ticks">True</property>
-                                                    <property name="numeric">True</property>
-                                                  </widget>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">False</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
                                                   <widget class="GtkHBox" id="hbox_combo_encoder_analyze_curve_num_combo">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
@@ -12540,7 +12520,7 @@ Evaluator can use real name or nickname.</property>
                                                   <packing>
                                                     <property name="expand">True</property>
                                                     <property name="fill">True</property>
-                                                    <property name="position">2</property>
+                                                    <property name="position">1</property>
                                                   </packing>
                                                 </child>
                                               </widget>
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 434511d..49cba44 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -77,7 +77,6 @@ public partial class ChronoJumpWindow
 	[Widget] Gtk.RadioButton radiobutton_encoder_eccon_both;
 	[Widget] Gtk.RadioButton radiobutton_encoder_eccon_together;
 	[Widget] Gtk.Box hbox_encoder_analyze_curve_num;
-	[Widget] Gtk.SpinButton spin_encoder_analyze_curve_num;
 	[Widget] Gtk.Box hbox_combo_encoder_analyze_curve_num_combo;
 	[Widget] Gtk.ComboBox combo_encoder_analyze_curve_num_combo;
 	
@@ -161,7 +160,6 @@ public partial class ChronoJumpWindow
 		//the glade cursor_changed does not work on mono 1.2.5 windows
 		treeview_encoder_curves.CursorChanged += on_treeview_encoder_curves_cursor_changed; 
 		createEncoderCombos();
-		spin_encoder_analyze_curve_num.SetRange(0,0);
 	}
 
 	//TODO: garantir path windows	
@@ -259,7 +257,6 @@ public partial class ChronoJumpWindow
 				if(Util.FindOnArray(':',1,0,UtilGtk.ComboGetActive(combo_encoder_eccon),
 						encoderEcconTranslation) != "Concentric") 
 					curvesNum = curvesNum / 2;
-				spin_encoder_analyze_curve_num.SetRange(1,curvesNum);
 			
 				string [] activeCurvesList = new String[curvesNum];
 				for(int i=0; i < curvesNum; i++)
@@ -528,7 +525,6 @@ public partial class ChronoJumpWindow
 			int activeCurvesNum = getActiveCurvesNum(data);
 			label_encoder_user_curves_active_num.Text = activeCurvesNum.ToString();
 			label_encoder_user_curves_all_num.Text = data.Count.ToString();
-			spin_encoder_analyze_curve_num.SetRange(1, data.Count);
 			updateComboEncoderAnalyzeCurveNum(data, activeCurvesNum);	
 		}
 	}
@@ -713,7 +709,7 @@ public partial class ChronoJumpWindow
 				myEccon = "ecS";
 			int myCurveNum = -1;
 			if(sendAnalysis == "single")
-				myCurveNum = (int) spin_encoder_analyze_curve_num.Value;
+				myCurveNum = Convert.ToInt32(UtilGtk.ComboGetActive(combo_encoder_analyze_curve_num_combo));
 
 			//-1 because data will be different on any curve
 			ep = new EncoderParams(
@@ -763,7 +759,7 @@ public partial class ChronoJumpWindow
 					findEccon(false),		//do not force ecS (ecc-conc separated)
 					sendAnalysis,
 					Util.ConvertToPoint((double) spin_encoder_smooth.Value), //R decimal: '.'
-					(int) spin_encoder_analyze_curve_num.Value, 
+					Convert.ToInt32(UtilGtk.ComboGetActive(combo_encoder_analyze_curve_num_combo)),
 					image_encoder_width,
 					image_encoder_height); 
 			
@@ -789,8 +785,6 @@ public partial class ChronoJumpWindow
 		if(ecconLast != "c")
 			rows = rows / 2;
 
-//		spin_encoder_analyze_curve_num.SetRange(1, rows);
-	
 		string [] activeCurvesList;
 		if(rows == 0)
  			activeCurvesList = Util.StringToStringArray("");
@@ -805,20 +799,18 @@ public partial class ChronoJumpWindow
 			UtilGtk.ComboMakeActive(combo_encoder_analyze_curve_num_combo, activeCurvesList[0]);
 	}
 	private void on_radiobutton_encoder_analyze_data_user_curves_toggled (object obj, EventArgs args) {
-		button_encoder_analyze.Sensitive = (currentPerson != null && 
-			UtilGtk.ComboGetActive(combo_encoder_analyze_curve_num_combo) != "");
-
-		button_encoder_analyze_data_show_user_curves.Sensitive = currentPerson != null;
-		hbox_encoder_user_curves_num.Sensitive = currentPerson != null;
-
 		if(currentPerson != null) {
-			spin_encoder_analyze_curve_num.SetRange(1, Convert.ToInt32(label_encoder_user_curves_all_num.Text));
-
 			ArrayList data = SqliteEncoder.Select(false, -1, 
 					currentPerson.UniqueID, currentSession.UniqueID, "curve");
 			int activeCurvesNum = getActiveCurvesNum(data);
 			updateComboEncoderAnalyzeCurveNum(data, activeCurvesNum);	
 		}
+		
+		button_encoder_analyze.Sensitive = (currentPerson != null && 
+			UtilGtk.ComboGetActive(combo_encoder_analyze_curve_num_combo) != "");
+
+		button_encoder_analyze_data_show_user_curves.Sensitive = currentPerson != null;
+		hbox_encoder_user_curves_num.Sensitive = currentPerson != null;
 	}
 
 
@@ -1511,7 +1503,6 @@ public partial class ChronoJumpWindow
 		label_encoder_user_curves_active_num.Text = activeCurvesNum.ToString();
 		
 		label_encoder_user_curves_all_num.Text = data.Count.ToString();
-//		spin_encoder_analyze_curve_num.SetRange(1, data.Count);
 	
 		if(radiobutton_encoder_analyze_data_current_signal.Active) {
 			int rows = UtilGtk.CountRows(encoderListStore);