r20205 - /branches/relax_disp/gui/analyses/wizard.py -- June 18, 2013 - 18:55

Author: bugman
Date: Tue Jun 18 18:55:45 2013
New Revision: 20205

URL: http://svn.gna.org/viewcvs/relax?rev=20205&view=rev
Log:
Fix for the button layout in the new analysis GUI wizard.

This was broken at some recent point with the svnmerge.py mergers.


Modified:
    branches/relax_disp/gui/analyses/wizard.py

Modified: branches/relax_disp/gui/analyses/wizard.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/wizard.py?rev=20205&r1=20204&r2=20205&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/wizard.py (original)
+++ branches/relax_disp/gui/analyses/wizard.py Tue Jun 18 18:55:45 2013
@@ -266,14 +266,14 @@
         # The R2 button.
         self.button_r2 = self.create_button(id=self.button_ids['r2'], 
box=sizer1, size=size, bmp=ANALYSIS_IMAGE_PATH+"r2_150x150.png", 
tooltip=u"R\u2082 relaxation curve-fitting analysis", fn=self.select_r2)
 
+        # The model-free button.
+        self.button_mf = self.create_button(id=self.button_ids['mf'], 
box=sizer1, size=size, 
bmp=ANALYSIS_IMAGE_PATH+"model_free"+sep+"model_free_150x150.png", 
tooltip="Model-free analysis", fn=self.select_mf)
+
         # The relaxation dispersion button.
         self.button_disp = 
self.create_button(id=self.button_ids['relax_disp'], box=sizer2, size=size, 
bmp=ANALYSIS_IMAGE_PATH+"relax_disp_150x150.png", tooltip="Relaxation 
dispersion analysis", fn=self.select_disp)
 
         # Consistency testing.
         self.button_consist_test = 
self.create_button(id=self.button_ids['consist_test'], box=sizer2, size=size, 
bmp=ANALYSIS_IMAGE_PATH+"consistency_testing_150x70.png", tooltip="Relaxation 
data consistency testing (disabled)", fn=self.select_consist_test, 
disabled=True)
-
-        # The model-free button.
-        self.button_mf = self.create_button(id=self.button_ids['mf'], 
box=sizer2, size=size, 
bmp=ANALYSIS_IMAGE_PATH+"model_free"+sep+"model_free_150x150.png", 
tooltip="Model-free analysis", fn=self.select_mf)
 
         # The custom analysis button.
         self.button_custom = 
self.create_button(id=self.button_ids['custom'], box=sizer2, size=size, 
bmp=ANALYSIS_IMAGE_PATH+"custom_150x150.png", tooltip="Custom analysis 
(disabled)", fn=self.select_custom, disabled=True)