r19886 - in /branches/relax_disp: ./ gui/analyses/base.py -- June 06, 2013 - 13:57

Author: bugman
Date: Thu Jun  6 13:57:34 2013
New Revision: 19886

URL: http://svn.gna.org/viewcvs/relax?rev=19886&view=rev
Log:
Merged revisions 19885 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r19885 | bugman | 2013-06-06 12:03:26 +0200 (Thu, 06 Jun 2013) | 3 lines
  
  Changed the "Execute analysis" button text back to the original "Execute" 
text of the old relax GUI.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/gui/analyses/base.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun  6 13:57:34 2013
@@ -1,1 +1,1 @@
-/trunk:1-19883
+/trunk:1-19885

Modified: branches/relax_disp/gui/analyses/base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/base.py?rev=19886&r1=19885&r2=19886&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/base.py (original)
+++ branches/relax_disp/gui/analyses/base.py Thu Jun  6 13:57:34 2013
@@ -147,7 +147,7 @@
         id = wx.NewId()
 
         # The button.
-        button = buttons.ThemedGenBitmapTextButton(self, id, None, " Execute 
analysis")
+        button = buttons.ThemedGenBitmapTextButton(self, id, None, " 
Execute")
         button.SetBitmapLabel(wx.Bitmap(paths.IMAGE_PATH+'relax_start.gif', 
wx.BITMAP_TYPE_ANY))
         button.SetFont(font.normal)
         self.gui.Bind(wx.EVT_BUTTON, method, button)