r10259 - /branches/bieri_gui/gui_bieri/relax_gui.py -- January 19, 2010 - 21:06

Author: bugman
Date: Tue Jan 19 21:06:42 2010
New Revision: 10259

URL: http://svn.gna.org/viewcvs/relax?rev=10259&view=rev
Log:
Clean up of the menubar code.

The SetMenuBar() call has been shifted out of the menu items to the top.  The 
GUI object have been
simplified (shorter names) and are no longer placed in self.


Modified:
    branches/bieri_gui/gui_bieri/relax_gui.py

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=10259&r1=10258&r2=10259&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/relax_gui.py (original)
+++ branches/bieri_gui/gui_bieri/relax_gui.py Tue Jan 19 21:06:42 2010
@@ -193,47 +193,48 @@
         self.panel_1 = wx.Panel(self.r1_1, -1)
         self.panel_3 = wx.Panel(self.panel_1, -1)
         self.noe1 = wx.Panel(self.notebook_3, -1)
-        
+
+
         # Menu Bar
         ##########
 
-        # Create the menu bar GUI item.
-        self.frame_1_menubar = wx.MenuBar()
+        # Create the menu bar GUI item and add it to the main frame.
+        menubar = wx.MenuBar()
+        self.SetMenuBar(menubar)
 
         # The 'File' menu.
-        wxglade_tmp_menu = wx.Menu()
-        wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=1, 
text="&New", icon=NEW_ICON))
-        wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=2, 
text="&Open", icon=OPEN_ICON))
-        wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=3, 
text="S&ave as...", icon=SAVE_AS_ICON))
-        wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=4, 
text="E&xit", icon=EXIT_ICON))
-        self.frame_1_menubar.Append(wxglade_tmp_menu, "&File")
+        menu = wx.Menu()
+        menu.AppendItem(self.build_menu_sub_item(id=1, text="&New", 
icon=NEW_ICON))
+        menu.AppendItem(self.build_menu_sub_item(id=2, text="&Open", 
icon=OPEN_ICON))
+        menu.AppendItem(self.build_menu_sub_item(id=3, text="S&ave as...", 
icon=SAVE_AS_ICON))
+        menu.AppendItem(self.build_menu_sub_item(id=4, text="E&xit", 
icon=EXIT_ICON))
+        menubar.Append(menu, "&File")
 
         # The 'Molecule' menu.
-        wxglade_tmp_menu = wx.Menu()
-        wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=11, 
text="Load &PDB File", icon=LOAD_ICON))
-        wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=12, 
text="Load se&quence file", icon=LOAD_ICON))
-        self.frame_1_menubar.Append(wxglade_tmp_menu, "&Molecule")
+        menu = wx.Menu()
+        menu.AppendItem(self.build_menu_sub_item(id=11, text="Load &PDB 
File", icon=LOAD_ICON))
+        menu.AppendItem(self.build_menu_sub_item(id=12, text="Load se&quence 
file", icon=LOAD_ICON))
+        menubar.Append(menu, "&Molecule")
 
         # The 'Settings' menu.
-        wxglade_tmp_menu = wx.Menu()
-        self.SetMenuBar(self.frame_1_menubar)
-        wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=7, 
text="&Global relax settings", icon=SETTINGS_GLOBAL_ICON))
-        wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=13, 
text="&Parameter file settings", icon=SETTINGS_ICON))
-        wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=14, 
text="Reset a&ll settings", icon=SETTINGS_RESET_ICON))
-        self.frame_1_menubar.Append(wxglade_tmp_menu, "&Settings")
+        menu = wx.Menu()
+        menu.AppendItem(self.build_menu_sub_item(id=7, text="&Global relax 
settings", icon=SETTINGS_GLOBAL_ICON))
+        menu.AppendItem(self.build_menu_sub_item(id=13, text="&Parameter 
file settings", icon=SETTINGS_ICON))
+        menu.AppendItem(self.build_menu_sub_item(id=14, text="Reset a&ll 
settings", icon=SETTINGS_RESET_ICON))
+        menubar.Append(menu, "&Settings")
 
         # The 'Extras' menu.
-        wxglade_tmp_menu = wx.Menu()
-        wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=8, 
text="&Contact relaxGUI", icon=CONTACT_ICON))
-        wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=9, 
text="&References", icon=REF_ICON))
-        self.frame_1_menubar.Append(wxglade_tmp_menu, "&Extras")
+        menu = wx.Menu()
+        menu.AppendItem(self.build_menu_sub_item(id=8, text="&Contact 
relaxGUI", icon=CONTACT_ICON))
+        menu.AppendItem(self.build_menu_sub_item(id=9, text="&References", 
icon=REF_ICON))
+        menubar.Append(menu, "&Extras")
 
         # The 'Help' menu.
-        wxglade_tmp_menu = wx.Menu()
-        wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=10, 
text="&Manual", icon=MANUAL_ICON))
-        wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=5, 
text="About relaxG&UI", icon=ABOUT_RELAXGUI_ICON))
-        wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=6, 
text="About rela&x", icon=ABOUT_RELAX_ICON))
-        self.frame_1_menubar.Append(wxglade_tmp_menu, "&Help")
+        menu = wx.Menu()
+        menu.AppendItem(self.build_menu_sub_item(id=10, text="&Manual", 
icon=MANUAL_ICON))
+        menu.AppendItem(self.build_menu_sub_item(id=5, text="About 
relaxG&UI", icon=ABOUT_RELAXGUI_ICON))
+        menu.AppendItem(self.build_menu_sub_item(id=6, text="About rela&x", 
icon=ABOUT_RELAX_ICON))
+        menubar.Append(menu, "&Help")
 
 
         # NOE 1 no. 1