Changeset 4d1dce4 in sasview

Timestamp:

Apr 11, 2011 12:18:24 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

f69b5830

Parents:

9f5b505

Message:

improved welcome page behavior

File:

• guiframe/gui_manager.py (modified) (3 diffs)

guiframe/gui_manager.py

@@ -213 +213 @@
         """
         """
+        # set tool bar
+        self._setup_tool_bar()
         # Set up the layout
         self._setup_layout()
         # Set up the menu
         self._setup_menus()
-        # set tool bar
-        self._setup_tool_bar()
+        
         try:
             self.load_from_cmd(self._input_file)
@@ -972 +973 @@
         if default_panel.IsShown():
             default_panel.Hide()
-            
-            # set a default perspective
-            self.set_default_perspective()
+            # Recover current perspective
+            perspective = self._current_perspective
+            perspective.on_perspective(event=None)
             self._mgr.Update()
             # Show toolbar
-            self._on_hide_toolbar()
+            style = self.__gui_style & GUIFRAME.TOOL_ON
+            if (style == GUIFRAME.TOOL_ON) & (not self._toolbar.IsShown()):
+                self._on_hide_toolbar()
             
     def show_welcome_panel(self, event):
@@ -1396 +1399 @@
         :param panels: list of panels
         """
+        style = self.__gui_style & GUIFRAME.TOOL_ON
+        if (style == GUIFRAME.TOOL_ON) & (not self._toolbar.IsShown()):
+            self._on_hide_toolbar()
         for item in self.panels:
             # Check whether this is a sticky panel