[med-svn] [SCM] aghermann branch, master, updated. 3b8a63cca9e297a548ea6094bd42a016ecec03b8

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 70e7fd0ac126f1b8d4ea15778723ee031436c5f5
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sat Dec 15 21:12:38 2012 +0200

    better protect against random user input during noninteractive periods

diff --git a/data/main.glade b/data/main.glade
index bf6ed0c..b179040 100644
--- a/data/main.glade
+++ b/data/main.glade
@@ -821,8 +821,8 @@ rm */*/*/.*.{psd,mc,swu}</property>
                         </child>
                         <child>
                           <object class="GtkBox" id="cMsmtMainToolbar">
-                            <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="no_show_all">True</property>
                             <child>
                               <object class="GtkBox" id="cMsmtProfileModeContainer">
                                 <property name="visible">True</property>
@@ -993,6 +993,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
                                 </child>
                                 <child>
                                   <object class="GtkBox" id="cMsmtProfileParamsMC">
+                                    <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
                                     <child>
@@ -1081,6 +1082,7 @@ rm */*/*/.*.{psd,mc,swu}</property>
                                 </child>
                                 <child>
                                   <object class="GtkBox" id="cMsmtProfileParamsSWU">
+                                    <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
                                     <child>
@@ -3181,6 +3183,9 @@ Read more <a href="http://johnhommer.com/academic/code/aghermann/swu.html"&gt
                                   <placeholder/>
                                 </child>
                                 <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
                                   <object class="GtkFrame" id="fDAHeights">
                                     <property name="width_request">100</property>
                                     <property name="height_request">80</property>
@@ -4882,9 +4887,6 @@ dragging individual signals with <i>Alt</i>.</small></property
                                   </packing>
                                 </child>
                                 <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
                                   <object class="GtkFrame" id="fBrowseCommand">
                                     <property name="width_request">100</property>
                                     <property name="height_request">80</property>
@@ -7110,6 +7112,12 @@ dragging individual signals with <i>Alt</i>.</small></property
                                     <child>
                                       <placeholder/>
                                     </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
                                   </object>
                                 </child>
                                 <child>
diff --git a/src/ui/mw/mw-construct.cc b/src/ui/mw/mw-construct.cc
index 8babe26..6b5326d 100644
--- a/src/ui/mw/mw-construct.cc
+++ b/src/ui/mw/mw-construct.cc
@@ -178,7 +178,8 @@ SExpDesignUIWidgets ()
 	     !AGH_GBGETOBJ (GtkLabel,		lMsmtProfileSWUExtra) ||
 	     !AGH_GBGETOBJ (GtkLabel,		lMsmtProfileMCExtra) ||
 
-	     !AGH_GBGETOBJ (GtkBox,		cMsmtMainToolbar) )
+	     !AGH_GBGETOBJ (GtkBox,		cMsmtMainToolbar) ||
+	     !AGH_GBGETOBJ (GtkBox,		cMsmtTopArea) )
 		throw runtime_error ("Failed to construct widgets");
 
 	gtk_cell_layout_set_renderer( eMsmtProfileType);
@@ -713,6 +714,8 @@ set_wMainWindow_interactive( bool indeed, bool flush)
 	gtk_widget_set_sensitive( (GtkWidget*)eMsmtSession, indeed);
 	gtk_widget_set_sensitive( (GtkWidget*)eMsmtChannel, indeed);
 
+	gtk_widget_set_visible( (GtkWidget*)cMsmtTopArea, indeed);
+
 	if ( flush )
 		gtk_flush();
 }
diff --git a/src/ui/mw/mw-widgets.hh b/src/ui/mw/mw-widgets.hh
index a1b3b70..86b02be 100644
--- a/src/ui/mw/mw-widgets.hh
+++ b/src/ui/mw/mw-widgets.hh
@@ -104,7 +104,8 @@ struct SExpDesignUIWidgets {
 		*iHelpUsage;
 
 	// profile mode & parameters
-	GtkBox	*cMsmtMainToolbar,
+	GtkBox	*cMsmtTopArea,
+		*cMsmtMainToolbar,
 		*cMsmtProfileParamsContainer;
 	GtkComboBox
 		*eMsmtProfileType;
diff --git a/src/ui/mw/mw.cc b/src/ui/mw/mw.cc
index e3079de..ca5dc8b 100644
--- a/src/ui/mw/mw.cc
+++ b/src/ui/mw/mw.cc
@@ -195,7 +195,8 @@ SExpDesignUI (aghui::SSessionChooser *parent,
 	nodestroy_by_cb = true;
 
 	set_wMainWindow_interactive( false);
-	gtk_widget_show_all( (GtkWidget*)wMainWindow);
+	set_controls_for_empty_experiment( true, false);
+	gtk_widget_show( (GtkWidget*)wMainWindow);
 
 	if ( not dir.empty() and not agh::fs::exists_and_is_writable( dir) )
 		throw invalid_argument (string("Experiment directory ") + dir + " does not exist or is not writable");

-- 
Sleep experiment manager