r16447 - in /branches/uf_redesign: generic_fns/script.py prompt/interpreter.py prompt/uf_objects.py status.py -- May 24, 2012 - 16:55

Author: bugman
Date: Thu May 24 16:55:30 2012
New Revision: 16447

URL: http://svn.gna.org/viewcvs/relax?rev=16447&view=rev
Log:
Renamed the status.prompt_intro flag to status.uf_intro.

This is because the flag will be used in all UIs.


Modified:
    branches/uf_redesign/generic_fns/script.py
    branches/uf_redesign/prompt/interpreter.py
    branches/uf_redesign/prompt/uf_objects.py
    branches/uf_redesign/status.py

Modified: branches/uf_redesign/generic_fns/script.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/generic_fns/script.py?rev=16447&r1=16446&r2=16447&view=diff
==============================================================================
--- branches/uf_redesign/generic_fns/script.py (original)
+++ branches/uf_redesign/generic_fns/script.py Thu May 24 16:55:30 2012
@@ -56,8 +56,8 @@
         raise RelaxError("The script file '%s' does not exist." % file_path)
 
     # Turn on the function intro flag.
-    orig_intro_state = status.prompt_intro
-    status.prompt_intro = True
+    orig_intro_state = status.uf_intro
+    status.uf_intro = True
 
     # Load the interpreter.
     interpreter = prompt.interpreter.Interpreter(show_script=False, 
quit=False, raise_relax_error=True)
@@ -68,4 +68,4 @@
     prompt.interpreter.run_script(local=interpreter._locals, 
script_file=file_path)
 
     # Return the function intro flag to the original value.
-    status.prompt_intro = orig_intro_state
+    status.uf_intro = orig_intro_state

Modified: branches/uf_redesign/prompt/interpreter.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/prompt/interpreter.py?rev=16447&r1=16446&r2=16447&view=diff
==============================================================================
--- branches/uf_redesign/prompt/interpreter.py (original)
+++ branches/uf_redesign/prompt/interpreter.py Thu May 24 16:55:30 2012
@@ -206,9 +206,9 @@
 
 
     def off(self, verbose=True):
-        """Turn the function introductions off."""
-
-        status.prompt_intro = False
+        """Turn the user function introductions off."""
+
+        status.uf_intro = False
 
         # Print out.
         if verbose:
@@ -216,9 +216,9 @@
 
 
     def on(self, verbose=True):
-        """Turn the function introductions on."""
-
-        status.prompt_intro = True
+        """Turn the user function introductions on."""
+
+        status.uf_intro = True
 
         # Print out.
         if verbose:
@@ -273,8 +273,8 @@
 
         # Execute the script file if given.
         if script_file:
-            # Turn on the function intro flag.
-            status.prompt_intro = True
+            # Turn on the user function intro flag.
+            status.uf_intro = True
 
             # Run the script.
             return run_script(intro=self.__intro_string, local=locals(), 
script_file=script_file, quit=self.__quit_flag, 
show_script=self.__show_script, raise_relax_error=self.__raise_relax_error)

Modified: branches/uf_redesign/prompt/uf_objects.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/prompt/uf_objects.py?rev=16447&r1=16446&r2=16447&view=diff
==============================================================================
--- branches/uf_redesign/prompt/uf_objects.py (original)
+++ branches/uf_redesign/prompt/uf_objects.py Thu May 24 16:55:30 2012
@@ -99,7 +99,7 @@
                 uf_kargs[name] = self._kargs[i]['default']
 
         # Function intro text.
-        if status.prompt_intro:
+        if status.uf_intro:
             # Convert the keys and values.
             keys = []
             values = []

Modified: branches/uf_redesign/status.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/status.py?rev=16447&r1=16446&r2=16447&view=diff
==============================================================================
--- branches/uf_redesign/status.py (original)
+++ branches/uf_redesign/status.py Thu May 24 16:55:30 2012
@@ -55,7 +55,7 @@
             self._instance.debug = False
             self._instance.pedantic = False
             self._instance.test_mode = False
-            self._instance.prompt_intro = False
+            self._instance.uf_intro = False
             self._instance.show_gui = False
             self._instance.gui_uf_force_sync = False
             self._instance.install_path = self._instance._det_install_path()