[chronojump] removed old main_menu/session and old the main_menu
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] removed old main_menu/session and old the main_menu
- Date: Tue, 12 May 2020 10:20:59 +0000 (UTC)
commit ade84c7a878188ed6b4613148cab8810347b6dc4
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue May 12 12:20:10 2020 +0200
removed old main_menu/session and old the main_menu
glade/app1.glade | 174 +------------------------------------
src/gui/app1/chronojump.cs | 40 +--------
src/gui/app1/contactsExercise.cs | 2 -
src/gui/app1/encoder.cs | 2 -
src/gui/app1/forceSensor.cs | 2 -
src/gui/app1/forceSensorAnalyze.cs | 1 -
src/gui/app1/icons.cs | 12 ---
src/gui/app1/runEncoder.cs | 1 -
src/gui/exhibition.cs | 1 -
src/gui/networks.cs | 2 -
src/gui/presentation.cs | 1 -
11 files changed, 3 insertions(+), 235 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 2690c7a2..8f2bca8c 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -12,178 +12,6 @@
<widget class="GtkVBox" id="vbox69">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <widget class="GtkMenuBar" id="main_menu">
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkMenuItem" id="session_menuitem">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Session</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="session_menu">
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem_new_session">
- <property name="label" translatable="yes">New session</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_stock">False</property>
- <property name="always_show_image">True</property>
- <signal name="activate" handler="on_new_activate" swapped="no"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image_session_new2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem_open_session">
- <property name="label" translatable="yes">_Load</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <property name="always_show_image">True</property>
- <signal name="activate" handler="on_open_activate" swapped="no"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image_session_open">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem_edit_session">
- <property name="label" translatable="yes">_Edit</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <property name="always_show_image">True</property>
- <signal name="activate" handler="on_edit_session_activate" swapped="no"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image_session_edit">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separador4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem_import_chronojump_session">
- <property name="label" translatable="yes">Import session from another Chronojump
database</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_stock">False</property>
- <property name="always_show_image">True</property>
- <signal name="activate" handler="on_button_import_chronojump_session" swapped="no"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image_import_database">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem_export_csv">
- <property name="label" translatable="yes">Export session to _CSV
(Spreadsheet)</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip" translatable="yes">Useful to export to a Spreadsheet like
MS Excel, LibreOffice or Google Spreadsheets</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <property name="always_show_image">True</property>
- <child internal-child="image">
- <widget class="GtkImage" id="image_export_csv">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="menuitem_export_xml">
- <property name="sensitive">False</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Export session to _XML</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separador6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem_preferences">
- <property name="label" translatable="yes">Preferences</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_stock">False</property>
- <property name="always_show_image">True</property>
- <signal name="activate" handler="on_preferences_activate" swapped="no"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image_session_preferences">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="sepearador7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="quit1">
- <property name="label">Quit</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_stock">False</property>
- <property name="always_show_image">True</property>
- <signal name="activate" handler="on_quit1_activate" swapped="no"/>
- <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image_quit_from_app1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
<widget class="GtkNotebook" id="notebook_start">
<property name="visible">True</property>
@@ -40000,7 +39828,7 @@ then click this button.</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 4c0d0691..5795f7a6 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -41,10 +41,6 @@ using System.Diagnostics;
public partial class ChronoJumpWindow
{
[Widget] Gtk.Window app1;
- [Widget] Gtk.MenuBar main_menu;
- [Widget] Gtk.MenuItem menuitem_open_session;
-
- //[Widget] Gtk.VBox vbox_menu_encoder;
[Widget] Gtk.HBox hbox_gui_tests;
[Widget] Gtk.SpinButton spin_gui_tests;
@@ -114,8 +110,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_persons_open_1;
[Widget] Gtk.Image image_persons_open_plus;
- [Widget] Gtk.Image image_import_database;
- [Widget] Gtk.Image image_export_csv;
[Widget] Gtk.Image image_export_encoder_signal;
//contact tests execute buttons
@@ -188,17 +182,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.ComboBox combo_result_jumps_rj;
[Widget] Gtk.ComboBox combo_result_runs;
[Widget] Gtk.ComboBox combo_result_runs_interval;
-
[Widget] Gtk.ComboBox combo_pulses;
- //menus
- [Widget] Gtk.MenuItem session_menuitem;
-
- //menu session
- [Widget] Gtk.MenuItem menuitem_edit_session;
- [Widget] Gtk.MenuItem menuitem_export_csv;
- [Widget] Gtk.Image image_session_open;
-
//menu person
[Widget] Gtk.Button button_persons_up;
[Widget] Gtk.Button button_persons_down;
@@ -2808,10 +2793,6 @@ public partial class ChronoJumpWindow
//run simple will be the only one with its drawing are
frame_run_simple_double_contacts.Visible = false;
- //default for everything except encoder
- //vbox_menu_encoder.Visible = false;
- menuitem_export_csv.Visible = true;
-
hbox_other.Visible = false;
sensitiveLastTestButtons(false);
@@ -2941,9 +2922,6 @@ public partial class ChronoJumpWindow
}
else if(m == Constants.Menuitem_modes.POWERGRAVITATORY || m ==
Constants.Menuitem_modes.POWERINERTIAL)
{
- //vbox_menu_encoder.Visible = true;
- menuitem_export_csv.Visible = false;
-
notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.ENCODER);
@@ -3165,12 +3143,6 @@ public partial class ChronoJumpWindow
menu_and_menu_tiny_show_modes();
- //make main_menu visible because it's not visible at startup.
- //but don't show if session == UNIQUE
- //if(configChronojump.SessionMode == Config.SessionModeEnum.STANDARD)
- // main_menu.Visible = true;
- //TODO: show preferences and exit button also on contacts
-
if(m != Constants.Menuitem_modes.POWERGRAVITATORY && m !=
Constants.Menuitem_modes.POWERINERTIAL)
{
//don't change threshold if changing from jumpssimple to jumpsreactive ...
@@ -3233,8 +3205,6 @@ public partial class ChronoJumpWindow
ChronopicDetect cpDetect;
private void autoDetectChronopic(Constants.Menuitem_modes m)
{
- main_menu.Sensitive = false;
-
if(m == Constants.Menuitem_modes.POWERGRAVITATORY || m ==
Constants.Menuitem_modes.POWERINERTIAL)
{
hbox_chronopic_encoder_detecting.Visible = true;
@@ -3255,7 +3225,6 @@ public partial class ChronoJumpWindow
else {
//disabled on Windows until is fixed //TODO
if(UtilAll.IsWindows()) {
- main_menu.Sensitive = true;
return;
}
@@ -3333,7 +3302,7 @@ public partial class ChronoJumpWindow
}
private void on_autoDetectChronopic_all_done()
{
- main_menu.Sensitive = true;
+ //main_menu.Sensitive = true;
}
*/
@@ -6944,7 +6913,6 @@ LogB.Debug("mc finished 5");
button_session_edit.Sensitive = option;
button_session_delete.Sensitive = option;
- menuitem_export_csv.Sensitive = option;
button_session_export.Sensitive = option;
}
@@ -7090,8 +7058,6 @@ LogB.Debug("mc finished 5");
private void sensitiveGuiEventDoing (bool cont)
{
menus_sensitive(false);
- session_menuitem.Sensitive = false;
- //vbox_menu_encoder.Sensitive = false;
//jumpsProfile has Sqlite calls. Don't do them while jumping
//but don't unsensitive the notebook because user need to "finish" or cancel"
@@ -7151,8 +7117,6 @@ LogB.Debug("mc finished 5");
LogB.Information(" sensitiveGuiEventDone start ");
menus_sensitive(true);
- session_menuitem.Sensitive = true;
- //vbox_menu_encoder.Sensitive = true;
//jumpsProfile has Sqlite calls. Don't do them while jumping
//but don't unsensitive the notebook because user need to "finish" or cancel"
@@ -7325,7 +7289,7 @@ LogB.Debug("mc finished 5");
//start/end auto mode
private void sensitiveGuiAutoStartEnd (bool start) {
//if automode, sensitiveGuiEventDoing, sensitiveGuiEventDone don't work
- session_menuitem.Sensitive = ! start;
+ menus_sensitive (! start);
frame_persons.Sensitive = ! start;
button_contacts_exercise.Sensitive = ! start;
diff --git a/src/gui/app1/contactsExercise.cs b/src/gui/app1/contactsExercise.cs
index 6307e485..e223a6f5 100644
--- a/src/gui/app1/contactsExercise.cs
+++ b/src/gui/app1/contactsExercise.cs
@@ -32,7 +32,6 @@ public partial class ChronoJumpWindow
notebook_contacts_capture_doing_wait.Sensitive = false;
vbox_contacts_device_adjust_threshold.Sensitive = false;
viewport_persons.Sensitive = false;
- main_menu.Sensitive = false;
button_contacts_exercise.Sensitive = false;
hbox_contacts_sup_capture_analyze_two_buttons.Sensitive = false;
hbox_top_person.Sensitive = false;
@@ -46,7 +45,6 @@ public partial class ChronoJumpWindow
notebook_contacts_capture_doing_wait.Sensitive = true;
vbox_contacts_device_adjust_threshold.Sensitive = true;
viewport_persons.Sensitive = true;
- main_menu.Sensitive = true;
button_contacts_exercise.Sensitive = true;
hbox_contacts_sup_capture_analyze_two_buttons.Sensitive = true;
hbox_top_person.Sensitive = true;
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index 02711263..8a278bc1 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -3733,7 +3733,6 @@ public partial class ChronoJumpWindow
frame_encoder_analyze_options.Visible = ! s;
table_encoder_analyze_options.Sensitive = s;
- main_menu.Sensitive = s;
viewport_persons.Sensitive = s;
menus_sensitive(s);
hbox_encoder_sup_capture_analyze_two_buttons.Sensitive = s;
@@ -4682,7 +4681,6 @@ public partial class ChronoJumpWindow
}
menus_sensitive(! show);
- main_menu.Sensitive = ! show;
hbox_encoder_sup_capture_analyze.Sensitive = ! show;
viewport_persons.Sensitive = ! show;
hbox_encoder_configuration.Sensitive = ! show;
diff --git a/src/gui/app1/forceSensor.cs b/src/gui/app1/forceSensor.cs
index af633fc2..ddc20be1 100644
--- a/src/gui/app1/forceSensor.cs
+++ b/src/gui/app1/forceSensor.cs
@@ -417,7 +417,6 @@ public partial class ChronoJumpWindow
hbox_contacts_camera.Sensitive = sensitive;
//other gui buttons
- main_menu.Sensitive = sensitive;
hbox_contacts_sup_capture_analyze_two_buttons.Sensitive = sensitive;
frame_persons.Sensitive = sensitive;
viewport_persons.Sensitive = sensitive;
@@ -2297,7 +2296,6 @@ LogB.Information(" fs R ");
button_execute_test.Sensitive = s;
button_force_sensor_image_save_signal.Sensitive = s;
- main_menu.Sensitive = s;
viewport_persons.Sensitive = s;
menus_sensitive(s);
diff --git a/src/gui/app1/forceSensorAnalyze.cs b/src/gui/app1/forceSensorAnalyze.cs
index cc5d4cdc..985e2577 100644
--- a/src/gui/app1/forceSensorAnalyze.cs
+++ b/src/gui/app1/forceSensorAnalyze.cs
@@ -152,7 +152,6 @@ public partial class ChronoJumpWindow
button_force_sensor_analyze_analyze.Sensitive = false;
}
- main_menu.Sensitive = s;
viewport_persons.Sensitive = s;
menus_sensitive(s);
hbox_contacts_sup_capture_analyze_two_buttons.Sensitive = s;
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index e8ac92b4..f9200f4b 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -33,11 +33,7 @@ public partial class ChronoJumpWindow
//[Widget] Gtk.Image image_home1;
[Widget] Gtk.Image image_minimize;
//[Widget] Gtk.Image image_minimize1;
- [Widget] Gtk.Image image_quit_from_app1;
- [Widget] Gtk.Image image_session_new2;
- [Widget] Gtk.Image image_session_edit;
[Widget] Gtk.Image image_session_delete;
- [Widget] Gtk.Image image_session_preferences;
[Widget] Gtk.Image image_mode_encoder_capture;
[Widget] Gtk.Image image_current_person_zoom;
[Widget] Gtk.Image image_current_person_zoom_h;
@@ -240,7 +236,6 @@ public partial class ChronoJumpWindow
*/
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_settings.png");
- image_session_preferences.Pixbuf = pixbuf;
image_menu_preferences.Pixbuf = pixbuf;
image_menu_preferences1.Pixbuf = pixbuf;
@@ -249,7 +244,6 @@ public partial class ChronoJumpWindow
//image_minimize1.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_quit.png");
- image_quit_from_app1.Pixbuf = pixbuf;
image_menu_quit.Pixbuf = pixbuf;
image_menu_quit1.Pixbuf = pixbuf;
@@ -390,11 +384,9 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "folder_new.png");
image_session_new1.Pixbuf = pixbuf;
- image_session_new2.Pixbuf = pixbuf;
image_session_new3.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "folder_open.png");
- image_session_open.Pixbuf = pixbuf;
image_session_load1.Pixbuf = pixbuf;
image_session_load2.Pixbuf = pixbuf;
image_session_load3_blue.Pixbuf = pixbuf;
@@ -421,7 +413,6 @@ public partial class ChronoJumpWindow
image_run_encoder_exercise_edit.Pixbuf = pixbuf;
image_edit_current_person.Pixbuf = pixbuf;
image_edit_current_person_h.Pixbuf = pixbuf;
- image_session_edit.Pixbuf = pixbuf;
image_session_edit2.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_close.png");
@@ -583,13 +574,11 @@ public partial class ChronoJumpWindow
image_line_person_max_all_sessions.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameImport);
- image_import_database.Pixbuf = pixbuf;
image_session_import.Pixbuf = pixbuf;
image_session_import1_blue.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameImportYellow);
image_session_import1_yellow.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameExport);
- image_export_csv.Pixbuf = pixbuf;
image_export_encoder_signal.Pixbuf = pixbuf;
image_session_export.Pixbuf = pixbuf;
@@ -617,7 +606,6 @@ public partial class ChronoJumpWindow
//open buttons (this is shown better in windows than the default open icon)
//pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameOpen);
- //image_session_open.Pixbuf = pixbuf;
//not changed because it's small. TODO: do bigger
//image_encoder_capture_open.Pixbuf = pixbuf;
diff --git a/src/gui/app1/runEncoder.cs b/src/gui/app1/runEncoder.cs
index 63a5eda0..91326604 100644
--- a/src/gui/app1/runEncoder.cs
+++ b/src/gui/app1/runEncoder.cs
@@ -1267,7 +1267,6 @@ public partial class ChronoJumpWindow
hbox_contacts_camera.Sensitive = sensitive;
//other gui buttons
- main_menu.Sensitive = sensitive;
viewport_persons.Sensitive = sensitive;
menus_sensitive(sensitive);
diff --git a/src/gui/exhibition.cs b/src/gui/exhibition.cs
index 6ce86cad..1c3c5260 100644
--- a/src/gui/exhibition.cs
+++ b/src/gui/exhibition.cs
@@ -41,7 +41,6 @@ public partial class ChronoJumpWindow
exhibitionStationType == ExhibitionTest.testTypes.FORCE_SHOT)
on_button_selector_start_force_sensor_clicked (new object (), new EventArgs());
- menuitem_open_session.Sensitive = false; //do not allow menu open to work (it could be really
slow)
frame_exhibition.Visible = true;
frame_persons.Sensitive = true;
frame_persons_top.Visible = false;
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index 6223f6ad..f5d71841 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -422,7 +422,6 @@ public partial class ChronoJumpWindow
if(currentSession == null && //this is going to be called one time because currentSession
will change
( configChronojump.SessionMode == Config.SessionModeEnum.UNIQUE ||
configChronojump.SessionMode == Config.SessionModeEnum.MONTHLY) )
{
- //main_menu.Visible = false;
//app1.Decorated = false;
//hbox_menu_and_preferences_outside_menu_contacts.Visible = true;
//hbox_menu_and_preferences_outside_menu_encoder.Visible = true;
@@ -465,7 +464,6 @@ public partial class ChronoJumpWindow
changeMode (Constants.Menuitem_modes.POWER);
//no mostrar menu
- main_menu.Visible = false;
//no mostrar persones
//vbox_persons.Visible = false;
diff --git a/src/gui/presentation.cs b/src/gui/presentation.cs
index 80327f1a..fd4401cd 100644
--- a/src/gui/presentation.cs
+++ b/src/gui/presentation.cs
@@ -68,7 +68,6 @@ public partial class ChronoJumpWindow
/*
Gtk.Button button = (Gtk.Button) o;
- //main_menu.Visible = ( button != button_presentation_fullscreen);
vbox_persons.Visible = ( button != button_presentation_fullscreen);
notebook_sup.ShowTabs = ( button != button_presentation_fullscreen);
//button_presentation_fullscreen.Sensitive = ( button != button_presentation_fullscreen);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
