[chronojump] Fixed sensitivities when executing test

[Xavier de Blas <xaviblas src gnome org>]

commit 9f5b33925ce4b3c97c674c7d93b7804d3c7f092b
Author: Xavier de Blas <xaviblas gmail com>
Date:   Wed Apr 13 10:26:41 2011 +0200

    Fixed sensitivities when executing test

 glade/chronojump.glade  |    8 +++---
 src/gui/chronojump.cs   |   56 +++++++++++++++++++++--------------------------
 src/gui/eventExecute.cs |    1 -
 3 files changed, 29 insertions(+), 36 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 7de963d..ccf46a8 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -13339,7 +13339,7 @@ by you</property>
           <widget class="GtkMenuBar" id="C">
             <property name="visible">True</property>
             <child>
-              <widget class="GtkMenuItem" id="session">
+              <widget class="GtkMenuItem" id="session_menuitem">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Session</property>
                 <property name="use_underline">True</property>
@@ -13468,12 +13468,12 @@ by you</property>
               </widget>
             </child>
             <child>
-              <widget class="GtkMenuItem" id="help1">
+              <widget class="GtkMenuItem" id="help_menuitem">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Help</property>
                 <property name="use_underline">True</property>
                 <child>
-                  <widget class="GtkMenu" id="help1_menu">
+                  <widget class="GtkMenu" id="help_menu">
                     <child>
                       <widget class="GtkImageMenuItem" id="menuitem_manual">
                         <property name="label">_Manual</property>
@@ -13915,7 +13915,7 @@ by you</property>
                             <property name="hadjustment">0 0 735 73.5 661.5 735</property>
                             <property name="shadow_type">out</property>
                             <child>
-                              <widget class="GtkHButtonBox" id="hbuttonbox2">
+                              <widget class="GtkHButtonBox" id="hbutton_radio_modes">
                                 <property name="visible">True</property>
                                 <child>
                                   <widget class="GtkRadioButton" id="radio_mode_jumps">
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 956cd6d..5a61bc1 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -89,8 +89,8 @@ public partial class ChronoJumpWindow
 	[Widget] Gtk.ComboBox combo_pulses;
 
 	//menus
-	[Widget] Gtk.MenuItem menu_other;
-	[Widget] Gtk.MenuItem menu_tools;
+	[Widget] Gtk.MenuItem session_menuitem;
+	[Widget] Gtk.MenuItem help_menuitem;
 
 	//menu session
 	[Widget] Gtk.MenuItem menuitem_edit_session;
@@ -155,10 +155,6 @@ public partial class ChronoJumpWindow
 //	[Widget] Gtk.CheckButton extra_window_check_multichronopic_delete_first;
 //	[Widget] Gtk.Entry entry_multi_chronopic_cp2;
 
-	//tools
-	[Widget] Gtk.MenuItem menuitem_preferences;
-
-
 	//widgets for enable or disable
 	[Widget] Gtk.Button button_new;
 	[Widget] Gtk.Button button_open;
@@ -201,6 +197,9 @@ public partial class ChronoJumpWindow
 	[Widget] Gtk.Image image_test_zoom;
 	[Widget] Gtk.Label label_image_test;
 	[Widget] Gtk.Box hbox_this_test_buttons;
+		
+	[Widget] Gtk.Button button_upload_session;
+	[Widget] Gtk.Button button_activate_chronopics;
 
 	//non standard icons	
 	[Widget] Gtk.Image image_jump_reactive_bell;
@@ -3090,10 +3089,6 @@ Console.WriteLine("X");
 		//hide jumping buttons
 		sensitiveGuiEventDoing();
 
-		//change to page 0 of notebook_results if were in other
-		//update, don't do this now, because it's buggy with currentJump on More
-		//notebooks_change(0);
-		
 		//show the event doing window
 		double progressbarLimit = 3; //3 phases for show the Dj
 		if( currentJumpType.StartIn || 
@@ -3232,10 +3227,6 @@ Console.WriteLine("X");
 		//hide jumping buttons
 		sensitiveGuiEventDoing();
 	
-		//change to page 1 of notebook_results if were in other
-		//update, don't do this now, because it's buggy with currentJump on More
-		//notebooks_change(1);
-		
 		//don't let update until test finishes
 		if(createdStatsWin)
 			showUpdateStatsAndHideData(false);
@@ -3397,10 +3388,6 @@ Console.WriteLine("X");
 		//hide jumping (running) buttons
 		sensitiveGuiEventDoing();
 	
-		//change to page 2 of notebook_results if were in other
-		//update, don't do this now, because it's buggy with currentJump on More
-		//notebooks_change(2);
-			
 		//show the event doing window
 		
 		double progressbarLimit = 3; //same for startingIn than out (before)
@@ -3560,9 +3547,6 @@ Console.WriteLine("X");
 		//hide running buttons
 		sensitiveGuiEventDoing();
 		
-		//change to page 3 of notebook_results if were in other
-		notebooks_change(3);
-		
 		//don't let update until test finishes
 		if(createdStatsWin)
 			showUpdateStatsAndHideData(false);
@@ -3683,9 +3667,6 @@ Console.WriteLine("X");
 		//hide jumping buttons
 		sensitiveGuiEventDoing();
 
-		//change to page 4 of notebook_results if were in other
-		//notebooks_change(4);
-		
 		//show the event doing window
 		double progressbarLimit = 2;
 			
@@ -3821,9 +3802,6 @@ Console.WriteLine("X");
 		//hide pulse buttons
 		sensitiveGuiEventDoing();
 		
-		//change to page 5 of notebook_results if were in other
-		//notebooks_change(5);
-		
 		//don't let update until test finishes
 		if(createdStatsWin)
 			showUpdateStatsAndHideData(false);
@@ -3979,9 +3957,6 @@ Console.WriteLine("X");
 		//hide pulse buttons
 		sensitiveGuiEventDoing();
 		
-		//change to page 6 of notebook_results if were in other
-		//notebooks_change(6);
-		
 		//don't let update until test finishes
 		if(createdStatsWin)
 			showUpdateStatsAndHideData(false);
@@ -5229,7 +5204,6 @@ Console.WriteLine("X");
 
 	private void sensitiveGuiNoSession () 
 	{
-		menuitem_preferences.Sensitive = true;
 		treeview_persons.Sensitive = false;
 		
 		//menuitems
@@ -5316,6 +5290,11 @@ Console.WriteLine("X");
 	}
 	
 	private void sensitiveGuiEventDoing () {
+		session_menuitem.Sensitive = false;
+		help_menuitem.Sensitive = false;
+		viewport_mode.Sensitive = false;
+		frame_persons.Sensitive = false;
+		
 		button_execute_test.Sensitive = false;
 		//hbox
 		hbox_jumps.Sensitive = false;
@@ -5325,10 +5304,20 @@ Console.WriteLine("X");
 		hbox_pulses.Sensitive = false;
 		hbox_this_test_buttons.Sensitive = false;
 		
+		button_upload_session.Sensitive = false;
+		button_activate_chronopics.Sensitive = false;
+		notebook_options.Sensitive = false;
+		event_execute_button_update.Sensitive = false;
+		
 		//hbox_multi_chronopic_buttons.Sensitive = false;
 	}
    
 	private void sensitiveGuiEventDone () {
+		session_menuitem.Sensitive = true;
+		help_menuitem.Sensitive = true;
+		viewport_mode.Sensitive = true;
+		frame_persons.Sensitive = true;
+
 		button_execute_test.Sensitive = true;
 		//hbox
 		hbox_jumps.Sensitive = true;
@@ -5338,6 +5327,11 @@ Console.WriteLine("X");
 		hbox_pulses.Sensitive = true;
 		//hbox_multi_chronopic_buttons.Sensitive = true;
 		hbox_this_test_buttons.Sensitive = true;
+		
+		button_upload_session.Sensitive = true;
+		button_activate_chronopics.Sensitive = true;
+		notebook_options.Sensitive = true;
+		event_execute_button_update.Sensitive = true;
 
 		//allow repeat last jump or run (check also if it wasn't cancelled)
 		if(! currentEventExecute.Cancel) {
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index af07c27..6ff363e 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -1260,7 +1260,6 @@ Log.WriteLine("Preparing reactive A");
 		int alto=drawingarea.Allocation.Height;
 
 		
-		Log.WriteLine("Painting reactive A");
 		event_execute_erasePaint(drawingarea);
 		
 		writeMarginsText(maxValue, minValue, alto);