commit e12e80c8c30ff12f7d35352c880c9f6631fc1e64
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Feb 11 19:17:39 2016 +0100
A set can be loaded from analyze tab
glade/chronojump.glade | 138 +++++++++++++++++++++++++++++++++++++++++-------
src/gui/encoder.cs | 6 ++-
2 files changed, 123 insertions(+), 21 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 4dcb17e..ff27400 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -7961,6 +7961,9 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -9456,6 +9459,9 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -10592,6 +10598,9 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -17045,10 +17054,47 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
+ <widget class="GtkHBox"
id="hbox_encoder_analyze_current_signal">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
<widget class="GtkLabel"
id="label_encoder_analyze_current_signal">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Current set</property>
+ <property name="label"
translatable="yes">Set</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_encoder_load_signal_on_analyze">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Load
set</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked"
handler="on_button_encoder_load_signal_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_capture_open1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-open</property>
+ <property name="icon-size">1</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -18769,6 +18815,9 @@ on current Chronojump version.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -18810,23 +18859,22 @@ on current Chronojump version.</property>
<property name="can_focus">False</property>
<property name="spacing">8</property>
<child>
- <widget class="GtkButton"
id="button_encoder_analyze_image_save">
- <property name="visible">True</property>
+ <widget class="GtkButton"
id="button_encoder_analyze_AB_save">
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip" translatable="yes">Save
image</property>
- <signal name="clicked"
handler="on_button_encoder_analyze_image_save_clicked" swapped="no"/>
+ <property name="tooltip"
translatable="yes">Export repetition from A to B</property>
+ <signal name="clicked"
handler="on_button_encoder_analyze_AB_save_clicked" swapped="no"/>
<child>
- <widget class="GtkVBox" id="vbox63">
+ <widget class="GtkVBox" id="vbox68">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkImage"
id="image_encoder_analyze_image_save">
+ <widget class="GtkLabel" id="label82">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
+ <property name="label">AB</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -18835,7 +18883,7 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <widget class="GtkImage"
id="image_encoder_analyze_image_save_1">
+ <widget class="GtkImage"
id="image_encoder_analyze_image_save_2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-save</property>
@@ -18857,22 +18905,23 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_encoder_analyze_AB_save">
+ <widget class="GtkButton"
id="button_encoder_analyze_image_save">
+ <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip"
translatable="yes">Export repetition from A to B</property>
- <signal name="clicked"
handler="on_button_encoder_analyze_AB_save_clicked" swapped="no"/>
+ <property name="tooltip" translatable="yes">Save
image</property>
+ <signal name="clicked"
handler="on_button_encoder_analyze_image_save_clicked" swapped="no"/>
<child>
- <widget class="GtkVBox" id="vbox68">
+ <widget class="GtkVBox" id="vbox63">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkLabel" id="label82">
+ <widget class="GtkImage"
id="image_encoder_analyze_image_save">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">AB</property>
+ <property
name="stock">gtk-missing-image</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -18881,7 +18930,7 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <widget class="GtkImage"
id="image_encoder_analyze_image_save_2">
+ <widget class="GtkImage"
id="image_encoder_analyze_image_save_1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-save</property>
@@ -23313,6 +23362,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -24348,6 +24400,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -25875,6 +25930,9 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -26459,6 +26517,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -38571,6 +38632,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -40674,6 +40753,18 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -41939,9 +42030,6 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<placeholder/>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkLabel" id="label218">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -42976,6 +43064,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -46783,6 +46874,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -47482,6 +47576,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -48196,6 +48293,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 46a468c..1d4c9df 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -67,6 +67,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_encoder_capture_finish;
[Widget] Gtk.Button button_encoder_recalculate;
[Widget] Gtk.Button button_encoder_load_signal;
+ [Widget] Gtk.Button button_encoder_load_signal_on_analyze;
[Widget] Gtk.Viewport viewport_image_encoder_capture;
[Widget] Gtk.Image image_encoder_capture;
[Widget] Gtk.Image image_encoder_capture_open;
@@ -180,7 +181,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.CheckButton check_encoder_analyze_signal_or_curves;
[Widget] Gtk.Image image_encoder_analyze_current_signal;
[Widget] Gtk.Image image_encoder_analyze_saved_curves;
- [Widget] Gtk.Label label_encoder_analyze_current_signal;
+ [Widget] Gtk.HBox hbox_encoder_analyze_current_signal;
[Widget] Gtk.Label label_encoder_analyze_saved_curves;
[Widget] Gtk.RadioButton radiobutton_encoder_analyze_powerbars;
@@ -3137,7 +3138,7 @@ public partial class ChronoJumpWindow
button_encoder_analyze_sensitiveness();
image_encoder_analyze_current_signal.Visible = signal;
- label_encoder_analyze_current_signal.Visible = signal;
+ hbox_encoder_analyze_current_signal.Visible = signal;
image_encoder_analyze_saved_curves.Visible = ! signal;
label_encoder_analyze_saved_curves.Visible = ! signal;
}
@@ -4238,6 +4239,7 @@ public partial class ChronoJumpWindow
button_encoder_recalculate.Sensitive = Util.IntToBool(table[1]);
button_encoder_load_signal.Sensitive = Util.IntToBool(table[2]);
+ button_encoder_load_signal_on_analyze.Sensitive = Util.IntToBool(table[2]);
hbox_encoder_capture_curves_save_all_none.Sensitive = Util.IntToBool(table[3]);
menuitem_export_encoder_signal.Sensitive = Util.IntToBool(table[3]);