[chronojump] Encoder: curves num, from spinbutton to combo
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Encoder: curves num, from spinbutton to combo
- Date: Fri, 16 Nov 2012 23:39:02 +0000 (UTC)
commit 43f3fd0e14e3de0d9fd7ec87855d278638056966
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Nov 17 00:37:35 2012 +0100
Encoder: curves num, from spinbutton to combo
glade/chronojump.glade | 14 ++++++++++++++
src/gui/encoder.cs | 14 ++++++++++++++
2 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index ced52d5..5514fcf 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -12529,6 +12529,20 @@ Evaluator can use real name or nickname.</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkHBox" id="hbox_encoder_analyze_curve_num_combo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 237ebcb..4deeec8 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -78,6 +78,8 @@ public partial class ChronoJumpWindow
[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;
[Widget] Gtk.Box hbox_encoder_analyze_mean_or_max;
[Widget] Gtk.RadioButton radiobutton_encoder_analyze_mean;
@@ -756,6 +758,7 @@ public partial class ChronoJumpWindow
//show curve_num only on simple and superpose
private void on_radiobutton_encoder_analyze_single_toggled (object obj, EventArgs args) {
hbox_encoder_analyze_curve_num.Visible=true;
+ hbox_combo_encoder_analyze_curve_num_combo.Visible = true;
hbox_combo_encoder_analyze_cross.Visible=false;
hbox_encoder_analyze_mean_or_max.Visible=false;
encoderAnalysis="single";
@@ -903,6 +906,12 @@ public partial class ChronoJumpWindow
UtilGtk.ComboUpdate(combo_encoder_analyze_cross, comboAnalyzeCrossOptionsTranslated, "");
combo_encoder_analyze_cross.Active = UtilGtk.ComboMakeActive(combo_encoder_analyze_cross,
Catalog.GetString(comboAnalyzeCrossOptions[0]));
+
+ //create combo analyze curve num combo
+ //is not an spinbutton because can be separated values
+ combo_encoder_analyze_curve_num_combo = ComboBox.NewText ();
+ UtilGtk.ComboUpdate(combo_encoder_analyze_curve_num_combo, Util.StringToStringArray(""), "");
+
//pack combos
@@ -922,6 +931,11 @@ public partial class ChronoJumpWindow
hbox_combo_encoder_analyze_cross.ShowAll();
combo_encoder_analyze_cross.Sensitive = true;
hbox_combo_encoder_analyze_cross.Visible = false; //do not show hbox at start
+
+ hbox_combo_encoder_analyze_curve_num_combo.PackStart(combo_encoder_analyze_curve_num_combo, true, true, 0);
+ hbox_combo_encoder_analyze_curve_num_combo.ShowAll();
+ combo_encoder_analyze_curve_num_combo.Sensitive = true;
+ hbox_combo_encoder_analyze_curve_num_combo.Visible = false; //do not show hbox at start
}
void on_combo_encoder_eccon_changed (object o, EventArgs args)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]