r9887 - in /branches/bieri_gui: gui_bieri/__init__.py gui_bieri/relax_gui.py gui_bieri/res/settings.py relax -- November 19, 2009 - 11:51

Author: bugman
Date: Thu Nov 19 11:51:21 2009
New Revision: 9887

URL: http://svn.gna.org/viewcvs/relax?rev=9887&view=rev
Log:
Modifications to the start of the GUI launching.

Much work is still needed to make this clean!


Modified:
    branches/bieri_gui/gui_bieri/__init__.py
    branches/bieri_gui/gui_bieri/relax_gui.py
    branches/bieri_gui/gui_bieri/res/settings.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=9887&r1=9886&r2=9887&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/__init__.py (original)
+++ branches/bieri_gui/gui_bieri/__init__.py Thu Nov 19 11:51:21 2009
@@ -30,7 +30,7 @@
 
 # relax module imports.
 from relax_errors import RelaxError
-from relax_gui import main
+from relax_gui import about_relax, main
 
 
 __all__ = ['relax_gui']
@@ -42,8 +42,28 @@
 """
 
 # Execute the GUI.
-def run():
-    """Build the Bieri GUI for relax."""
+def run(intro_string):
+    """Build the Bieri GUI for relax.
+
+    @param intro_string:    The relax introduction string.
+    @type intro_string:     str
+    """
+
+    # Print the program intro.
+    sys.stdout.write("%s\n" % intro_string)
+
+    # 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')
+
+    # show about panel
+    about_relax('')
 
     # Dependency check.
     if not dep_check.wx_module:

Modified: branches/bieri_gui/gui_bieri/relax_gui.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/relax_gui.py?rev=9887&r1=9886&r2=9887&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/relax_gui.py (original)
+++ branches/bieri_gui/gui_bieri/relax_gui.py Thu Nov 19 11:51:21 2009
@@ -46,19 +46,6 @@
 from generic_fns.mol_res_spin import generate_spin_id, spin_index_loop, 
spin_loop
 from generic_fns import pipes
 from relax_errors import RelaxError
-
-# Start
-print 
'\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n'
-print '##############################################'
-print '#                                            #'
-print '#  relaxGUI - graphical interface for relax  #'
-print '#        (C) 2009 Michael Bieri              #'
-print '#                                            #'
-print '##############################################'
-print '\n\n\n\n'
-
-# show about panel
-about_relax(homedir)
 
 
#####################################################################################################################
 
#####################################################################################################################

Modified: branches/bieri_gui/gui_bieri/res/settings.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/res/settings.py?rev=9887&r1=9886&r2=9887&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/res/settings.py (original)
+++ branches/bieri_gui/gui_bieri/res/settings.py Thu Nov 19 11:51:21 2009
@@ -19,7 +19,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
 #
 #                                                                            
 #
 
###############################################################################
-from wxPython.wx import *
+
+# Python module imports.
+from wxPython.wx import wxFrame
 import wx
 
 

Modified: branches/bieri_gui/relax
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/relax?rev=9887&r1=9886&r2=9887&view=diff
==============================================================================
--- branches/bieri_gui/relax (original)
+++ branches/bieri_gui/relax Thu Nov 19 11:51:21 2009
@@ -131,7 +131,7 @@
         # Execute the Bieri GUI.
         elif mode == 'gui_bieri':
             self.gui = gui_bieri
-            self.gui.run()
+            self.gui.run(intro_string)
 
         # Execute the relax test suite
         elif mode == 'test suite':