Author: bugman Date: Wed Feb 3 18:53:58 2010 New Revision: 10636 URL: http://svn.gna.org/viewcvs/relax?rev=10636&view=rev Log: Changed how the intro dialog is shown. The show_about_gui() has been deleted and the code is now directly in gui_bieri.run(). Modified: branches/bieri_gui/gui_bieri/__init__.py branches/bieri_gui/gui_bieri/about.py branches/bieri_gui/gui_bieri/relax_gui.py Modified: branches/bieri_gui/gui_bieri/__init__.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/__init__.py?rev=10636&r1=10635&r2=10636&view=diff ============================================================================== --- branches/bieri_gui/gui_bieri/__init__.py (original) +++ branches/bieri_gui/gui_bieri/__init__.py Wed Feb 3 18:53:58 2010 @@ -35,8 +35,9 @@ import wx # relax module imports. +from about import About_relax, MyFrame from relax_errors import RelaxError -from relax_gui import show_about_gui, Main +from relax_gui import Main __all__ = ['relax_gui'] @@ -60,7 +61,9 @@ wx.InitAllImageHandlers() # show about panel - show_about_gui() + #about = About_relax(None, -1, "") + about = MyFrame(None, -1, "") + about.ShowModal() # Dependency check. if not dep_check.wx_module: Modified: branches/bieri_gui/gui_bieri/about.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/about.py?rev=10636&r1=10635&r2=10636&view=diff ============================================================================== --- branches/bieri_gui/gui_bieri/about.py (original) +++ branches/bieri_gui/gui_bieri/about.py Wed Feb 3 18:53:58 2010 @@ -30,14 +30,6 @@ # relax GUI module imports. from paths import IMAGE_PATH - - - -def show_about_gui(): - about = MyFrame(None, -1, "") - - # Temporary disabling of the splash screen - for easier debugging! - #about.ShowModal() 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=10636&r1=10635&r2=10636&view=diff ============================================================================== --- branches/bieri_gui/gui_bieri/relax_gui.py (original) +++ branches/bieri_gui/gui_bieri/relax_gui.py Wed Feb 3 18:53:58 2010 @@ -44,7 +44,7 @@ from version import version # relaxGUI module imports. -from about import About_relax, show_about_gui +from about import About_relax from analyses.auto_model_free import Auto_model_free from analyses.auto_r1 import Auto_r1 from analyses.auto_r2 import Auto_r2