r11690 - /branches/bieri_gui/relax -- November 22, 2010 - 16:03

Author: bugman
Date: Mon Nov 22 16:03:42 2010
New Revision: 11690

URL: http://svn.gna.org/viewcvs/relax?rev=11690&view=rev
Log:
Reapplied the temporarily reverted r11578.

.....
  r11582 | bugman | 2010-09-16 14:54:42 +0200 (Thu, 16 Sep 2010) | 23 lines
  Changed paths:
     M /branches/bieri_gui/relax
  
  Temporarily reverted r11578.
  
  The command used was:
  svn merge -r11578:r11577 .
  
  .....
    r11578 | bugman | 2010-09-16 10:22:32 +0200 (Thu, 16 Sep 2010) | 12 lines
    Changed paths:
       M /branches/bieri_gui/relax
                  
    The Bieri GUI is now the default and only GUI for relax.
                      
    The options -b and --bieri have been removed.  The -g and --gui options 
require no following 'bieri'
    argument to launch the GUI.  The GUI can now be started by typing:
    
    $ relax -g
                                
    or:
                                    
    $ relax --gui
  .....
.....
  

Modified:
    branches/bieri_gui/relax

Modified: branches/bieri_gui/relax
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/relax?rev=11690&r1=11689&r2=11690&view=diff
==============================================================================
--- branches/bieri_gui/relax (original)
+++ branches/bieri_gui/relax Mon Nov 22 16:03:42 2010
@@ -122,11 +122,11 @@
             self.interpreter = interpreter.Interpreter()
             self.interpreter.run(self.script_file)
 
-        # Execute the Bieri GUI.
-        elif mode == 'gui_bieri':
+        # Execute the relax GUI.
+        elif mode == 'gui':
             # Dependency check.
             if not dep_check.wx_module:
-                sys.stderr.write("Please install the wx Python module to 
access the Bieri GUI.\n\n")
+                sys.stderr.write("Please install the wx Python module to 
access the relax GUI.\n\n")
                 sys.exit()
 
             # Start the relax GUI wx application.
@@ -183,8 +183,7 @@
         parser.add_option('-l', '--log', action='store', type='string', 
dest='log', help='log relax output to the file LOG_FILE', metavar='LOG_FILE')
         parser.add_option('--licence', action='store_true', dest='licence', 
default=0, help='display the licence')
         parser.add_option('-t', '--tee', action='store', type='string', 
dest='tee', help='tee relax output to stdout and the file LOG_FILE', 
metavar='LOG_FILE')
-        parser.add_option('-g', '--gui', action='store', type='string', 
dest='gui', default=None, help='launch the specified GUI for relax')
-        parser.add_option('-b', '--bieri', action='store_true', 
dest='gui_bieri', default=0, help='launch the Bieri GUI for relax')
+        parser.add_option('-g', '--gui', action='store_true', dest='gui', 
default=0, help='launch the relax GUI')
         parser.add_option('-p', '--pedantic', action='store_true', 
dest='pedantic', default=0, help='escalate all warnings to errors')
         parser.add_option('--test', action='store_true', dest='test', 
default=0, help='run relax in test mode')
         parser.add_option('-x', '--test-suite', action='store_true', 
dest='test_suite', default=0, help='execute the relax test suite')
@@ -316,28 +315,23 @@
             mode = 'script'
 
         # GUI.
-        elif options.gui or options.gui_bieri:
+        elif options.gui:
             # Make sure no script is supplied.
             if self.script_file:
                 parser.error("a script should not be supplied in test mode")
 
             # Exclusive models.
-            if options.gui and options.gui != 'bieri' and options.gui_bieri:
-                parser.error("specifying multiple GUIs is not allowed")
-            elif options.test_suite or options.system_tests or 
options.unit_tests:
+            if options.test_suite or options.system_tests or 
options.unit_tests:
                 parser.error("the relax GUI mode and testing modes are 
mutually exclusive")
             elif options.licence:
                 parser.error("the relax GUI mode and licence mode are 
mutually exclusive")
 
             # Missing wx module.
             if not dep_check.wx_module:
-                parser.error("To use the Bieri GUI, the wx python module 
must be installed.")
+                parser.error("To use the GUI, the wx python module must be 
installed.")
 
             # Set the mode.
-            if options.gui == 'bieri' or options.gui_bieri:
-                mode = 'gui_bieri'
-            else:
-                parser.error("the '%s' GUI interface is unknown" % 
options.gui)
+            mode = 'gui'
 
         # Prompt mode (default).
         else: