[chronojump] Overview (encoder/forcesensor/raceanalyzer) on menus
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Overview (encoder/forcesensor/raceanalyzer) on menus
- Date: Fri, 27 Mar 2020 17:36:49 +0000 (UTC)
commit 080e5d79ea137ed9d406e1a8e9591e3e37fd0574
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Mar 27 18:36:17 2020 +0100
Overview (encoder/forcesensor/raceanalyzer) on menus
glade/app1.glade | 131 ++++++++++++++++++++++++++++++++++----------
src/gui/app1/chronojump.cs | 34 +++++++++++-
src/gui/app1/encoder.cs | 7 ---
src/gui/app1/forceSensor.cs | 5 --
src/gui/app1/icons.cs | 2 +
src/gui/app1/menu.cs | 6 ++
src/gui/app1/menu_tiny.cs | 4 ++
src/gui/runEncoder.cs | 5 --
8 files changed, 146 insertions(+), 48 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 23295d0d..0e91979c 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -486,7 +486,6 @@
<property name="can_focus">False</property>
<property name="use_stock">False</property>
<property name="always_show_image">True</property>
- <signal name="activate" handler="on_menuitem_encoder_session_overview_activate"
swapped="no"/>
<child internal-child="image">
<widget class="GtkImage" id="image_menuitem_encoder_session_overview">
<property name="visible">True</property>
@@ -533,7 +532,6 @@
<property name="can_focus">False</property>
<property name="use_stock">False</property>
<property name="always_show_image">True</property>
- <signal name="activate" handler="on_menuitem_forceSensor_session_overview_activate"
swapped="no"/>
<child internal-child="image">
<widget class="GtkImage" id="image_menuitem_forceSensor_session_overview">
<property name="visible">True</property>
@@ -598,7 +596,6 @@
<property name="can_focus">False</property>
<property name="use_stock">False</property>
<property name="always_show_image">True</property>
- <signal name="activate" handler="on_menuitem_runEncoder_session_overview_activate"
swapped="no"/>
<child internal-child="image">
<widget class="GtkImage" id="image_menuitem_runEncoder_session_overview">
<property name="visible">True</property>
@@ -948,6 +945,36 @@
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <widget class="GtkButton"
id="button_menu_session_overview1">
+ <property name="sensitive">False</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">Overview of
this session</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_menu_session_overview_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_button_menu_session_overview1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage"
id="image_session_overview1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-open</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -1674,6 +1701,60 @@
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <widget class="GtkButton"
id="button_menu_session_overview">
+ <property name="sensitive">False</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">Overview of this session</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_menu_session_overview_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_button_menu_session_overview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox363">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_session_overview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-open</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="label_session_overview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Overview</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -1903,20 +1984,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <widget class="GtkButton"
id="button_menu_encoder_session_overview">
- <property name="label"
translatable="yes">Session 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>
@@ -24881,6 +24948,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -27202,6 +27272,18 @@ 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>
@@ -27238,18 +27320,6 @@ 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>
@@ -34764,6 +34834,9 @@ then click this button.</property>
<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 340c72e1..4a80da98 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -212,7 +212,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.MenuItem menuitem_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;
@@ -2581,6 +2580,21 @@ public partial class ChronoJumpWindow
}
}
+ private void on_button_menu_session_overview_clicked (object o, EventArgs args)
+ {
+ if (currentSession == null)
+ return;
+
+ Constants.Menuitem_modes m = current_menuitem_mode;
+
+ if(m == Constants.Menuitem_modes.POWERGRAVITATORY || m ==
Constants.Menuitem_modes.POWERINERTIAL)
+ EncoderOverviewWindow.Show (app1, currentEncoderGI, currentSession.UniqueID);
+ else if(m == Constants.Menuitem_modes.FORCESENSOR)
+ ForceSensorOverviewWindow.Show (app1, currentSession.UniqueID);
+ else if(m == Constants.Menuitem_modes.RUNSENCODER)
+ RunEncoderOverviewWindow.Show (app1, currentSession.UniqueID);
+ }
+
private void on_export_session_activate(object o, EventArgs args) {
ConfirmWindow confirmWin = ConfirmWindow.Show(
Catalog.GetString("Export will include this data:") +
@@ -3142,7 +3156,11 @@ public partial class ChronoJumpWindow
{
notebook_start_selector.CurrentPage = 0;
notebook_sup.CurrentPage = 0;
+
+ //changes in menus
//vbox_menu_encoder.Visible = false;
+ button_menu_session_overview.Visible = false;
+ button_menu_session_overview1.Visible = false;
//show title
string tempSessionName = "";
@@ -3224,6 +3242,8 @@ public partial class ChronoJumpWindow
vbox_contacts_load_recalculate.Visible = false;
vbox_contacts_signal_comment.Visible = false;
frame_jumps_automatic.Visible = false;
+ button_menu_session_overview.Visible = false;
+ button_menu_session_overview1.Visible = false;
//on OSX R is not installed by default. Check if it's installed. Needed for encoder and force
sensor
if(
@@ -3325,6 +3345,8 @@ public partial class ChronoJumpWindow
encoderButtonsSensitive(encoderSensEnum.YESPERSON);
blankEncoderInterface();
+ button_menu_session_overview.Visible = true;
+ button_menu_session_overview1.Visible = true;
bool changed = false;
if(m == Constants.Menuitem_modes.POWERGRAVITATORY)
@@ -3429,6 +3451,9 @@ public partial class ChronoJumpWindow
notebook_capture_graph_table.CurrentPage = 1; //"Show table"
notebook_capture_graph_table.ShowTabs = false;
setLabelContactsExerciseSelected(m);
+
+ button_menu_session_overview.Visible = true;
+ button_menu_session_overview1.Visible = true;
}
else if(m == Constants.Menuitem_modes.RUNSENCODER)
{
@@ -3454,6 +3479,9 @@ public partial class ChronoJumpWindow
combo_race_analyzer_device.Active = 0;
forceSensorImageTestChange();
setLabelContactsExerciseSelected(m);
+
+ button_menu_session_overview.Visible = true;
+ button_menu_session_overview1.Visible = true;
}
else if(m == Constants.Menuitem_modes.RT)
{
@@ -7326,10 +7354,12 @@ LogB.Debug("mc finished 5");
//menuitem_delete_session.Sensitive = option;
button_menu_session_edit.Sensitive = option; //menu
button_menu_session_edit1.Sensitive = option; //menu_tiny
+ button_menu_session_overview.Sensitive = option; //menu
+ button_menu_session_overview1.Sensitive = option; //menu_tiny
+
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;
}
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index 168751fd..f36e580a 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -1954,13 +1954,6 @@ public partial class ChronoJumpWindow
checkFile(Constants.CheckFileOp.ENCODER_CAPTURE_EXPORT_ALL);
}
- // encoder session overview
-
- void on_menuitem_encoder_session_overview_activate (object o, EventArgs args)
- {
- EncoderOverviewWindow.Show (app1, currentEncoderGI, currentSession.UniqueID);
- }
-
void on_button_encoder_export_all_curves_file_selected (string selectedFileName)
{
string analysisOptions = getEncoderAnalysisOptions();
diff --git a/src/gui/app1/forceSensor.cs b/src/gui/app1/forceSensor.cs
index de981381..83334505 100644
--- a/src/gui/app1/forceSensor.cs
+++ b/src/gui/app1/forceSensor.cs
@@ -2241,11 +2241,6 @@ LogB.Information(" fs R ");
new DialogMessage(Constants.MessageTypes.WARNING, Constants.DirectoryCannotOpenStr());
}
- void on_menuitem_forceSensor_session_overview_activate (object o, EventArgs args)
- {
- ForceSensorOverviewWindow.Show (app1, currentSession.UniqueID);
- }
-
private void on_button_force_sensor_adjust_clicked (object o, EventArgs args)
{
button_force_sensor_adjust.Sensitive = false; //to not be called again
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index 2d770869..129795ee 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -693,6 +693,8 @@ public partial class ChronoJumpWindow
image_menuitem_encoder_session_overview.Pixbuf = pixbuf;
image_menuitem_forceSensor_session_overview.Pixbuf = pixbuf;
image_menuitem_runEncoder_session_overview.Pixbuf = pixbuf;
+ image_session_overview.Pixbuf = pixbuf;
+ image_session_overview1.Pixbuf = pixbuf;
//encoder
UtilGtk.ColorsRadio(viewport_chronopics, radiobutton_encoder_analyze_powerbars);
diff --git a/src/gui/app1/menu.cs b/src/gui/app1/menu.cs
index 7dea8c8c..4793f8f6 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -51,6 +51,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.EventBox eventbox_button_menu_session_new;
[Widget] Gtk.EventBox eventbox_button_menu_session_load;
[Widget] Gtk.EventBox eventbox_button_menu_session_edit;
+ [Widget] Gtk.EventBox eventbox_button_menu_session_overview;
[Widget] Gtk.EventBox eventbox_button_menu_preferences;
// [Widget] Gtk.EventBox eventbox_check_menu_encoder;
[Widget] Gtk.EventBox eventbox_check_menu_help;
@@ -69,6 +70,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_menu_session_new;
[Widget] Gtk.Button button_menu_session_load;
[Widget] Gtk.Button button_menu_session_edit;
+ [Widget] Gtk.Button button_menu_session_overview;
[Widget] Gtk.Button button_menu_preferences;
[Widget] Gtk.Button button_menu_help_documents;
[Widget] Gtk.Button button_menu_help_accelerators;
@@ -81,6 +83,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_session_new3;
[Widget] Gtk.Image image_session_load2;
[Widget] Gtk.Image image_session_edit2;
+ [Widget] Gtk.Image image_session_overview;
[Widget] Gtk.Image image_button_show_modes;
[Widget] Gtk.Image image_menu_preferences;
[Widget] Gtk.Image image_menu_help;
@@ -133,6 +136,7 @@ public partial class ChronoJumpWindow
l.Add(button_menu_session_new);
l.Add(button_menu_session_load);
l.Add(button_menu_session_edit);
+ l.Add(button_menu_session_overview);
l.Add(button_menu_help_documents);
l.Add(button_menu_help_accelerators);
l.Add(button_menu_help_about);
@@ -169,6 +173,7 @@ public partial class ChronoJumpWindow
image_session_new3.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
image_session_load2.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
image_session_edit2.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
+ image_session_overview.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
image_button_show_modes.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
image_menu_preferences.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
image_menu_help.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
@@ -206,6 +211,7 @@ public partial class ChronoJumpWindow
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_new,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_load,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_edit,
UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_overview,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_documents,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_accelerators,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_about, UtilGtk.YELLOW_LIGHT);
diff --git a/src/gui/app1/menu_tiny.cs b/src/gui/app1/menu_tiny.cs
index 85d6f71c..7b080cc8 100644
--- a/src/gui/app1/menu_tiny.cs
+++ b/src/gui/app1/menu_tiny.cs
@@ -37,6 +37,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.EventBox eventbox_button_menu_session_new1;
[Widget] Gtk.EventBox eventbox_button_menu_session_load1;
[Widget] Gtk.EventBox eventbox_button_menu_session_edit1;
+ [Widget] Gtk.EventBox eventbox_button_menu_session_overview1;
[Widget] Gtk.EventBox eventbox_button_menu_preferences1;
[Widget] Gtk.EventBox eventbox_check_menu_help1;
[Widget] Gtk.EventBox eventbox_button_menu_help_documents1;
@@ -49,11 +50,13 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Alignment alignment_menu_person_options1;
[Widget] Gtk.Alignment alignment_menu_help_options1;
[Widget] Gtk.Button button_menu_session_edit1;
+ [Widget] Gtk.Button button_menu_session_overview1;
[Widget] Gtk.Image image_menu_folders1;
[Widget] Gtk.Image image_session_new1;
[Widget] Gtk.Image image_session_load1;
[Widget] Gtk.Image image_session_edit1;
+ [Widget] Gtk.Image image_session_overview1;
[Widget] Gtk.Image image_button_show_modes1;
[Widget] Gtk.Image image_menu_preferences1;
[Widget] Gtk.Image image_menu_help1;
@@ -88,6 +91,7 @@ public partial class ChronoJumpWindow
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_new1,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_load1,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_edit1,
UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_overview1,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_documents1,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_accelerators1,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_about1,
UtilGtk.YELLOW_LIGHT);
diff --git a/src/gui/runEncoder.cs b/src/gui/runEncoder.cs
index e8a57808..e619cb7f 100644
--- a/src/gui/runEncoder.cs
+++ b/src/gui/runEncoder.cs
@@ -1259,11 +1259,6 @@ LogB.Information(" re R ");
new DialogMessage(Constants.MessageTypes.WARNING, Constants.DirectoryCannotOpenStr());
}
- void on_menuitem_runEncoder_session_overview_activate (object o, EventArgs args)
- {
- RunEncoderOverviewWindow.Show (app1, currentSession.UniqueID);
- }
-
// -------------------------------- exercise stuff --------------------
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
