Changeset 34ffeed in sasview

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:

• fitting.py (modified) (1 diff)
• help_panel.py (modified) (2 diffs)
• media/ball.ico (added)

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -226 +226 @@
         """
         from help_panel import  HelpWindow
-        frame = HelpWindow(None, -1, 'HelpWindow')    
+        frame = HelpWindow(None, -1, 'HelpWindow')  
+        if hasattr(frame, "IsIconized"):
+            if not frame.IsIconized():
+                try:
+                    icon = self.parent.GetIcon()
+                    frame.SetIcon(icon)
+                except:
+                    pass  
         frame.Show(True)
         

fittingview/src/sans/perspectives/fitting/help_panel.py

@@ -21 +21 @@
         contains help info
         """
-      
+        from sans.perspectives.fitting import get_data_path as fit_path
+        fitting_path = fit_path(media='media')
+        ico_file = os.path.join(fitting_path,'ball.ico')
+        if os.path.isfile(ico_file):
+            self.SetIcon(wx.Icon(ico_file, wx.BITMAP_TYPE_ICO))
         splitter = MultiSplitterWindow(self, style=wx.SP_LIVE_UPDATE)
         rpanel = wx.Panel(splitter, -1)
@@ -66 +70 @@
         self.path_pd = os.path.join(path,"pd_help.html")
         self.path_sm = os.path.join(path,"smear_computation.html")
-        from sans.perspectives.fitting import get_data_path as fit_path
-        fitting_path = fit_path(media='media')
+       
         
         _html_file = [("load_data_help.html", "Load a File"),