Changeset caf273b in sasview

Timestamp:

Apr 3, 2014 5:03:28 AM (10 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:

eea3ffa

Parents:

ea67541

Message:

Re #216 Fix toolbar issue.

Location:

src/sans/guiframe

Files:

• gui_manager.py (modified) (4 diffs)
• gui_statusbar.py (modified) (12 diffs)

src/sans/guiframe/gui_manager.py

@@ -229 +229 @@
         """
 
-        PARENT_FRAME.__init__(self, parent=parent, title=title, pos=pos, size=size)
+        PARENT_FRAME.__init__(self, parent=parent, title=title, pos=pos, size=size, style=wx.SYSTEM_MENU | wx.CAPTION | wx.CLOSE_BOX)
         # title
         self.title = title
@@ -978 +978 @@
         # Look for plug-in panels
         panels = []  
-        mac_pos_y = 40  
+        mac_pos_y = 85
         for item in self.plugins:
             if hasattr(item, "get_panels"):
@@ -1048 +1048 @@
             win_height = mac_pos_y
             if IS_LINUX:
-                win_height = mac_pos_y + 55
+                win_height = mac_pos_y + 10
                 self.SetMaxSize((-1, win_height))
             else:
@@ -1239 +1239 @@
         add toolbar to the frame
         """
-        #set toolbar
-        self._toolbar = GUIToolBar(self, -1)
-        self.SetToolBar(self._toolbar)
+        # Set toolbar
+        self._toolbar = GUIToolBar(self)
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.Add(self._toolbar, 0, wx.EXPAND)
+        self.SetSizer(sizer)
         self._update_toolbar_helper()
         self._on_toggle_toolbar(event=None)

src/sans/guiframe/gui_statusbar.py

@@ -4 +4 @@
 from wx.lib import newevent
 import wx.richtext
-import time
 from sans.guiframe.gui_style import GUIFRAME_ICON
-#numner of fields of the status bar 
+
+# Number of fields on the status bar 
 NB_FIELDS = 4
 #position of the status bar's fields
@@ -14 +14 @@
 CONSOLE_POSITION  = 3
 BUTTON_SIZE = 40
-
+STATUS_BAR_ICON_SIZE = 12
 CONSOLE_WIDTH = 500
 CONSOLE_HEIGHT = 300
@@ -49 +49 @@
         color = (0, 0, 0) #black
         icon_bmp =  wx.ArtProvider.GetBitmap(wx.ART_INFORMATION,
-                                                 wx.ART_TOOLBAR)
+                                             wx.ART_TOOLBAR)
         if hasattr(event, "info"):
             icon_type = event.info.lower()
@@ -55 +55 @@
                 color = (0, 0, 255) # blue
                 icon_bmp =  wx.ArtProvider.GetBitmap(wx.ART_WARNING,
-                                                      wx.ART_TOOLBAR)
+                                                     wx.ART_TOOLBAR)
             if icon_type == "error":
                 color = (255, 0, 0) # red
@@ -70 +70 @@
         self.msg_txt.EndTextColour()
         
-           
         
 class Console(wx.Frame):
@@ -84 +83 @@
         wx.EVT_CLOSE(self, self.Close)
         
-        
     def set_multiple_messages(self, messages=[]):
         """
@@ -112 +110 @@
 
         #Layout of status bar
-        width, height = wx.ArtProvider.GetSizeHint(wx.ART_TOOLBAR)        
+        width = STATUS_BAR_ICON_SIZE
+        height = STATUS_BAR_ICON_SIZE
         self.SetFieldsCount(NB_FIELDS) 
         # Leave some space for the resize handle in the last field
         self.SetStatusWidths([width+4, -2, -1, width+15])
         self.SetMinHeight(height)
-        
-        rect = self.GetFieldRect(ICON_POSITION)
-        if rect.height > height:
-            height = rect.GetHeight()  
-            width = rect.GetWidth()
         
         #display default message
@@ -150 +144 @@
         self.bitmap_bt_console.SetToolTipString(console_hint)
         self.bitmap_bt_console.Bind(wx.EVT_BUTTON, self._onMonitor,
-                                            id=self.bitmap_bt_console.GetId())
+                                    id=self.bitmap_bt_console.GetId())
         
         self.reposition()
@@ -174 +168 @@
         self.frame.set_multiple_messages(self.list_msg)
         self.frame.Hide()
-        self.progress = 0      
-        self.timer = wx.Timer(self, -1) 
-        self.timer_stop = wx.Timer(self, -1) 
+        self.progress = 0
+        self.timer = wx.Timer(self, -1)
+        self.timer_stop = wx.Timer(self, -1)
         self.thread = None
         self.Bind(wx.EVT_TIMER, self._on_time, self.timer) 
@@ -219 +213 @@
         icon_bmp = wx.ArtProvider.GetBitmap(wx.ART_INFORMATION, wx.ART_TOOLBAR)
         self.bitmap_bt_warning.SetBitmapLabel(icon_bmp)
-      
+
         if self.frame is not None :
             self.frame.set_message(status=text, event=event)
@@ -297 +291 @@
         
         # 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)
-        if rect.height > height:
-            height = rect.GetHeight()
-            width = rect.GetWidth()
+        height = STATUS_BAR_ICON_SIZE
         
         msg = event.info.lower()
@@ -340 +327 @@
             self.SetStatusText(text=str(event.status), event=event)
        
- 
     def set_gauge(self, event):
         """