Changeset cbb2e40 in sasview


Ignore:
Timestamp:
May 28, 2008 9: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:
1 edited

Legend:

Unmodified
Added
Removed
  • guiframe/gui_manager.py

    rfd68aa9 rcbb2e40  
    1515    import imp 
    1616    path = os.getcwd() 
    17     if(os.path.isfile("%s/%s.py" % (path, 'config'))) or \ 
    18       (os.path.isfile("%s/%s.pyc" % (path, 'config'))): 
    19             fObj, path, descr = imp.find_module('config', [path]) 
    20             config = imp.load_module('config', fObj, path, descr)   
     17    if(os.path.isfile("%s/%s.py" % (path, 'local_config'))) or \ 
     18      (os.path.isfile("%s/%s.pyc" % (path, 'local_config'))): 
     19            fObj, path, descr = imp.find_module('local_config', [path]) 
     20            config = imp.load_module('local_config', fObj, path, descr)   
    2121    else: 
    22         raise RuntimeError, "Look for default config"    
     22        # Try simply importing local_config 
     23        import local_config as config 
    2324except: 
    2425    # Didn't find local config, load the default  
    2526    import config 
     27     
    2628from sans.guicomm.events import EVT_STATUS 
    2729 
     
    4547        if os.path.isfile(ico_file): 
    4648            self.SetIcon(wx.Icon(ico_file, wx.BITMAP_TYPE_ICO)) 
     49        else: 
     50            ico_file = os.path.join(os.getcwd(),'images/ball.ico') 
     51            if os.path.isfile(ico_file): 
     52                self.SetIcon(wx.Icon(ico_file, wx.BITMAP_TYPE_ICO)) 
    4753         
    4854        ## Application manager 
Note: See TracChangeset for help on using the changeset viewer.