Changeset 8e3dc19 in sasview

Timestamp:

Aug 12, 2011 2:33:09 PM (13 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:

b52cf23

Parents:

889de4d9

Message:

control menu differently on app

Files:

• calculatorview/scripts/local_config.py (modified) (1 diff)
• prview/local_config.py (modified) (2 diffs)
• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (2 diffs)
• sansview/local_config.py (modified) (1 diff)

calculatorview/scripts/local_config.py

@@ -65 +65 @@
 SPLASH_SCREEN_HEIGHT = 366
 SS_MAX_DISPLAY_TIME = 6000 #6 sec
-WELCOME_PANEL_SHOW = False
+WELCOME_PANEL_ON  = False
 CLEANUP_PLOT = False
 SetupIconFile_win = os.path.join("images", "ball.ico")

prview/local_config.py

@@ -8 +8 @@
 # Version of the application
 __appname__ = "PrView"
-__version__ = '0.3.0'
+__version__ = '0.9.1'
 __download_page__ = 'http://danse.chem.utk.edu'
 __update_URL__ = 'http://danse.chem.utk.edu/prview_version.php'
@@ -75 +75 @@
 DATALOADER_SHOW = True
 CLEANUP_PLOT = False
-WELCOME_PANEL_SHOW = False
+WELCOME_PANEL_ON  = False
 #Show or hide toolbar at the start up
 TOOLBAR_SHOW = True
 #Open Save project menu
-OPEN_SAVE_PROJECT_MENU = True
+OPEN_SAVE_PROJECT_MENU = False
 #VIEW MENU
 VIEW_MENU = True

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -89 +89 @@
 APPLICATION_NAME = config.__appname__
 SPLASH_SCREEN_PATH = config.SPLASH_SCREEN_PATH
-
+WELCOME_PANEL_ON = config.WELCOME_PANEL_ON
 SPLASH_SCREEN_WIDTH = config.SPLASH_SCREEN_WIDTH
 SPLASH_SCREEN_HEIGHT = config.SPLASH_SCREEN_HEIGHT
 SS_MAX_DISPLAY_TIME = config.SS_MAX_DISPLAY_TIME
-
+if not WELCOME_PANEL_ON:
+        WELCOME_PANEL_SHOW = False
+else:
+    WELCOME_PANEL_SHOW = True
 try:
     DATALOADER_SHOW = custom_config.DATALOADER_SHOW
     TOOLBAR_SHOW = custom_config.TOOLBAR_SHOW
     FIXED_PANEL = custom_config.FIXED_PANEL
-    WELCOME_PANEL_SHOW = custom_config.WELCOME_PANEL_SHOW
+    if WELCOME_PANEL_ON:
+        WELCOME_PANEL_SHOW = custom_config.WELCOME_PANEL_SHOW
     PLOPANEL_WIDTH = custom_config.PLOPANEL_WIDTH
     DATAPANEL_WIDTH = custom_config.DATAPANEL_WIDTH
@@ -953 +957 @@
         if style == GUIFRAME.WELCOME_PANEL_ON or custom_config != None:
             # add the welcome panel menu item
-            if self.defaultPanel is not None:
+            if config.WELCOME_PANEL_ON and self.defaultPanel is not None:
                 id = wx.NewId()
                 self._help_menu.Append(id, '&Welcome', '')

sansview/local_config.py

@@ -73 +73 @@
 SPLASH_SCREEN_HEIGHT = 366
 SS_MAX_DISPLAY_TIME = 6000 #6 sec
+WELCOME_PANEL_ON  = True
 WELCOME_PANEL_SHOW = False
 CLEANUP_PLOT = False