Changeset b716dd8 in sasview

Timestamp:

Apr 19, 2012 10:39:43 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:

9130227

Parents:

0ea247e

Message:

trying to improve the status bar

File:

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

sansguiframe/src/sans/guiframe/gui_statusbar.py

@@ -106 +106 @@
 
         #Layout of status bar
-        hint_w, hint_h = wx.ArtProvider.GetSizeHint(wx.ART_TOOLBAR)        
+        width, height = wx.ArtProvider.GetSizeHint(wx.ART_TOOLBAR)        
         self.SetFieldsCount(NB_FIELDS) 
         # 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)
+        self.SetStatusWidths([width+4, -2, -1, width+15])
+        self.SetMinHeight(height)
         
         rect = self.GetFieldRect(ICON_POSITION)
-        if rect.height > hint_h:
-            hint_h = rect.height
-            hint_w = rect.width
+        if rect.height > height:
+            height = rect.GetHeight()  
+            width = rect.GetWidth()
         
         #display default message
@@ -121 +121 @@
         
         # Create progress bar
-        self.gauge = wx.Gauge(self, size=(hint_w, hint_h),
+        self.gauge = wx.Gauge(self, size=(width, height),
                                style=wx.GA_HORIZONTAL)
         self.gauge.Hide()
@@ -129 +129 @@
         self.bitmap_bt_warning = \
             wx.BitmapButton(self, -1,
-                            size=(hint_w, hint_h),
+                            size=(width, height),
                             style=wx.NO_BORDER)
                 
@@ -135 +135 @@
         console_bmp = wx.ArtProvider.GetBitmap(wx.ART_INFORMATION, 
                                                wx.ART_TOOLBAR,
-                                               size = (hint_w, hint_h))
+                                               size = (width, height))
         self.bitmap_bt_console = wx.BitmapButton(self, -1, 
-                                 size=(hint_w, hint_h),
+                                 size=(width, height),
                                  style=wx.NO_BORDER)
         self.bitmap_bt_console.SetBitmapLabel(console_bmp)
@@ -178 +178 @@
     def reposition(self):
         """
+            Place the various fields in their proper position
         """
         rect = self.GetFieldRect(GAUGE_POSITION)
@@ -285 +286 @@
             return 
         
+        # Get the size of the button images
+        width, height = wx.ArtProvider.GetSizeHint(wx.ART_TOOLBAR)        
+
+        # Get the size of the field and choose the size of the 
+        # image accordingly
         rect = self.GetFieldRect(ICON_POSITION)
-        width = rect.GetWidth()
-        height = rect.GetHeight()  
+        if rect.height > height:
+            height = rect.GetHeight()
+            width = rect.GetWidth()
         
         msg = event.info.lower()