Changeset 34ffeed in sasview for fittingview


Ignore:
Timestamp:
Oct 14, 2011 5:57:28 PM (13 years ago)
Author:
Gervaise Alina <gervyh@…>
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:
64b4f0f
Parents:
8e4a562
Message:

add icon for help window

Location:
fittingview/src/sans/perspectives/fitting
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • fittingview/src/sans/perspectives/fitting/fitting.py

    r1ec979d r34ffeed  
    226226        """ 
    227227        from help_panel import  HelpWindow 
    228         frame = HelpWindow(None, -1, 'HelpWindow')     
     228        frame = HelpWindow(None, -1, 'HelpWindow')   
     229        if hasattr(frame, "IsIconized"): 
     230            if not frame.IsIconized(): 
     231                try: 
     232                    icon = self.parent.GetIcon() 
     233                    frame.SetIcon(icon) 
     234                except: 
     235                    pass   
    229236        frame.Show(True) 
    230237         
  • fittingview/src/sans/perspectives/fitting/help_panel.py

    rec538c7 r34ffeed  
    2121        contains help info 
    2222        """ 
    23        
     23        from sans.perspectives.fitting import get_data_path as fit_path 
     24        fitting_path = fit_path(media='media') 
     25        ico_file = os.path.join(fitting_path,'ball.ico') 
     26        if os.path.isfile(ico_file): 
     27            self.SetIcon(wx.Icon(ico_file, wx.BITMAP_TYPE_ICO)) 
    2428        splitter = MultiSplitterWindow(self, style=wx.SP_LIVE_UPDATE) 
    2529        rpanel = wx.Panel(splitter, -1) 
     
    6670        self.path_pd = os.path.join(path,"pd_help.html") 
    6771        self.path_sm = os.path.join(path,"smear_computation.html") 
    68         from sans.perspectives.fitting import get_data_path as fit_path 
    69         fitting_path = fit_path(media='media') 
     72        
    7073         
    7174        _html_file = [("load_data_help.html", "Load a File"), 
Note: See TracChangeset for help on using the changeset viewer.