Changeset b50b057 in sasview

Timestamp:

Apr 5, 2014 7:24:36 AM (11 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:

caf8dd4

Parents:

1c03e14

Message:

Fix wx2.8 issue with fonts

File:

• src/sans/guiframe/gui_statusbar.py (modified) (5 diffs)

src/sans/guiframe/gui_statusbar.py

@@ -21 +21 @@
 else:
     FONT_VARIANT = 1
+
+GREEN = wx.Colour(95, 190, 95)
+YELLOW = wx.Colour(247, 214, 49)
+RED = wx.Colour(234, 89, 78)
 
 class ConsolePanel(wx.Panel):
@@ -129 +133 @@
         # Create status bar icon reflecting the type of status
         # for the last message
-        self.bitmap_bt_warning = \
-            wx.BitmapButton(self, -1,
-                            size=(width, height),
-                            style=wx.NO_BORDER)
+        self.bitmap_bt_warning = wx.Button(self, wx.NewId(), "", 
+                                 size=(width, height), style=wx.NO_BORDER)
+        self.bitmap_bt_warning.SetBackgroundColour(GREEN)
 
         # Create the button used to show the console dialog
-        self.bitmap_bt_console = wx.Button(self, wx.NewId(), "Console", 
+        self.console_button = wx.Button(self, wx.NewId(), "Console", 
                                  size=(console_btn_width, 10),
                                  style=wx.BU_EXACTFIT)
-        font = self.bitmap_bt_console.GetFont()
-        font = font.Smaller()
-        self.bitmap_bt_console.SetFont(font)
-
-        console_hint = "History of status bar messages"
-        self.bitmap_bt_console.SetToolTipString(console_hint)
-        self.bitmap_bt_console.Bind(wx.EVT_BUTTON, self._onMonitor,
-                                    id=self.bitmap_bt_console.GetId())
+        font = self.console_button.GetFont()
+        font.SetPixelSize(wx.Size(0,10))
+        self.console_button.SetFont(font)
+        self.console_button.SetToolTipString("History of status bar messages")
+        self.console_button.Bind(wx.EVT_BUTTON, self._onMonitor,
+                                id=self.console_button.GetId())
         
         self.reposition()
@@ -187 +188 @@
         self.bitmap_bt_warning.SetPosition((rect.x, rect.y))
         rect = self.GetFieldRect(CONSOLE_POSITION)
-        self.bitmap_bt_console.SetPosition((rect.x, rect.y))
+        self.console_button.SetPosition((rect.x, rect.y))
         self.sizeChanged = False
         
@@ -212 +213 @@
         wxStatusB.SetStatusText(self, text, number)
         self.list_msg.append(text)
-        icon_bmp = wx.ArtProvider.GetBitmap(wx.ART_INFORMATION, wx.ART_TOOLBAR)
-        self.bitmap_bt_warning.SetBitmapLabel(icon_bmp)
+        self.bitmap_bt_warning.SetBackgroundColour(GREEN)
 
         if self.frame is not None :
@@ -296 +296 @@
         msg = event.info.lower()
         if msg == "warning":
-            icon_bmp =  wx.ArtProvider.GetBitmap(wx.ART_WARNING, wx.ART_TOOLBAR,
-                                                 size = (height,height))
-            self.bitmap_bt_warning.SetBitmapLabel(icon_bmp)
+            self.bitmap_bt_warning.SetBackgroundColour(YELLOw)
         elif msg == "error":
-            icon_bmp =  wx.ArtProvider.GetBitmap(wx.ART_ERROR, wx.ART_TOOLBAR,
-                                                 size = (height,height))
-            self.bitmap_bt_warning.SetBitmapLabel(icon_bmp)
+            self.bitmap_bt_warning.SetBackgroundColour(RED)
         else:
-            icon_bmp =  wx.ArtProvider.GetBitmap(wx.ART_INFORMATION,
-                                                 wx.ART_TOOLBAR,
-                                                 size = (height,height))
-            self.bitmap_bt_warning.SetBitmapLabel(icon_bmp)
+            self.bitmap_bt_warning.SetBackgroundColour(GREEN)
     
     def set_dialog(self, event):