commit 0375c90662f800cdb4c830ca5629a9a203957c49
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Sep 12 14:08:19 2020 +0200
More encoder analyze options gui tweaks
glade/app1.glade | 218 +++++++++++++++++++-----------------------------
src/gui/app1/encoder.cs | 14 ++--
2 files changed, 91 insertions(+), 141 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index ae156554..fe84aa2e 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -31062,14 +31062,22 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkHBox"
id="hbox_encoder_user_curves">
+ <widget class="GtkButton"
id="button_encoder_analyze_data_select_curves">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_encoder_analyze_data_select_curves_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox285">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkLabel"
id="label_encoder_analyze_saved_curves">
+ <widget class="GtkImage"
id="image_encoder_analyze_check">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Repetitions</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -31078,6 +31086,18 @@ then click this button.</property>
</packing>
</child>
<child>
+ <widget class="GtkLabel" id="label404">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Select
repetitions</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox"
id="hbox_encoder_user_curves_num">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -31150,43 +31170,7 @@ then click this button.</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_encoder_analyze_data_select_curves">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_encoder_analyze_data_select_curves_clicked" swapped="no"/>
- <child>
- <widget class="GtkHBox" id="hbox285">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkImage"
id="image_encoder_analyze_check">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- <property name="icon-size">2</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label404">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Select</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -31194,13 +31178,6 @@ then click this button.</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
@@ -31413,21 +31390,15 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox92">
+ <widget class="GtkAlignment" id="alignment62">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
+ <property name="left_padding">12</property>
<child>
- <widget class="GtkVSeparator" id="vseparator2">
+ <widget class="GtkHBox" id="hbox92">
<property name="visible">True</property>
<property name="can_focus">False</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="spacing">8</property>
<child>
<widget class="GtkButton"
id="button_encoder_analyze_help">
<property name="can_focus">True</property>
@@ -31445,7 +31416,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -31493,7 +31464,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -31589,7 +31560,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -31629,7 +31600,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -31666,7 +31637,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">5</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -31681,7 +31652,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">6</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
@@ -31694,18 +31665,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">7</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVSeparator" id="vseparator3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">8</property>
+ <property name="position">6</property>
</packing>
</child>
<child>
@@ -31926,45 +31886,6 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkHBox"
id="hbox_encoder_analyze_curve_num">
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkLabel" id="label83">
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Repetition number</property>
- <property name="label">nº</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</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>
- <property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Repetition number</property>
- <child>
- <placeholder/>
- </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>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox"
id="hbox_encoder_analyze_show_SAFE">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -31981,18 +31902,6 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkHSeparator" id="hseparator3">
- <property name="width_request">12</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<widget class="GtkImage"
id="image_encoder_analyze_show_SAFE_position">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -32003,7 +31912,7 @@ then click this button.</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -32017,7 +31926,7 @@ then click this button.</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -32030,7 +31939,7 @@ then click this button.</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -32043,7 +31952,7 @@ then click this button.</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -32057,13 +31966,52 @@ then click this button.</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">6</property>
+ <property name="position">5</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox"
id="hbox_encoder_analyze_curve_num">
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel" id="label83">
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip"
translatable="yes">Repetition number</property>
+ <property name="label">nº</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</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>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip"
translatable="yes">Repetition number</property>
+ <child>
+ <placeholder/>
+ </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>
+ <property name="fill">False</property>
<property name="position">3</property>
</packing>
</child>
@@ -32078,7 +32026,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">9</property>
+ <property name="position">7</property>
</packing>
</child>
<child>
@@ -32091,10 +32039,12 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">10</property>
+ <property name="position">8</property>
</packing>
</child>
</widget>
+ </child>
+ </widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index e08bf6f1..44f62481 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -177,7 +177,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_encoder_analyze;
[Widget] Gtk.Box hbox_encoder_analyze_progress;
[Widget] Gtk.Button button_encoder_analyze_cancel;
- [Widget] Gtk.Box hbox_encoder_user_curves;
+ [Widget] Gtk.Button button_encoder_analyze_data_select_curves;
[Widget] Gtk.Label label_encoder_user_curves_active_num;
[Widget] Gtk.Label label_encoder_user_curves_all_num;
@@ -3360,7 +3360,7 @@ public partial class ChronoJumpWindow
updateComboEncoderAnalyzeCurveNumFromCurrentSet ();
- hbox_encoder_user_curves.Visible = false;
+ button_encoder_analyze_data_select_curves.Visible = false;
hbox_combo_encoder_exercise_analyze.Visible = false;
//this analysis only when not comparing
@@ -3407,7 +3407,7 @@ public partial class ChronoJumpWindow
createComboAnalyzeCross(false, false); //first creation: false, dateOnX: false
- hbox_encoder_user_curves.Visible = currentPerson != null;
+ button_encoder_analyze_data_select_curves.Visible = currentPerson != null;
hbox_combo_encoder_exercise_analyze.Visible = true;
@@ -3451,7 +3451,7 @@ public partial class ChronoJumpWindow
createComboAnalyzeCross(false, check_encoder_intersession_x_is_date.Active);
combo_encoder_analyze_weights.Visible = check_encoder_intersession_x_is_date.Active;
- hbox_encoder_user_curves.Visible = currentPerson != null;
+ button_encoder_analyze_data_select_curves.Visible = currentPerson != null;
hbox_combo_encoder_exercise_analyze.Visible = true;
@@ -3484,7 +3484,7 @@ public partial class ChronoJumpWindow
createComboAnalyzeCross(false, false); //first creation: false, dateOnX: false
- hbox_encoder_user_curves.Visible = currentPerson != null;
+ button_encoder_analyze_data_select_curves.Visible = currentPerson != null;
hbox_combo_encoder_exercise_analyze.Visible = true;
@@ -5072,7 +5072,7 @@ public partial class ChronoJumpWindow
// and images: image_encoder_capture , image_encoder_analyze.Sensitive. Update: both NOT
managed here
//UNUSED c4 button_encoder_save_curve, entry_encoder_curve_comment
//c5 button_encoder_analyze
- //c6 hbox_encoder_user_curves
+ //c6 button_encoder_analyze_data_select_curves
//c7 button_encoder_capture_cancel and button_encoder_analyze_cancel (on capture and analyze)
//c8 button_encoder_capture_finish (only on capture)
@@ -5158,7 +5158,7 @@ public partial class ChronoJumpWindow
button_encoder_analyze.Sensitive = analyze_sensitive;
- hbox_encoder_user_curves.Visible =
+ button_encoder_analyze_data_select_curves.Visible =
(Util.IntToBool(table[6]) && ! radio_encoder_analyze_individual_current_set.Active);
button_encoder_capture_cancel.Sensitive = Util.IntToBool(table[7]);