Changeset 493c90c in sasview

Timestamp:

Dec 17, 2011 1:05:09 PM (12 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:

74b5523

Parents:

5247084

Message:

copied custom_conf file to .sansview too.

Location:

sansguiframe/src/sans/guiframe

Files:

• customdir.py (added)
• gui_manager.py (modified) (1 diff)
• startup_configuration.py (modified) (2 diffs)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -77 +77 @@
     import sans.guiframe.config as config          
        
-
-custom_config = _find_local_config('custom_config', PATH_APP)
+from sans.guiframe.customdir  import SetupCustom
+c_conf_dir = SetupCustom().setup_dir(PATH_APP)
+custom_config = _find_local_config('custom_config', c_conf_dir)
 if custom_config is None:
     custom_config = _find_local_config('custom_config', os.getcwd())

sansguiframe/src/sans/guiframe/startup_configuration.py

@@ -17 +17 @@
 from sans.guiframe.gui_style import GUIFRAME
 from sans.guiframe import gui_manager as CURRENT
+from sans.guiframe.customdir  import SetupCustom
 # default configuration
 DEFAULT_STRINGS = {'GUIFRAME_WIDTH':1150,
@@ -65 +66 @@
         # parent
         self.parent = parent
-        self.path = parent.path
+        self.path = SetupCustom().find_dir()
         self._gui = gui
         # font size