r10641 - in /branches/bieri_gui: gui_bieri/__init__.py relax -- February 04, 2010 - 02:47

Author: bugman
Date: Thu Feb  4 02:47:30 2010
New Revision: 10641

URL: http://svn.gna.org/viewcvs/relax?rev=10641&view=rev
Log:
Changed how the GUI is launched.

The run() function has been deleted.  Therefore the intro text is gone (see 
the thread starting at
https://mail.gna.org/public/relax-devel/2010-02/msg00016.html).  The wx dep 
check is now inside the
relax main class.


Modified:
    branches/bieri_gui/gui_bieri/__init__.py
    branches/bieri_gui/relax

Modified: branches/bieri_gui/gui_bieri/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/__init__.py?rev=10641&r1=10640&r2=10641&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/__init__.py (original)
+++ branches/bieri_gui/gui_bieri/__init__.py Thu Feb  4 02:47:30 2010
@@ -45,28 +45,6 @@
 
 __all__ = ['relax_gui']
 
-# Execute the GUI.
-def run():
-    """Build the Bieri GUI for relax."""
-
-    # Print the GUI intro.
-    sys.stdout.write('\n\n\n\n\n')
-    sys.stdout.write('##############################################\n')
-    sys.stdout.write('#                                            #\n')
-    sys.stdout.write('#  relaxGUI - graphical interface for relax  #\n')
-    sys.stdout.write('#        (C) 2009 Michael Bieri              #\n')
-    sys.stdout.write('#                                            #\n')
-    sys.stdout.write('##############################################\n')
-    sys.stdout.write('\n\n\n\n')
-
-    # 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.exit()
-
-    # Start the relax GUI wx application.
-    App()
-
 
 
 class App(wx.App):

Modified: branches/bieri_gui/relax
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/relax?rev=10641&r1=10640&r2=10641&view=diff
==============================================================================
--- branches/bieri_gui/relax (original)
+++ branches/bieri_gui/relax Thu Feb  4 02:47:30 2010
@@ -123,8 +123,13 @@
 
         # Execute the Bieri GUI.
         elif mode == 'gui_bieri':
-            self.gui = gui_bieri
-            self.gui.run()
+            # 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.exit()
+
+            # Start the relax GUI wx application.
+            gui_bieri.App()
 
         # Execute the relax test suite
         elif mode == 'test suite':