commit 1b566d81c9cd46eb3a56374309a6e8d25fc3b678
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Mar 20 18:36:22 2020 +0100
Added encoder to new menu
glade/app1.glade | 300 +++++++++++++++++++++++++++++++++------------
src/gui/app1/chronojump.cs | 17 ++-
src/gui/app1/encoder.cs | 8 +-
src/gui/app1/menu.cs | 52 +++++---
4 files changed, 273 insertions(+), 104 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 58f4ebbf..d8d4f0f6 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -761,7 +761,7 @@
<property name="can_focus">False</property>
<property name="bottom_padding">2</property>
<property name="left_padding">4</property>
- <property name="right_padding">4</property>
+ <property name="right_padding">2</property>
<child>
<widget class="GtkViewport" id="viewport_menu_top">
<property name="width_request">200</property>
@@ -773,54 +773,68 @@
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkHBox" id="hbox365">
+ <widget class="GtkAlignment" id="alignment29">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">2</property>
- <property name="spacing">10</property>
+ <property name="top_padding">3</property>
+ <property name="bottom_padding">4</property>
+ <property name="left_padding">3</property>
+ <property name="right_padding">2</property>
<child>
- <widget class="GtkButton" id="button_show_menu">
+ <widget class="GtkHBox" id="hbox365">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_button_show_menu_clicked"
swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkHBox" id="hbox367">
+ <widget class="GtkButton" id="button_show_menu">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkLabel" id="label_button_show_menu">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Menu</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_show_menu_clicked" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox368">
+ <widget class="GtkHBox" id="hbox367">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkArrow"
id="arrow_menu_show_menu_up">
+ <widget class="GtkLabel"
id="label_button_show_menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="arrow_type">up</property>
+ <property name="label"
translatable="yes">Menu</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkArrow"
id="arrow_menu_show_menu_down">
+ <widget class="GtkHBox" id="hbox368">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkArrow"
id="arrow_menu_show_menu_up">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="arrow_type">up</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkArrow"
id="arrow_menu_show_menu_down">
<property name="can_focus">False</property>
<property name="arrow_type">down</property>
+ </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>
@@ -829,65 +843,60 @@
</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>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_modes">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_button_modes_clicked"
swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox366">
+ <widget class="GtkButton" id="button_modes">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkLabel" id="label460">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Mode</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_button_modes_clicked"
swapped="no"/>
<child>
- <widget class="GtkArrow" id="arrow_down5">
+ <widget class="GtkHBox" id="hbox366">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label460">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Mode</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkArrow" id="arrow_down5">
+ <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>
</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="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
</child>
</widget>
<packing>
@@ -1554,6 +1563,131 @@
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <widget class="GtkVBox" id="vbox_menu_encoder">
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkCheckButton"
id="check_menu_encoder">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="draw_indicator">False</property>
+ <signal name="clicked"
handler="on_check_menu_encoder_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox93">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label22">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Encoder</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox159">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkArrow"
id="arrow_menu_show_encoder_up">
+ <property name="can_focus">False</property>
+ <property name="arrow_type">up</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkArrow"
id="arrow_menu_show_encoder_down">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="arrow_type">down</property>
+ </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">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment"
id="alignment_menu_encoder_options">
+ <property name="can_focus">False</property>
+ <property name="top_padding">8</property>
+ <property name="left_padding">16</property>
+ <child>
+ <widget class="GtkVBox" id="vbox56">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkButton"
id="button_menu_encoder_export_set">
+ <property name="label" translatable="yes">Export
current set</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip"
translatable="yes">Export set to CSV (Spreadsheet)</property>
+ <signal name="clicked"
handler="on_button_encoder_export_all_curves_clicked" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_menu_encoder_session_overview">
+ <property name="label"
translatable="yes">Sesssion overview</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_menuitem_encoder_session_overview_activate" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</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>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
<child>
<widget class="GtkVBox" id="vbox187">
<property name="visible">True</property>
@@ -1690,7 +1824,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -1705,7 +1839,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
</widget>
@@ -24139,6 +24273,12 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -33904,6 +34044,12 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index e91096a6..df2a90f5 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -45,7 +45,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.MenuItem menuitem_open_session;
[Widget] Gtk.MenuItem menuitem_mode;
- [Widget] Gtk.MenuItem encoder_menuitem;
+ //[Widget] Gtk.MenuItem encoder_menuitem;
+ [Widget] Gtk.VBox vbox_menu_encoder;
[Widget] Gtk.MenuItem force_sensor_menuitem;
[Widget] Gtk.MenuItem race_encoder_menuitem;
@@ -207,6 +208,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_delete_session;
[Widget] Gtk.MenuItem menuitem_export_csv;
[Widget] Gtk.MenuItem menuitem_encoder_session_overview;
+ [Widget] Gtk.Button button_menu_encoder_session_overview;
[Widget] Gtk.MenuItem menuitem_forceSensor_session_overview;
[Widget] Gtk.MenuItem menuitem_runEncoder_session_overview;
[Widget] Gtk.Image image_session_open;
@@ -3128,7 +3130,8 @@ public partial class ChronoJumpWindow
frame_run_simple_double_contacts.Visible = false;
//default for everything except encoder
- encoder_menuitem.Visible = false;
+ //encoder_menuitem.Visible = false;
+ vbox_menu_encoder.Visible = false;
menuitem_export_csv.Visible = true;
hbox_other.Visible = false;
@@ -3253,7 +3256,8 @@ public partial class ChronoJumpWindow
}
else if(m == Constants.Menuitem_modes.POWERGRAVITATORY || m ==
Constants.Menuitem_modes.POWERINERTIAL)
{
- encoder_menuitem.Visible = true;
+ //encoder_menuitem.Visible = true;
+ vbox_menu_encoder.Visible = true;
menuitem_export_csv.Visible = false;
notebook_sup.CurrentPage = 2;
@@ -7270,6 +7274,7 @@ LogB.Debug("mc finished 5");
menuitem_export_csv.Sensitive = option;
//menuitem_export_xml.Sensitive = option; not implemented yet
menuitem_encoder_session_overview.Sensitive = option;
+ button_menu_encoder_session_overview.Sensitive = option;
menuitem_forceSensor_session_overview.Sensitive = option;
menuitem_runEncoder_session_overview.Sensitive = option;
}
@@ -7415,7 +7420,8 @@ LogB.Debug("mc finished 5");
{
session_menuitem.Sensitive = false;
menuitem_mode.Sensitive = false;
- encoder_menuitem.Sensitive = false;
+ //encoder_menuitem.Sensitive = false;
+ vbox_menu_encoder.Sensitive = false;
force_sensor_menuitem.Sensitive = false;
race_encoder_menuitem.Sensitive = false;
hbox_menu_and_preferences_outside_menu_contacts.Sensitive = false;
@@ -7487,7 +7493,8 @@ LogB.Debug("mc finished 5");
session_menuitem.Sensitive = true;
menuitem_mode.Sensitive = true;
- encoder_menuitem.Sensitive = true;
+ //encoder_menuitem.Sensitive = true;
+ vbox_menu_encoder.Sensitive = true;
force_sensor_menuitem.Sensitive = true;
race_encoder_menuitem.Sensitive = true;
hbox_menu_and_preferences_outside_menu_contacts.Sensitive = true;
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index 0f56bfea..d3b0f258 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -109,7 +109,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Notebook notebook_encoder_signal_comment_rhythm_and_triggers;
[Widget] Gtk.TextView textview_encoder_signal_comment;
[Widget] Gtk.Button button_encoder_signal_save_comment;
- [Widget] Gtk.MenuItem menuitem_export_encoder_signal;
+ //[Widget] Gtk.MenuItem menuitem_export_encoder_signal;
+ [Widget] Gtk.Button button_menu_encoder_export_set;
[Widget] Gtk.Button button_encoder_delete_signal;
[Widget] Gtk.VPaned vpaned_encoder_main;
@@ -5043,7 +5044,7 @@ public partial class ChronoJumpWindow
// hbox_encoder_configuration, frame_encoder_capture_options
//c1 button_encoder_recalculate
//c2 button_encoder_load_signal
- //c3 hbox_encoder_capture_curves_save_all_none, menuitem_export_encoder_signal
+ //c3 hbox_encoder_capture_curves_save_all_none, menuitem_export_encoder_signal,
button_menu_encoder_export_set
// button_encoder_delete_signal, vbox_encoder_signal_comment,
// and images: image_encoder_capture , image_encoder_analyze.Sensitive. Update: both NOT
managed here
//UNUSED c4 button_encoder_save_curve, entry_encoder_curve_comment
@@ -5104,7 +5105,8 @@ public partial class ChronoJumpWindow
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]);
+ //menuitem_export_encoder_signal.Sensitive = Util.IntToBool(table[3]);
+ button_menu_encoder_export_set.Sensitive = Util.IntToBool(table[3]);
button_encoder_delete_signal.Sensitive = Util.IntToBool(table[3]);
vbox_encoder_signal_comment.Sensitive = Util.IntToBool(table[3]);
//image_encoder_capture.Sensitive = Util.IntToBool(table[3]);
diff --git a/src/gui/app1/menu.cs b/src/gui/app1/menu.cs
index 5f3e6513..56331c1c 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -34,6 +34,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Arrow arrow_menu_show_menu_down;
[Widget] Gtk.Arrow arrow_menu_show_session_up;
[Widget] Gtk.Arrow arrow_menu_show_session_down;
+ [Widget] Gtk.Arrow arrow_menu_show_encoder_up;
+ [Widget] Gtk.Arrow arrow_menu_show_encoder_down;
[Widget] Gtk.Arrow arrow_menu_show_help_up;
[Widget] Gtk.Arrow arrow_menu_show_help_down;
[Widget] Gtk.Button button_modes;
@@ -44,9 +46,11 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Viewport viewport_menu;
[Widget] Gtk.Viewport viewport_persons;
[Widget] Gtk.CheckButton check_menu_session;
+ [Widget] Gtk.CheckButton check_menu_encoder;
[Widget] Gtk.CheckButton check_menu_help;
[Widget] Gtk.Alignment alignment_menu_session_options;
[Widget] Gtk.Alignment alignment_menu_person_options;
+ [Widget] Gtk.Alignment alignment_menu_encoder_options;
[Widget] Gtk.Alignment alignment_menu_help_options;
[Widget] Gtk.Image image_persons_new_2;
[Widget] Gtk.Image image_persons_new_plus_2;
@@ -69,6 +73,12 @@ public partial class ChronoJumpWindow
//UtilGtk.ViewportColor(viewport_persons, UtilGtk.BLUE_CLEAR2);
}
+ private void menuShowVerticalArrow (bool selected, Gtk.Arrow a_up, Gtk.Arrow a_down)
+ {
+ a_up.Visible = selected;
+ a_down.Visible = ! selected;
+ }
+
private void on_button_show_menu_clicked (object o, EventArgs args)
{
if(! viewport_menu.Visible)
@@ -77,50 +87,54 @@ public partial class ChronoJumpWindow
check_menu_session.Active = false;
if(check_menu_help.Active)
check_menu_help.Active = false;
+ if(check_menu_encoder.Active)
+ check_menu_encoder.Active = false;
}
viewport_menu.Visible = ! viewport_menu.Visible;
- if(viewport_menu.Visible) {
+ menuShowVerticalArrow (viewport_menu.Visible, arrow_menu_show_menu_up,
arrow_menu_show_menu_down);
+
+ if(viewport_menu.Visible)
viewport_persons.Visible = false;
- arrow_menu_show_menu_up.Visible = true;
- arrow_menu_show_menu_down.Visible = false;
- } else {
+ else
viewport_persons.Visible = (currentSession != null);
- arrow_menu_show_menu_up.Visible = false;
- arrow_menu_show_menu_down.Visible = true;
- }
//hpaned_contacts_main.Show();
}
private void on_check_menu_session_clicked (object o, EventArgs args)
{
+ menuShowVerticalArrow (check_menu_session.Active, arrow_menu_show_session_up,
arrow_menu_show_session_down);
if(check_menu_session.Active)
{
+ check_menu_encoder.Active = false;
check_menu_help.Active = false;
alignment_menu_session_options.Visible = true;
alignment_menu_session_options.Show();
- arrow_menu_show_session_up.Visible = true;
- arrow_menu_show_session_down.Visible = false;
- } else {
+ } else
alignment_menu_session_options.Visible = false;
- arrow_menu_show_session_up.Visible = false;
- arrow_menu_show_session_down.Visible = true;
- }
}
+ private void on_check_menu_encoder_clicked (object o, EventArgs args)
+ {
+ menuShowVerticalArrow (check_menu_encoder.Active, arrow_menu_show_encoder_up,
arrow_menu_show_encoder_down);
+ if(check_menu_encoder.Active)
+ {
+ check_menu_session.Active = false;
+ check_menu_help.Active = false;
+ alignment_menu_encoder_options.Visible = true;
+ } else
+ alignment_menu_encoder_options.Visible = false;
+ }
private void on_check_menu_help_clicked (object o, EventArgs args)
{
+ menuShowVerticalArrow (check_menu_help.Active, arrow_menu_show_help_up,
arrow_menu_show_help_down);
if(check_menu_help.Active)
{
+ check_menu_encoder.Active = false;
check_menu_session.Active = false;
alignment_menu_help_options.Visible = true;
- arrow_menu_show_help_up.Visible = true;
- arrow_menu_show_help_down.Visible = false;
- } else {
+ } else
alignment_menu_help_options.Visible = false;
- arrow_menu_show_help_up.Visible = false;
- arrow_menu_show_help_down.Visible = true;
- }
}
private void on_button_modes_clicked (object o, EventArgs args)