Changeset 9a56619 in sasview

Timestamp:

Oct 15, 2011 5:20:55 PM (13 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:

64f9fa6

Parents:

70e439f

Message:

added frame icons

Files:

• calculatorview/src/sans/perspectives/calculator/calculator.py (modified) (6 diffs)
• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (1 diff)

calculatorview/src/sans/perspectives/calculator/calculator.py

@@ -74 +74 @@
         frame = DataEditorWindow(parent=self.parent, data=[],
                                   title="Data Editor")
+        self.put_icon(frame)
         frame.Show(True)
         event.Skip()
@@ -83 +84 @@
         from kiessig_calculator_panel import KiessigWindow
         frame = KiessigWindow()
+        self.put_icon(frame)
         frame.Show(True) 
     
@@ -91 +93 @@
         from sld_panel import SldWindow
         frame = SldWindow(base=self.parent)
+        self.put_icon(frame)
         frame.Show(True) 
        
@@ -98 +101 @@
         """
         from slit_length_calculator_panel import SlitLengthCalculatorWindow
-        frame = SlitLengthCalculatorWindow(parent=self.parent)    
+        frame = SlitLengthCalculatorWindow(parent=self.parent)  
+        self.put_icon(frame)  
         frame.Show(True)
         
@@ -107 +111 @@
         from resolution_calculator_panel import ResolutionWindow
         frame = ResolutionWindow(parent=self.parent)
+        self.put_icon(frame)
         frame.Show(True) 
   
@@ -129 +134 @@
         from pyconsole import PyConsole
         frame = PyConsole(parent=self.parent)
+        self.put_icon(frame)
         frame.Show(True) 
     
-    
+    def put_icon(self, frame):
+        """
+        Put icon in the frame title bar
+        """
+        if hasattr(frame, "IsIconized"):
+            if not frame.IsIconized():
+                try:
+                    icon = self.parent.GetIcon()
+                    frame.SetIcon(icon)
+                except:
+                    pass      
   
     

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -2129 +2129 @@
                     
                     dialog = PDFFrame(None, -1, "Tutorial", path)
+                    if hasattr(dialog, "IsIconized"):
+                        if not dialog.IsIconized():
+                            try:
+                                icon = self.GetIcon()
+                                dialog.SetIcon(icon)
+                            except:
+                                pass   
                     #self.SetTopWindow(dialog)
                     dialog.Show(True)