r16752 - /branches/uf_redesign/gui/spin_viewer/frame.py -- June 08, 2012 - 11:08

Author: bugman
Date: Fri Jun  8 11:08:41 2012
New Revision: 16752

URL: http://svn.gna.org/viewcvs/relax?rev=16752&view=rev
Log:
The spin viewer window now uses graphics.fetch_icon() and shows the button 
text in the toolbar.

The showing of the toolbar text is simply to help the user understand the 
window quicker.


Modified:
    branches/uf_redesign/gui/spin_viewer/frame.py

Modified: branches/uf_redesign/gui/spin_viewer/frame.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/spin_viewer/frame.py?rev=16752&r1=16751&r2=16752&view=diff
==============================================================================
--- branches/uf_redesign/gui/spin_viewer/frame.py (original)
+++ branches/uf_redesign/gui/spin_viewer/frame.py Fri Jun  8 11:08:41 2012
@@ -28,11 +28,11 @@
 
 # relax module imports.
 from generic_fns.pipes import cdp_name, pipe_names
+from graphics import WIZARD_IMAGE_PATH, fetch_icon
 from status import Status; status = Status()
 from relax_errors import RelaxNoPipeError
 
 # relax GUI module imports.
-from gui.paths import icon_32x32, WIZARD_IMAGE_PATH
 from gui.icons import relax_icons
 from gui.misc import gui_raise
 from gui.spin_viewer.splitter import Tree_splitter
@@ -270,11 +270,12 @@
         """Create the toolbar."""
 
         # Init.
-        self.bar = self.CreateToolBar(wx.TB_HORIZONTAL|wx.TB_FLAT)
+        self.bar = self.CreateToolBar(wx.TB_HORIZONTAL|wx.TB_FLAT|wx.TB_TEXT)
 
         # The spin loading button.
         self.spin_loader_id = wx.NewId()
-        self.bar.AddLabelTool(self.spin_loader_id, "Load spins", 
wx.Bitmap(icon_32x32.spin, wx.BITMAP_TYPE_ANY), 
bmpDisabled=wx.Bitmap(icon_32x32.spin_grey, wx.BITMAP_TYPE_ANY), 
shortHelp="Load spins", longHelp="Load spins from either a sequence file or 
from a 3D structure file")
+        tooltip = "Load spins from either a sequence file or from a 3D 
structure file."
+        self.bar.AddLabelTool(self.spin_loader_id, "Load spins", 
wx.Bitmap(fetch_icon('relax.spin', '32x32'), wx.BITMAP_TYPE_ANY), 
bmpDisabled=wx.Bitmap(fetch_icon('relax.spin_grey', '32x32'), 
wx.BITMAP_TYPE_ANY), shortHelp=tooltip, longHelp=tooltip)
         self.Bind(wx.EVT_TOOL, self.load_spins_wizard, 
id=self.spin_loader_id)
 
         # A separator.
@@ -282,7 +283,8 @@
 
         # The refresh button.
         id = wx.NewId()
-        self.bar.AddLabelTool(id, "Refresh", 
wx.Bitmap(icon_32x32.view_refresh, wx.BITMAP_TYPE_ANY), shortHelp="Refresh", 
longHelp="Refresh the spin view")
+        tooltip = "Refresh the spin view."
+        self.bar.AddLabelTool(id, "Refresh", 
wx.Bitmap(fetch_icon('oxygen.actions.view-refresh', '32x32'), 
wx.BITMAP_TYPE_ANY), shortHelp=tooltip, longHelp=tooltip)
         self.Bind(wx.EVT_TOOL, self.refresh, id=id)
 
         # A separator.