r16770 - in /branches/uf_redesign/gui: about.py menu.py relax_gui.py -- June 08, 2012 - 14:31

Author: bugman
Date: Fri Jun  8 14:31:33 2012
New Revision: 16770

URL: http://svn.gna.org/viewcvs/relax?rev=16770&view=rev
Log:
Removed the 'Help->About relaxGUI' menu entry as this is not an about window 
but the GUI splash screen.


Modified:
    branches/uf_redesign/gui/about.py
    branches/uf_redesign/gui/menu.py
    branches/uf_redesign/gui/relax_gui.py

Modified: branches/uf_redesign/gui/about.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/about.py?rev=16770&r1=16769&r2=16770&view=diff
==============================================================================
--- branches/uf_redesign/gui/about.py (original)
+++ branches/uf_redesign/gui/about.py Fri Jun  8 14:31:33 2012
@@ -1,7 +1,7 @@
 
###############################################################################
 #                                                                            
 #
 # Copyright (C) 2009 Michael Bieri                                           
 #
-# Copyright (C) 2010-2011 Edward d'Auvergne                                  
 #
+# Copyright (C) 2010-2012 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -32,12 +32,12 @@
 from wx.lib.wordwrap import wordwrap
 
 # relax module imports.
+from graphics import IMAGE_PATH
 from info import Info_box
 from status import Status; status = Status()
 
 # relax GUI module imports.
 from gui.icons import relax_icons
-from gui.paths import IMAGE_PATH
 
 
 class About_base(wx.Frame):
@@ -477,30 +477,6 @@
 
 
 
-class About_gui(About_base):
-    """The about relax GUI dialog."""
-
-    # The background colour.
-    colour1 = 'white'
-
-    # Dimensions.
-    dim_x = 640
-    dim_y = 480
-
-    def build_widget(self):
-        """Build the about dialog."""
-
-        # The title.
-        self.SetTitle("About relax GUI")
-
-        # The image.
-        bitmap = wx.Bitmap(IMAGE_PATH+'relaxGUI_splash.png', 
wx.BITMAP_TYPE_ANY)
-
-        # Draw it.
-        self.dc.DrawBitmap(bitmap, self.border, self.border, True)
-
-
-
 class About_relax(About_base):
     """The about relax dialog."""
 

Modified: branches/uf_redesign/gui/menu.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/menu.py?rev=16770&r1=16769&r2=16770&view=diff
==============================================================================
--- branches/uf_redesign/gui/menu.py (original)
+++ branches/uf_redesign/gui/menu.py Fri Jun  8 14:31:33 2012
@@ -69,7 +69,6 @@
     MENU_HELP_MAIL = wx.NewId()
     MENU_HELP_REFS = wx.NewId()
     MENU_HELP_GPL = wx.NewId()
-    MENU_HELP_ABOUT_GUI = wx.NewId()
     MENU_HELP_ABOUT = wx.NewId()
 
     def __init__(self, gui):
@@ -159,7 +158,6 @@
         menu.AppendSeparator()
         menu.AppendItem(build_menu_item(menu, id=self.MENU_HELP_GPL, 
text="&Licence", icon=paths.icon_16x16.gnu_head))
         menu.AppendSeparator()
-        menu.AppendItem(build_menu_item(menu, id=self.MENU_HELP_ABOUT_GUI, 
text="About relaxG&UI", icon=fetch_icon("relax.relax")))
         menu.AppendItem(build_menu_item(menu, id=self.MENU_HELP_ABOUT, 
text="About rela&x", icon=fetch_icon("relax.relax")))
         self.menubar.Append(menu, "&Help")
 
@@ -168,7 +166,6 @@
         self.gui.Bind(wx.EVT_MENU, self.gui.contact_relax, 
id=self.MENU_HELP_MAIL)
         self.gui.Bind(wx.EVT_MENU, self.gui.references, 
id=self.MENU_HELP_REFS)
         self.gui.Bind(wx.EVT_MENU, self._licence, id=self.MENU_HELP_GPL)
-        self.gui.Bind(wx.EVT_MENU, self.gui.about_gui, 
id=self.MENU_HELP_ABOUT_GUI)
         self.gui.Bind(wx.EVT_MENU, self.gui.about_relax, 
id=self.MENU_HELP_ABOUT)
 
         # Add the menu bar GUI item to the main frame.

Modified: branches/uf_redesign/gui/relax_gui.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/relax_gui.py?rev=16770&r1=16769&r2=16770&view=diff
==============================================================================
--- branches/uf_redesign/gui/relax_gui.py (original)
+++ branches/uf_redesign/gui/relax_gui.py Fri Jun  8 14:31:33 2012
@@ -49,7 +49,7 @@
 from version import version
 
 # relax GUI module imports.
-from gui.about import About_gui, About_relax
+from gui.about import About_relax
 from gui.analyses import Analysis_controller
 from gui.spin_viewer.frame import Spin_view_window
 from gui.controller import Controller
@@ -176,21 +176,6 @@
         self.analysis.load_from_store()
 
 
-    def about_gui(self, event=None):
-        """The about message for the relax GUI.
-
-        @keyword event: The wx event.
-        @type event:    wx event
-        """
-
-        # Build the dialog.
-        dialog = About_gui(None, -1, "")
-
-        # The dialog.
-        if status.show_gui:
-            dialog.Show()
-
-
     def about_relax(self, event=None):
         """The about message for relax.