Author: bugman
Date: Wed Dec 8 17:26:33 2010
New Revision: 11742
URL: http://svn.gna.org/viewcvs/relax?rev=11742&view=rev
Log:
Renamed build_menu_sub_item() to _build_menu_item().
Modified:
branches/bieri_gui/gui_bieri/menu.py
Modified: branches/bieri_gui/gui_bieri/menu.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/menu.py?rev=11742&r1=11741&r2=11742&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/menu.py (original)
+++ branches/bieri_gui/gui_bieri/menu.py Wed Dec 8 17:26:33 2010
@@ -46,13 +46,13 @@
# The 'File' menu entries.
menu = wx.Menu()
- menu.AppendItem(self.build_menu_sub_item(menu, id=0,
text="&New\tCtrl+N", icon=paths.icon_16x16.new))
- menu.AppendItem(self.build_menu_sub_item(menu, id=1,
text="&Open\tCtrl+O", icon=paths.icon_16x16.open))
- menu.AppendSeparator()
- menu.AppendItem(self.build_menu_sub_item(menu, id=2,
text="S&ave\tCtrl+S", icon=paths.icon_16x16.save))
- menu.AppendItem(self.build_menu_sub_item(menu, id=3, text="Save
as...\tCtrl+Shift+S", icon=paths.icon_16x16.save_as))
- menu.AppendSeparator()
- menu.AppendItem(self.build_menu_sub_item(menu, id=4,
text="E&xit\tCtrl+Q", icon=paths.icon_16x16.exit))
+ menu.AppendItem(self._build_menu_item(menu, id=0,
text="&New\tCtrl+N", icon=paths.icon_16x16.new))
+ menu.AppendItem(self._build_menu_item(menu, id=1,
text="&Open\tCtrl+O", icon=paths.icon_16x16.open))
+ menu.AppendSeparator()
+ menu.AppendItem(self._build_menu_item(menu, id=2,
text="S&ave\tCtrl+S", icon=paths.icon_16x16.save))
+ menu.AppendItem(self._build_menu_item(menu, id=3, text="Save
as...\tCtrl+Shift+S", icon=paths.icon_16x16.save_as))
+ menu.AppendSeparator()
+ menu.AppendItem(self._build_menu_item(menu, id=4,
text="E&xit\tCtrl+Q", icon=paths.icon_16x16.exit))
self.menubar.Append(menu, "&File")
# The 'File' menu actions.
@@ -64,9 +64,9 @@
# The 'View' menu entries.
menu = wx.Menu()
- menu.AppendItem(self.build_menu_sub_item(menu, id=50,
text="&Controller\tCtrl+Z", icon=paths.icon_16x16.controller))
- menu.AppendItem(self.build_menu_sub_item(menu, id=51, text="relax
&prompt\tCtrl+P", icon=paths.icon_16x16.relax_prompt))
- menu.AppendItem(self.build_menu_sub_item(menu, id=52, text="&Spin
view\tCtrl+T", icon=paths.icon_16x16.spin))
+ menu.AppendItem(self._build_menu_item(menu, id=50,
text="&Controller\tCtrl+Z", icon=paths.icon_16x16.controller))
+ menu.AppendItem(self._build_menu_item(menu, id=51, text="relax
&prompt\tCtrl+P", icon=paths.icon_16x16.relax_prompt))
+ menu.AppendItem(self._build_menu_item(menu, id=52, text="&Spin
view\tCtrl+T", icon=paths.icon_16x16.spin))
self.menubar.Append(menu, "&View")
# The 'View' actions.
@@ -79,8 +79,8 @@
# The 'Molecule' menu entries.
menu = wx.Menu()
- menu.AppendItem(self.build_menu_sub_item(menu, id=10, text="Load
&PDB File", icon=paths.icon_16x16.load))
- menu.AppendItem(self.build_menu_sub_item(menu, id=11, text="Load
se&quence file", icon=paths.icon_16x16.load))
+ menu.AppendItem(self._build_menu_item(menu, id=10, text="Load &PDB
File", icon=paths.icon_16x16.load))
+ menu.AppendItem(self._build_menu_item(menu, id=11, text="Load
se&quence file", icon=paths.icon_16x16.load))
self.menubar.Append(menu, "&Molecule")
# The 'Molecule' menu actions.
@@ -89,9 +89,9 @@
# The 'Settings' menu entries.
menu = wx.Menu()
- menu.AppendItem(self.build_menu_sub_item(menu, id=20, text="&Global
relax settings", icon=paths.icon_16x16.settings_global))
- menu.AppendItem(self.build_menu_sub_item(menu, id=21,
text="&Parameter file settings", icon=paths.icon_16x16.settings))
- menu.AppendItem(self.build_menu_sub_item(menu, id=22, text="Reset
a&ll settings", icon=paths.icon_16x16.settings_reset))
+ menu.AppendItem(self._build_menu_item(menu, id=20, text="&Global
relax settings", icon=paths.icon_16x16.settings_global))
+ menu.AppendItem(self._build_menu_item(menu, id=21, text="&Parameter
file settings", icon=paths.icon_16x16.settings))
+ menu.AppendItem(self._build_menu_item(menu, id=22, text="Reset a&ll
settings", icon=paths.icon_16x16.settings_reset))
self.menubar.Append(menu, "&Settings")
# The 'Settings' menu actions.
@@ -101,13 +101,13 @@
# The 'Help' menu entries.
menu = wx.Menu()
- menu.AppendItem(self.build_menu_sub_item(menu, id=40, text="relax
user &manual\tF1", icon=paths.icon_16x16.manual))
- menu.AppendSeparator()
- menu.AppendItem(self.build_menu_sub_item(menu, id=41, text="&Contact
relaxGUI (relax-users@xxxxxxx)", icon=paths.icon_16x16.contact))
- menu.AppendItem(self.build_menu_sub_item(menu, id=42,
text="&References", icon=paths.icon_16x16.ref))
- menu.AppendSeparator()
- menu.AppendItem(self.build_menu_sub_item(menu, id=43, text="About
relaxG&UI", icon=paths.icon_16x16.about_relaxgui))
- menu.AppendItem(self.build_menu_sub_item(menu, id=44, text="About
rela&x", icon=paths.icon_16x16.about_relax))
+ menu.AppendItem(self._build_menu_item(menu, id=40, text="relax user
&manual\tF1", icon=paths.icon_16x16.manual))
+ menu.AppendSeparator()
+ menu.AppendItem(self._build_menu_item(menu, id=41, text="&Contact
relaxGUI (relax-users@xxxxxxx)", icon=paths.icon_16x16.contact))
+ menu.AppendItem(self._build_menu_item(menu, id=42,
text="&References", icon=paths.icon_16x16.ref))
+ menu.AppendSeparator()
+ menu.AppendItem(self._build_menu_item(menu, id=43, text="About
relaxG&UI", icon=paths.icon_16x16.about_relaxgui))
+ menu.AppendItem(self._build_menu_item(menu, id=44, text="About
rela&x", icon=paths.icon_16x16.about_relax))
self.menubar.Append(menu, "&Help")
# The 'Help' menu actions.
@@ -118,65 +118,7 @@
self.gui.Bind(wx.EVT_MENU, self.gui.about_relax, id=44)
- def _create_menu(self, menu, entries):
- """Build the menu."""
-
- # Loop over the menu entries.
- for item in entries:
- # Build the menu entry.
- menu_item = self.build_menu_sub_item(menu, id=item[0],
text=item[1], icon=item[2])
-
- # A sub-menu.
- if len(item[4]):
- # The sub-menu.
- sub_menu = wx.Menu()
-
- # Loop over the sub-menus.
- for sub_item in item[4]:
- # Build the menu entry.
- sub_menu_item = self.build_menu_sub_item(sub_menu,
id=sub_item[0], text=sub_item[1], icon=sub_item[2])
- sub_menu.AppendItem(sub_menu_item)
-
- # The menu actions.
- self.gui.Bind(wx.EVT_MENU, sub_item[3], id=sub_item[0])
-
- # Append the sub-menu.
- menu_item.SetSubMenu(sub_menu)
-
- # A normal menu item.
- else:
- # The menu actions.
- self.gui.Bind(wx.EVT_MENU, item[3], id=item[0])
-
- # Append the menu item.
- menu.AppendItem(menu_item)
-
-
- def _user_functions(self):
- """Build the user function sub-menu."""
-
- # Assign the IDs to the 10000 range.
- id_base = 10000
-
- # The menu.
- menu = wx.Menu()
-
- # The list of entries to build.
- entries = [
- [id_base + 000, "&molecule", paths.icon_16x16.molecule,
self.gui.user_functions.script.run, [
- [id_base + 001, "&add", paths.icon_16x16.add,
self.gui.user_functions.script.run]
- ]],
- [id_base + 100, "&script", paths.icon_16x16.uf_script,
self.gui.user_functions.script.run, []]
- ]
-
- # Build.
- self._create_menu(menu, entries)
-
- # Add the sub-menu.
- self.menubar.Append(menu, "&User functions")
-
-
- def build_menu_sub_item(self, menu, id=None, text='', tooltip='',
icon=None):
+ def _build_menu_item(self, menu, id=None, text='', tooltip='',
icon=None):
"""Construct and return the menu sub-item.
@param menu: The menu object to place this entry in.
@@ -202,3 +144,61 @@
# Return the element.
return element
+
+
+ def _create_menu(self, menu, entries):
+ """Build the menu."""
+
+ # Loop over the menu entries.
+ for item in entries:
+ # Build the menu entry.
+ menu_item = self._build_menu_item(menu, id=item[0],
text=item[1], icon=item[2])
+
+ # A sub-menu.
+ if len(item[4]):
+ # The sub-menu.
+ sub_menu = wx.Menu()
+
+ # Loop over the sub-menus.
+ for sub_item in item[4]:
+ # Build the menu entry.
+ sub_menu_item = self._build_menu_item(sub_menu,
id=sub_item[0], text=sub_item[1], icon=sub_item[2])
+ sub_menu.AppendItem(sub_menu_item)
+
+ # The menu actions.
+ self.gui.Bind(wx.EVT_MENU, sub_item[3], id=sub_item[0])
+
+ # Append the sub-menu.
+ menu_item.SetSubMenu(sub_menu)
+
+ # A normal menu item.
+ else:
+ # The menu actions.
+ self.gui.Bind(wx.EVT_MENU, item[3], id=item[0])
+
+ # Append the menu item.
+ menu.AppendItem(menu_item)
+
+
+ def _user_functions(self):
+ """Build the user function sub-menu."""
+
+ # Assign the IDs to the 10000 range.
+ id_base = 10000
+
+ # The menu.
+ menu = wx.Menu()
+
+ # The list of entries to build.
+ entries = [
+ [id_base + 000, "&molecule", paths.icon_16x16.molecule,
self.gui.user_functions.script.run, [
+ [id_base + 001, "&add", paths.icon_16x16.add,
self.gui.user_functions.script.run]
+ ]],
+ [id_base + 100, "&script", paths.icon_16x16.uf_script,
self.gui.user_functions.script.run, []]
+ ]
+
+ # Build.
+ self._create_menu(menu, entries)
+
+ # Add the sub-menu.
+ self.menubar.Append(menu, "&User functions")
r11742 - /branches/bieri_gui/gui_bieri/menu.py