Changeset 6e4d543 in sasview

Timestamp:

Apr 19, 2012 9:48:04 AM (13 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:

9690fbf

Parents:

b1432b9

Message:

trying to improve the status bar

Location:

sansguiframe/src/sans/guiframe

Files:

• gui_manager.py (modified) (1 diff)
• gui_statusbar.py (modified) (3 diffs)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -728 +728 @@
         self._mgr = wx.aui.AuiManager(self, flags=default_flag)
         self._mgr.SetDockSizeConstraint(0.5, 0.5)
-        # border color
-        #self.b_color = wx.aui.AUI_DOCKART_BORDER_COLOUR  
-        #self._mgr.GetArtProvider().SetColor(self.b_color, self.color)
-        #self._mgr.SetArtProvider(wx.aui.AuiDockArt(wx.AuiDefaultDockArt))
-        #print "set", self._dockart.GetColour(13)
         # Load panels
         self._load_panels()

sansguiframe/src/sans/guiframe/gui_statusbar.py

@@ -98 +98 @@
 class StatusBar(wxStatusB):
     """
-    """
-    def __init__(self, parent, *args, **kargs):
-        wxStatusB.__init__(self, parent, *args, **kargs)
-        """
-        Implement statusbar functionalities 
-        """
+        Application status bar
+    """
+    def __init__(self, parent, id):
+        wxStatusB.__init__(self, parent, id)
         self.parent = parent
         self.parent.SetStatusBarPane(MSG_POSITION)
+
         #Layout of status bar
+        hint_w, hint_h = wx.ArtProvider.GetSizeHint(wx.ART_TOOLBAR)        
         self.SetFieldsCount(NB_FIELDS) 
-        self.SetStatusWidths([BUTTON_SIZE, -2, -1, BUTTON_SIZE])
+        # Leave some space for the resize handle in the last field
+        self.SetStatusWidths([hint_w+4, -2, -1, hint_w+15])
+        self.SetMinHeight(hint_h+4)
+        
         #display default message
         self.msg_position = MSG_POSITION 
-        #save the position of the gauge
-        width, height = self.GetSize()
-        self.gauge = wx.Gauge(self, size=(width/10, height-3),
+        
+        # Create progress bar
+        self.gauge = wx.Gauge(self, size=(hint_w, hint_h),
                                style=wx.GA_HORIZONTAL)
         self.gauge.Hide()
-        #status bar icon
+        
+        # Create status bar icon reflecting the type of status
+        # for the last message
         self.bitmap_bt_warning = wx.BitmapButton(self, -1,
-                                                 size=(BUTTON_SIZE,-1),
-                                                  style=wx.NO_BORDER)
-        console_bmp = wx.ArtProvider.GetBitmap(wx.ART_TIP, wx.ART_TOOLBAR,
-                                                size = (16,16))
+                                                 size=(hint_w, hint_h),
+                                                 style=wx.NO_BORDER)
+                
+        # Create the button used to show the console dialog
+        console_bmp = wx.ArtProvider.GetBitmap(wx.ART_INFORMATION, wx.ART_TOOLBAR,
+                                                size = (hint_w, hint_h))
         self.bitmap_bt_console = wx.BitmapButton(self, -1, 
-                                 size=(BUTTON_SIZE-5, height-4))
+                                 size=(hint_w, hint_h),
+                                 style=wx.NO_BORDER)
         self.bitmap_bt_console.SetBitmapLabel(console_bmp)
         console_hint = "History of status bar messages"
@@ -165 +173 @@
         """
         rect = self.GetFieldRect(GAUGE_POSITION)
-        self.gauge.SetPosition((rect.x + 5, rect.y))
+        self.gauge.SetPosition((rect.x, rect.y))
         rect = self.GetFieldRect(ICON_POSITION)
-        self.bitmap_bt_warning.SetPosition((rect.x + 5, rect.y))
+        self.bitmap_bt_warning.SetPosition((rect.x, rect.y))
         rect = self.GetFieldRect(CONSOLE_POSITION)
-        self.bitmap_bt_console.SetPosition((rect.x - 5, rect.y))
+        self.bitmap_bt_console.SetPosition((rect.x, rect.y))
         self.sizeChanged = False
         
@@ -269 +277 @@
         if not hasattr(event, "info"):
             return 
+        
+        rect = self.GetFieldRect(ICON_POSITION)
+        width = rect.GetWidth()
+        height = rect.GetHeight()  
+        
         msg = event.info.lower()
         if msg == "warning":
-            icon_bmp =  wx.ArtProvider.GetBitmap(wx.ART_WARNING, wx.ART_TOOLBAR)
+            icon_bmp =  wx.ArtProvider.GetBitmap(wx.ART_WARNING, wx.ART_TOOLBAR,
+                                                 size = (height,height))
             self.bitmap_bt_warning.SetBitmapLabel(icon_bmp)
-        if msg == "error":
-            icon_bmp =  wx.ArtProvider.GetBitmap(wx.ART_ERROR, wx.ART_TOOLBAR)
+        elif msg == "error":
+            icon_bmp =  wx.ArtProvider.GetBitmap(wx.ART_ERROR, wx.ART_TOOLBAR,
+                                                 size = (height,height))
             self.bitmap_bt_warning.SetBitmapLabel(icon_bmp)
-        if msg == "info":
+        else:
             icon_bmp =  wx.ArtProvider.GetBitmap(wx.ART_INFORMATION,
-                                                 wx.ART_TOOLBAR)
+                                                 wx.ART_TOOLBAR,
+                                                 size = (height,height))
             self.bitmap_bt_warning.SetBitmapLabel(icon_bmp)