commit 2b495bdea793f659f9a7ac5d4d5771452215cbf9
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Sep 12 13:24:56 2020 +0200
Encoder analyze 4 modes better display and no animation
glade/app1.glade | 381 +++++++++++++++++++++++++--------------------
src/gui/app1/chronojump.cs | 11 +-
src/gui/app1/encoder.cs | 45 +-----
3 files changed, 219 insertions(+), 218 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 147b7395..40917ad5 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -24888,6 +24888,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -27744,18 +27747,6 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Tests
will be filmed</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox"
id="hbox_video_encoder_capturing">
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -27792,6 +27783,18 @@ Concentric</property>
</packing>
</child>
<child>
+ <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Tests
will be filmed</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox"
id="hbox_video_encoder_no_capturing">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -30607,61 +30610,65 @@ then click this button.</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkAlignment" id="alignment33">
+ <widget class="GtkHBox" id="hbox56">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">6</property>
- <property name="right_padding">6</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkTable"
id="table_encoder_analyze_options">
+ <widget class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">8</property>
- <child>
- <widget class="GtkLabel" id="label87">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Data:</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
+ <property name="label_xalign">0.5</property>
+ <property name="shadow_type">in</property>
<child>
- <widget class="GtkHBox"
id="hbox_encoder_analyze_signal_or_curves">
+ <widget class="GtkHBox" id="hbox81">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">20</property>
- <child>
- <widget class="GtkHBox" id="hbox81">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
+ <property name="border_width">4</property>
+ <property name="spacing">16</property>
<child>
<widget class="GtkRadioButton"
id="radio_encoder_analyze_individual_current_set">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Individual / current set</property>
<property name="active">True</property>
<property name="draw_indicator">False</property>
- <signal name="toggled"
handler="on_radio_encoder_analyze_pre" swapped="no"/>
+ <signal name="toggled"
handler="on_radio_encoder_analyze_individual_current_set" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox330">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkImage"
id="image_encoder_analyze_individual_current_set">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label570">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Current set</property>
</widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -30670,18 +30677,31 @@ then click this button.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Individual / current session</property>
- <property name="active">True</property>
<property name="draw_indicator">False</property>
<property
name="group">radio_encoder_analyze_individual_current_set</property>
- <signal name="toggled"
handler="on_radio_encoder_analyze_pre" swapped="no"/>
+ <signal name="toggled"
handler="on_radio_encoder_analyze_individual_current_session" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox437">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkImage"
id="image_encoder_analyze_individual_current_session">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label571">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Current session</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -30689,67 +30709,185 @@ then click this button.</property>
<property name="position">1</property>
</packing>
</child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
<child>
<widget class="GtkRadioButton"
id="radio_encoder_analyze_individual_all_sessions">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Individual / all sessions</property>
- <property name="active">True</property>
<property name="draw_indicator">False</property>
<property
name="group">radio_encoder_analyze_individual_current_set</property>
- <signal name="toggled"
handler="on_radio_encoder_analyze_pre" swapped="no"/>
+ <signal name="toggled"
handler="on_radio_encoder_analyze_individual_all_sessions" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox438">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkImage"
id="image_encoder_analyze_individual_all_sessions">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label572">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">All
sessions </property>
</widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- <child>
- <widget class="GtkRadioButton"
id="radio_encoder_analyze_groupal_current_session">
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label569">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Individual</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkFrame" id="frame25">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0.5</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkRadioButton"
id="radio_encoder_analyze_groupal_current_session">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Groupal / current session</property>
- <property name="active">True</property>
+ <property name="border_width">4</property>
<property name="draw_indicator">False</property>
<property
name="group">radio_encoder_analyze_individual_current_set</property>
- <signal name="toggled"
handler="on_radio_encoder_analyze_pre" swapped="no"/>
+ <signal name="toggled"
handler="on_radio_encoder_analyze_groupal_current_session" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox439">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkImage"
id="image_encoder_analyze_groupal_current_session">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
</widget>
- </child>
- </widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">0</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label574">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Current session</property>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkNotebook"
id="notebook_encoder_analyze_data_options_animate_explanation">
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label573">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="show_tabs">False</property>
- <property name="show_border">False</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Groupal</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </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">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment33">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">6</property>
+ <property name="right_padding">6</property>
+ <child>
+ <widget class="GtkTable"
id="table_encoder_analyze_options">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">8</property>
+ <child>
+ <widget class="GtkLabel" id="label87">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Data:</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox"
id="hbox_encoder_analyze_signal_or_curves">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
<child>
<widget class="GtkHBox" id="hbox173">
<property name="visible">True</property>
@@ -31069,116 +31207,14 @@ then click this button.</property>
</packing>
</child>
</widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label13">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">page
1</property>
- </widget>
- <packing>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label28">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Individual / current set</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">page
2</property>
- </widget>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label185">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Individual / current session</property>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label33">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">page
3</property>
- </widget>
- <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label368">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Individual / all sessions</property>
- </widget>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label104">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">page
4</property>
- </widget>
- <packing>
- <property name="position">3</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label397">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Groupal / current session</property>
- </widget>
<packing>
- <property name="position">4</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label113">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">page
5</property>
- </widget>
- <packing>
- <property name="position">4</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
+ <placeholder/>
</child>
<child>
<widget class="GtkButton"
id="button_encoder_monthly_change_current_session">
@@ -32233,7 +32269,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -32810,7 +32846,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">2</property>
</packing>
</child>
<child>
@@ -35807,6 +35843,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -36238,7 +36277,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">3</property>
</packing>
</child>
</widget>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index bce89589..3be05bee 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -1028,20 +1028,19 @@ public partial class ChronoJumpWindow
notebook_encoder_sup.CurrentPage = 0;
}
- public void on_radio_mode_encoder_analyze_small_toggled (object obj, EventArgs args) {
+ public void on_radio_mode_encoder_analyze_small_toggled (object o, EventArgs args) {
if(radio_mode_encoder_analyze_small.Active)
{
notebook_encoder_sup.CurrentPage = 1;
- //to display the explanation animation
if(radio_encoder_analyze_individual_current_set.Active)
- on_radio_encoder_analyze_pre (radio_encoder_analyze_individual_current_set,
new EventArgs());
+ on_radio_encoder_analyze_individual_current_set (o, args);
else if(radio_encoder_analyze_individual_current_session.Active)
- on_radio_encoder_analyze_pre
(radio_encoder_analyze_individual_current_session, new EventArgs());
+ on_radio_encoder_analyze_individual_current_session (o, args);
else if(radio_encoder_analyze_individual_all_sessions.Active)
- on_radio_encoder_analyze_pre (radio_encoder_analyze_individual_all_sessions,
new EventArgs());
+ on_radio_encoder_analyze_individual_all_sessions (o, args);
else if(radio_encoder_analyze_groupal_current_session.Active)
- on_radio_encoder_analyze_pre (radio_encoder_analyze_groupal_current_session,
new EventArgs());
+ on_radio_encoder_analyze_groupal_current_session (o, args);
}
}
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index c4699e84..e08bf6f1 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -223,7 +223,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_encoder_analyze_table_save;
[Widget] Gtk.Button button_encoder_analyze_1RM_save;
- [Widget] Gtk.Notebook notebook_encoder_analyze_data_options_animate_explanation;
[Widget] Gtk.RadioButton radio_encoder_analyze_individual_current_set;
[Widget] Gtk.RadioButton radio_encoder_analyze_individual_current_session;
[Widget] Gtk.RadioButton radio_encoder_analyze_individual_all_sessions;
@@ -3350,31 +3349,7 @@ public partial class ChronoJumpWindow
}
}
- private void on_radio_encoder_analyze_pre (object obj, EventArgs args)
- {
- if(obj == (object) radio_encoder_analyze_individual_current_set && ((Gtk.RadioButton)
obj).Active)
- {
- notebook_encoder_analyze_data_options_animate_explanation.CurrentPage = 1;
- GLib.Timeout.Add(1000, new
GLib.TimeoutHandler(on_radio_encoder_analyze_individual_current_set));
- }
- else if(obj == (object) radio_encoder_analyze_individual_current_session &&
((Gtk.RadioButton) obj).Active)
- {
- notebook_encoder_analyze_data_options_animate_explanation.CurrentPage = 2;
- GLib.Timeout.Add(1000, new
GLib.TimeoutHandler(on_radio_encoder_analyze_individual_current_session));
- }
- else if(obj == (object) radio_encoder_analyze_individual_all_sessions && ((Gtk.RadioButton)
obj).Active)
- {
- notebook_encoder_analyze_data_options_animate_explanation.CurrentPage = 3;
- GLib.Timeout.Add(1000, new
GLib.TimeoutHandler(on_radio_encoder_analyze_individual_all_sessions));
- }
- else if(obj == (object) radio_encoder_analyze_groupal_current_session && ((Gtk.RadioButton)
obj).Active)
- {
- notebook_encoder_analyze_data_options_animate_explanation.CurrentPage = 4;
- GLib.Timeout.Add(1000, new
GLib.TimeoutHandler(on_radio_encoder_analyze_groupal_current_session));
- }
- }
-
- private bool on_radio_encoder_analyze_individual_current_set ()
+ private void on_radio_encoder_analyze_individual_current_set (object o, EventArgs args)
{
//not called here
//prepareAnalyzeRepetitions();
@@ -3412,12 +3387,9 @@ public partial class ChronoJumpWindow
hbox_encoder_analyze_current_signal.Visible = true;
showEncoderAnalyzeTriggersAndTab();
-
- notebook_encoder_analyze_data_options_animate_explanation.CurrentPage = 0;
- return false; //do not call this again
}
- private bool on_radio_encoder_analyze_individual_current_session ()
+ private void on_radio_encoder_analyze_individual_current_session (object o, EventArgs args)
{
updateEncoderAnalyzeExercisesPre();
prepareAnalyzeRepetitions();
@@ -3467,12 +3439,9 @@ public partial class ChronoJumpWindow
hbox_encoder_analyze_current_signal.Visible = false;
showEncoderAnalyzeTriggerTab(false);
-
- notebook_encoder_analyze_data_options_animate_explanation.CurrentPage = 0;
- return false; //do not call this again
}
- private bool on_radio_encoder_analyze_individual_all_sessions ()
+ private void on_radio_encoder_analyze_individual_all_sessions (object o, EventArgs args)
{
updateEncoderAnalyzeExercisesPre();
prepareAnalyzeRepetitions();
@@ -3504,12 +3473,9 @@ public partial class ChronoJumpWindow
button_encoder_monthly_change_current_session.Visible = false;
showEncoderAnalyzeTriggerTab(false);
-
- notebook_encoder_analyze_data_options_animate_explanation.CurrentPage = 0;
- return false; //do not call this again
}
- private bool on_radio_encoder_analyze_groupal_current_session ()
+ private void on_radio_encoder_analyze_groupal_current_session (object o, EventArgs args)
{
updateEncoderAnalyzeExercisesPre();
prepareAnalyzeRepetitions();
@@ -3540,9 +3506,6 @@ public partial class ChronoJumpWindow
button_encoder_monthly_change_current_session.Visible = false;
showEncoderAnalyzeTriggerTab(false);
-
- notebook_encoder_analyze_data_options_animate_explanation.CurrentPage = 0;
- return false; //do not call this again
}