r10653 - in /branches/bieri_gui: ./ intro.py prompt/interpreter.py -- February 04, 2010 - 18:32

Author: bugman
Date: Thu Feb  4 18:32:16 2010
New Revision: 10653

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

........
  r10652 | bugman | 2010-02-04 18:31:37 +0100 (Thu, 04 Feb 2010) | 7 lines
  
  Better UI separation in the Intro_text descriptions.
  
  The 'help' assistance message has been shifted directly into 
prompt.interpreter as it is only part
  of the prompt/script interface.  The GPL message has been changed to 
specify that it is at the
  prompt that you type GPL.
........

Modified:
    branches/bieri_gui/   (props changed)
    branches/bieri_gui/intro.py
    branches/bieri_gui/prompt/interpreter.py

Propchange: branches/bieri_gui/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Feb  4 18:32:16 2010
@@ -1,1 +1,1 @@
-/1.3:1-10645
+/1.3:1-10652

Modified: branches/bieri_gui/intro.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/intro.py?rev=10653&r1=10652&r2=10653&view=diff
==============================================================================
--- branches/bieri_gui/intro.py (original)
+++ branches/bieri_gui/intro.py Thu Feb  4 18:32:16 2010
@@ -63,7 +63,7 @@
         self.copyright.append("Copyright (C) 2006-2010 the relax development 
team")
 
         # Program licence and help.
-        self.licence = "This is free software which you are welcome to 
modify and redistribute under the conditions of the GNU General Public 
License (GPL).  This program, including all modules, is licensed under the 
GPL and comes with absolutely no warranty.  For details type 'GPL'.  
Assistance in using this program can be accessed by typing 'help'."
+        self.licence = "This is free software which you are welcome to 
modify and redistribute under the conditions of the GNU General Public 
License (GPL).  This program, including all modules, is licensed under the 
GPL and comes with absolutely no warranty.  For details type 'GPL' within the 
relax prompt."
 
         # ImportErrors, if any.
         self.errors = []

Modified: branches/bieri_gui/prompt/interpreter.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/interpreter.py?rev=10653&r1=10652&r2=10653&view=diff
==============================================================================
--- branches/bieri_gui/prompt/interpreter.py (original)
+++ branches/bieri_gui/prompt/interpreter.py Thu Feb  4 18:32:16 2010
@@ -168,7 +168,13 @@
         # Program licence and help (wrapped).
         for line in wrap(text.licence, width):
             intro_string = intro_string + line + '\n'
+        intro_string = intro_string + '\n'
  
+        # Help message.
+        help = "Assistance in using the relax prompt and scripting interface 
can be accessed by typing 'help' within the prompt."
+        for line in wrap(help, width):
+            intro_string = intro_string + line + '\n'
+
         # ImportErrors, if any.
         for i in range(len(text.errors)):
             intro_string = intro_string + '\n' + text.errors[i] + '\n'