[chronojump] on exercise click (contacts/encoder) menus are insensitive
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] on exercise click (contacts/encoder) menus are insensitive
- Date: Mon, 6 Apr 2020 08:34:30 +0000 (UTC)
commit 0546740eb159057a99661d0a6868a183b3ba6691
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Apr 6 10:32:52 2020 +0200
on exercise click (contacts/encoder) menus are insensitive
src/gui/app1/chronojump.cs | 16 ++++------------
src/gui/app1/contactsExercise.cs | 2 ++
src/gui/app1/encoder.cs | 1 +
src/gui/app1/menu.cs | 7 +++++++
src/gui/app1/sessionLoadAndImport.cs | 5 +----
5 files changed, 15 insertions(+), 16 deletions(-)
---
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index a05b8d3f..55eebce8 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -2483,9 +2483,7 @@ public partial class ChronoJumpWindow
if(notebook_sup.CurrentPage != Convert.ToInt32(notebook_sup_pages.SESSION))
app1s_notebook_sup_entered_from = notebook_sup.CurrentPage;
- radio_show_menu.Sensitive = false;
- viewport_menu.Sensitive = false;
- vbox_menu_tiny.Sensitive = false;
+ menus_sensitive(false);
sessionLoadWindowShow(app1s_windowType.LOAD_SESSION);
notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.SESSION);
}
@@ -2507,9 +2505,7 @@ public partial class ChronoJumpWindow
foundPersons = selectRowTreeView_persons(treeview_persons, 0);
//show hidden widgets, and sensitivize
- radio_show_menu.Sensitive = true;
- viewport_menu.Sensitive = true;
- vbox_menu_tiny.Sensitive = true;
+ menus_sensitive(true);
sensitiveGuiNoSession();
sensitiveGuiYesSession();
@@ -7096,9 +7092,7 @@ LogB.Debug("mc finished 5");
private void sensitiveGuiEventDoing (bool cont)
{
- radio_show_menu.Sensitive = false;
- viewport_menu.Sensitive = false;
- vbox_menu_tiny.Sensitive = false;
+ menus_sensitive(false);
session_menuitem.Sensitive = false;
menuitem_mode.Sensitive = false;
//vbox_menu_encoder.Sensitive = false;
@@ -7167,9 +7161,7 @@ LogB.Debug("mc finished 5");
{
LogB.Information(" sensitiveGuiEventDone start ");
- radio_show_menu.Sensitive = true;
- viewport_menu.Sensitive = true;
- vbox_menu_tiny.Sensitive = true;
+ menus_sensitive(true);
session_menuitem.Sensitive = true;
menuitem_mode.Sensitive = true;
//vbox_menu_encoder.Sensitive = true;
diff --git a/src/gui/app1/contactsExercise.cs b/src/gui/app1/contactsExercise.cs
index 1e7577d5..c9aaffe9 100644
--- a/src/gui/app1/contactsExercise.cs
+++ b/src/gui/app1/contactsExercise.cs
@@ -28,6 +28,7 @@ public partial class ChronoJumpWindow
{
private void on_button_contacts_exercise_clicked (object o, EventArgs args)
{
+ menus_sensitive(false);
notebook_contacts_capture_doing_wait.Sensitive = false;
vbox_contacts_device_adjust_threshold.Sensitive = false;
viewport_persons.Sensitive = false;
@@ -41,6 +42,7 @@ public partial class ChronoJumpWindow
}
private void on_button_contacts_exercise_close_clicked (object o, EventArgs args)
{
+ menus_sensitive(true);
notebook_contacts_capture_doing_wait.Sensitive = true;
vbox_contacts_device_adjust_threshold.Sensitive = true;
viewport_persons.Sensitive = true;
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index fc17afd4..495ff323 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -4666,6 +4666,7 @@ public partial class ChronoJumpWindow
notebook_encoder_capture_main.GetNthPage(1).Show();
}
+ menus_sensitive(! show);
main_menu.Sensitive = ! show;
hbox_encoder_sup_capture_analyze.Sensitive = ! show;
viewport_persons.Sensitive = ! show;
diff --git a/src/gui/app1/menu.cs b/src/gui/app1/menu.cs
index 87e144e5..11b9dd18 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -108,6 +108,13 @@ public partial class ChronoJumpWindow
button_show_modes.Sensitive = true;
}
+ private void menus_sensitive(bool sensitive)
+ {
+ radio_show_menu.Sensitive = sensitive;
+ viewport_menu.Sensitive = sensitive;
+ vbox_menu_tiny.Sensitive = sensitive;
+ }
+
private void menuInitialize ()
{
menuSetTextAndIcons();
diff --git a/src/gui/app1/sessionLoadAndImport.cs b/src/gui/app1/sessionLoadAndImport.cs
index e6a632ec..e73579c9 100644
--- a/src/gui/app1/sessionLoadAndImport.cs
+++ b/src/gui/app1/sessionLoadAndImport.cs
@@ -583,10 +583,7 @@ public partial class ChronoJumpWindow
// ---- notebook page 2 (load sesion) buttons ----
void app1s_on_button_cancel2_clicked (object o, EventArgs args)
{
- radio_show_menu.Sensitive = true;
- viewport_menu.Sensitive = true;
- vbox_menu_tiny.Sensitive = true;
-
+ menus_sensitive(true);
notebook_supSetOldPage();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]