r10614 - in /branches/bieri_gui/gui_bieri: __init__.py about.py relax_gui.py -- February 02, 2010 - 15:52

Author: bugman
Date: Tue Feb  2 15:52:36 2010
New Revision: 10614

URL: http://svn.gna.org/viewcvs/relax?rev=10614&view=rev
Log:
Name fixes for the GUI about dialog.

The function gui_bieri.about.about_relax() has been renamed to 
gui_bieri.about.show_about_gui() to
better reflect an action.  The class method aboutGUI() has been converted to 
the relax convention
and is now called about_gui().


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=10614&r1=10613&r2=10614&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/__init__.py (original)
+++ branches/bieri_gui/gui_bieri/__init__.py Tue Feb  2 15:52:36 2010
@@ -36,7 +36,7 @@
 
 # relax module imports.
 from relax_errors import RelaxError
-from relax_gui import about_relax, Main
+from relax_gui import show_about_gui, Main
 
 
 __all__ = ['relax_gui']
@@ -67,7 +67,7 @@
     wx.InitAllImageHandlers()
 
     # show about panel
-    about_relax()
+    show_about_gui()
 
     # 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=10614&r1=10613&r2=10614&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/about.py (original)
+++ branches/bieri_gui/gui_bieri/about.py Tue Feb  2 15:52:36 2010
@@ -30,11 +30,11 @@
 
 
 
-def about_relax():
+def show_about_gui():
     about = MyFrame(None, -1, "")
 
     # Temporary disabling of the splash screen - for easier debugging!
-    #about.ShowModal()
+    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=10614&r1=10613&r2=10614&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/relax_gui.py (original)
+++ branches/bieri_gui/gui_bieri/relax_gui.py Tue Feb  2 15:52:36 2010
@@ -44,7 +44,7 @@
 from version import version
 
 # relaxGUI module imports.
-from about import about_relax
+from about import show_about_gui
 from analyses.auto_model_free import Auto_model_free
 from analyses.auto_r1 import Auto_r1
 from analyses.auto_r2 import Auto_r2
@@ -603,8 +603,13 @@
         
self.relax_start_noe1_copy_1.SetSize(self.relax_start_noe1_copy_1.GetBestSize())
 
 
-    def aboutGUI(self, event): # About
-        about_relax()
+    def about_gui(self, event):
+        """Create and display the about message for the GUI."""
+
+        # The dialog.
+        show_about_gui()
+
+        # Terminate the event.
         event.Skip()
 
 
@@ -756,7 +761,7 @@
         menubar.Append(menu, "&Help")
 
         # The 'Help' menu actions.
-        self.Bind(wx.EVT_MENU, self.aboutGUI,   id=41)
+        self.Bind(wx.EVT_MENU, self.about_gui,  id=41)
         self.Bind(wx.EVT_MENU, self.aboutrelax, id=42)