Changeset a1a252e in sasview

Timestamp:

Apr 12, 2011 3:32:49 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

be738e3

Parents:

0a2fdca

Message:

a little touch on toolbar

File:

• guiframe/gui_toolbar.py (modified) (4 diffs)

guiframe/gui_toolbar.py

@@ -47 +47 @@
         button_type =  wx.ITEM_NORMAL
 
-        self.AddSeparator()
         reset_im = GUIFRAME_ICON.RESET_ICON
         reset_im.Rescale(tbar_size[0], tbar_size[1], wx.IMAGE_QUALITY_HIGH)
@@ -93 +92 @@
         self.AddSeparator()
         #add button for the current application
-        self.button_application = wx.StaticText(self, -1, 'Welcome')
-        self.button_application.SetForegroundColour('black')
-        self.button_application.SetBackgroundColour('#1874CD')
-        hint = 'Active Application'
-        self.button_application.SetToolTipString(hint)
-        self.AddControl(self.button_application)
-        self.AddSeparator()
-         #add button for the panel on focus
-        self.button_panel = wx.StaticText(self, -1, 'No Panel')
-        self.button_panel.SetForegroundColour('black')
-        self.button_panel.SetBackgroundColour('#90EE90')
-        hint = 'Panel on Focus'
-        self.button_panel.SetToolTipString(hint)
-        self.AddControl(self.button_panel)
+        #self.button_application = wx.StaticText(self, -1, 'Welcome')
+        #self.button_application.SetForegroundColour('black')
+        #self.button_application.SetBackgroundColour('#1874CD')
+        #hint = 'Active Application'
+        #self.button_application.SetToolTipString(hint)
+        #self.AddControl(self.button_application)
+        #self.AddSeparator()
+        
         self._bookmark_bt = PlateButton(self, -1, 'bookmark', 
                          GUIFRAME_ICON.BOOKMARK_ICON.ConvertToBitmap(), 
@@ -121 +114 @@
        
         self.SetToolBitmapSize(tbar_size)
+        self.AddSeparator()
+        #add button for the panel on focus
+        self.button_panel = wx.StaticText(self, -1, 'No Panel', 
+                                          style=wx.SUNKEN_BORDER|wx.ALIGN_LEFT)
+        #self.button_panel.SetForegroundColour('black')
+        #self.button_panel.SetBackgroundColour('white')
+        button_panel_font = self.button_panel.GetFont()
+        button_panel_font.SetWeight(wx.BOLD)
+        self.button_panel.SetFont(button_panel_font)
+        #self.button_panel.SetClientSize((80,20))
+        hint = 'Control Panel on Focus'
+        self.button_panel.SetToolTipString(hint)
+        self.AddControl(self.button_panel)
+        
         self.Realize()
         
@@ -142 +149 @@
         """
         """
-        self.button_application.SetLabel(str(application_name))
+        #self.button_application.SetLabel(str(application_name))
         self.button_panel.SetLabel(str(panel_name))