Changeset 07dd0b4 in sasview

Timestamp:

Oct 20, 2011 2:44:39 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:

b837e1f

Parents:

2d98490

Message:

add icon to console

Location:

sansguiframe/src/sans/guiframe

Files:

• gui_statusbar.py (modified) (3 diffs)
• gui_style.py (modified) (2 diffs)

sansguiframe/src/sans/guiframe/gui_statusbar.py

@@ -4 +4 @@
 import wx.richtext
 import time
+from sans.guiframe.gui_style import GUIFRAME_ICON
 #numner of fields of the status bar 
 NB_FIELDS = 4
@@ -137 +138 @@
         self.list_msg = []
         self.frame = Console(parent=self)
+        if hasattr(self.frame, "IsIconized"):
+            if not self.frame.IsIconized():
+                try:
+                    icon = self.parent.GetIcon()
+                    self.frame.SetIcon(icon)
+                except:
+                    try:
+                        FRAME_ICON = wx.Icon(GUIFRAME_ICON.FRAME_ICON_PATH,
+                                              wx.BITMAP_TYPE_ICON)
+                        self.frame.SetIcon(FRAME_ICON)
+                    except:
+                        pass
         self.frame.set_multiple_messages(self.list_msg)
         self.frame.Hide()
@@ -249 +262 @@
         """
         if hasattr(event, "status"):
-            status = str(status)
+            status = str(event.status)
             if status.strip() == "":
                 return

sansguiframe/src/sans/guiframe/gui_style.py

@@ -40 +40 @@
 class GUIFRAME_ICON:
     PATH = get_data_path(media='images')
+    FRAME_ICON_PATH = os.path.join(PATH, 'ball.ico')
     SAVE_ICON_PATH = os.path.join(PATH, 'save.png')
     UNDO_ICON_PATH = os.path.join(PATH, 'undo.png')
@@ -54 +55 @@
     PRINT_ID_PATH = os.path.join(PATH, 'printer.png')
     
+  
     SAVE_ICON = wx.Image(os.path.join(PATH, 'save.png'))
     UNDO_ICON = wx.Image(os.path.join(PATH, 'undo.png'))