Author: bugman
Date: Fri Jun 14 10:32:18 2013
New Revision: 20107
URL: http://svn.gna.org/viewcvs/relax?rev=20107&view=rev
Log:
Merged revisions 20096-20097,20106 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r20096 | bugman | 2013-06-13 17:17:14 +0200 (Thu, 13 Jun 2013) | 3 lines
Added some basic initial relax icons for J couplings.
........
r20097 | bugman | 2013-06-13 17:51:44 +0200 (Thu, 13 Jun 2013) | 3 lines
Created some basic initial GUI wizard graphics for J couplings.
........
r20106 | bugman | 2013-06-14 10:31:41 +0200 (Fri, 14 Jun 2013) | 5 lines
Modified the titles of all the auto-analysis GUI elements.
The text 'Setup for' has been removed as it is meaningless.
........
Added:
branches/relax_disp/graphics/relax_icons/128x128/j_coupling.png
- copied unchanged from r20106,
trunk/graphics/relax_icons/128x128/j_coupling.png
branches/relax_disp/graphics/relax_icons/16x16/j_coupling.png
- copied unchanged from r20106,
trunk/graphics/relax_icons/16x16/j_coupling.png
branches/relax_disp/graphics/relax_icons/22x22/j_coupling.png
- copied unchanged from r20106,
trunk/graphics/relax_icons/22x22/j_coupling.png
branches/relax_disp/graphics/relax_icons/32x32/j_coupling.png
- copied unchanged from r20106,
trunk/graphics/relax_icons/32x32/j_coupling.png
branches/relax_disp/graphics/relax_icons/48x48/j_coupling.png
- copied unchanged from r20106,
trunk/graphics/relax_icons/48x48/j_coupling.png
branches/relax_disp/graphics/relax_icons/svg/j_coupling.svg
- copied unchanged from r20106,
trunk/graphics/relax_icons/svg/j_coupling.svg
branches/relax_disp/graphics/wizards/j_coupling.png
- copied unchanged from r20106, trunk/graphics/wizards/j_coupling.png
branches/relax_disp/graphics/wizards/j_coupling.svg
- copied unchanged from r20106, trunk/graphics/wizards/j_coupling.svg
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/gui/analyses/auto_model_free.py
branches/relax_disp/gui/analyses/auto_noe.py
branches/relax_disp/gui/analyses/auto_rx_base.py
Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun 14 10:32:18 2013
@@ -1,1 +1,1 @@
-/trunk:1-20094
+/trunk:1-20106
Modified: branches/relax_disp/gui/analyses/auto_model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_model_free.py?rev=20107&r1=20106&r2=20107&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_model_free.py (original)
+++ branches/relax_disp/gui/analyses/auto_model_free.py Fri Jun 14 10:32:18
2013
@@ -505,7 +505,7 @@
box = wx.BoxSizer(wx.VERTICAL)
# Add the frame title.
- self.add_title(box, "Setup for model-free analysis")
+ self.add_title(box, "Model-free analysis")
# Display the data pipe.
Text_ctrl(box, self, text="The data pipe bundle:",
default=self.data.pipe_bundle, tooltip="This is the data pipe bundle
associated with this analysis.", editable=False, width_text=self.width_text,
width_button=self.width_button, spacer=self.spacer_horizontal)
Modified: branches/relax_disp/gui/analyses/auto_noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_noe.py?rev=20107&r1=20106&r2=20107&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_noe.py (original)
+++ branches/relax_disp/gui/analyses/auto_noe.py Fri Jun 14 10:32:18 2013
@@ -189,7 +189,7 @@
box = wx.BoxSizer(wx.VERTICAL)
# Add the frame title.
- self.add_title(box, "Setup for steady-state NOE analysis")
+ self.add_title(box, "Steady-state NOE analysis")
# Display the data pipe.
Text_ctrl(box, self, text="The data pipe bundle:",
default=self.data.pipe_bundle, tooltip="This is the data pipe bundle
associated with this analysis.", editable=False, width_text=self.width_text,
width_button=self.width_button, spacer=self.spacer_horizontal)
Modified: branches/relax_disp/gui/analyses/auto_rx_base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_rx_base.py?rev=20107&r1=20106&r2=20107&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_rx_base.py (original)
+++ branches/relax_disp/gui/analyses/auto_rx_base.py Fri Jun 14 10:32:18 2013
@@ -199,7 +199,7 @@
box = wx.BoxSizer(wx.VERTICAL)
# Add the frame title.
- self.add_title(box, "Setup for %s relaxation analysis" %
self.gui_label)
+ self.add_title(box, "%s relaxation analysis" % self.gui_label)
# Display the data pipe.
Text_ctrl(box, self, text="The data pipe bundle:",
default=self.data.pipe_bundle, tooltip="This is the data pipe bundle
associated with this analysis.", editable=False, width_text=self.width_text,
width_button=self.width_button, spacer=self.spacer_horizontal)
r20107 - in /branches/relax_disp: ./ graphics/relax_icons/128x128/ graphics/relax_icons/16x16/ graphics/relax_icons/22x22/ g...