Changeset cbb2e40 in sasview

Timestamp:

May 28, 2008 11:12:03 AM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

7afdc14

Parents:

fc4ab6e

Message:

0.1

File:

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

guiframe/gui_manager.py

@@ -15 +15 @@
     import imp
     path = os.getcwd()
-    if(os.path.isfile("%s/%s.py" % (path, 'config'))) or \
-      (os.path.isfile("%s/%s.pyc" % (path, 'config'))):
-            fObj, path, descr = imp.find_module('config', [path])
-            config = imp.load_module('config', fObj, path, descr)  
+    if(os.path.isfile("%s/%s.py" % (path, 'local_config'))) or \
+      (os.path.isfile("%s/%s.pyc" % (path, 'local_config'))):
+            fObj, path, descr = imp.find_module('local_config', [path])
+            config = imp.load_module('local_config', fObj, path, descr)  
     else:
-        raise RuntimeError, "Look for default config"   
+        # Try simply importing local_config
+        import local_config as config
 except:
     # Didn't find local config, load the default 
     import config
+    
 from sans.guicomm.events import EVT_STATUS
 
@@ -45 +47 @@
         if os.path.isfile(ico_file):
             self.SetIcon(wx.Icon(ico_file, wx.BITMAP_TYPE_ICO))
+        else:
+            ico_file = os.path.join(os.getcwd(),'images/ball.ico')
+            if os.path.isfile(ico_file):
+                self.SetIcon(wx.Icon(ico_file, wx.BITMAP_TYPE_ICO))
         
         ## Application manager