Author: bugman
Date: Sun May 13 16:38:18 2012
New Revision: 16281
URL: http://svn.gna.org/viewcvs/relax?rev=16281&view=rev
Log:
Shifted the user function menu creation into gui.uf_objects.build_uf_menus().
This will allow the code to be reused by the spin viewer window.
Modified:
branches/uf_redesign/gui/menu.py
branches/uf_redesign/gui/uf_objects.py
Modified: branches/uf_redesign/gui/menu.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/menu.py?rev=16281&r1=16280&r2=16281&view=diff
==============================================================================
--- branches/uf_redesign/gui/menu.py (original)
+++ branches/uf_redesign/gui/menu.py Sun May 13 16:38:18 2012
@@ -37,7 +37,7 @@
# relax GUI module imports.
from gui import paths
from gui.components.menu import build_menu_item
-from gui.uf_objects import Uf_storage
+from gui.uf_objects import build_uf_menus
class Menu:
@@ -118,7 +118,7 @@
self.gui.Bind(wx.EVT_MENU, self.gui.show_pipe_editor,
id=self.MENU_VIEW_PIPE_EDIT)
# The auto generated 'User functions' menu entries.
- self._user_functions()
+ self.menu_uf_id = build_uf_menus(parent=self.gui,
menubar=self.menubar)
# The 'Tools' menu entries.
menu = wx.Menu()
@@ -233,76 +233,6 @@
uf_storage['sys_info']()
- def _user_functions(self):
- """Auto-generate the user function sub-menu."""
-
- # The menu.
- menu = wx.Menu()
-
- # Initialise some variables.
- class_list = []
- store = Uf_storage()
-
- # Loop over the user functions.
- class_item = None
- for name, data in uf_info.uf_loop():
- # Split up the name.
- if search('\.', name):
- class_name, uf_name = split(name, '.')
- else:
- class_name = None
-
- # Generate a sub menu.
- if class_name:
- if class_name not in class_list:
- # Add the last sub menu.
- if class_item != None:
- menu.AppendItem(class_item)
-
- # Get the user function class data object.
- class_data = uf_info.get_class(class_name)
-
- # Create a unique ID.
- class_id = wx.NewId()
-
- # Create the menu entry.
- class_item = build_menu_item(menu, id=class_id,
text=class_data.menu_text, icon=fetch_icon(class_data.gui_icon, size='16x16'))
-
- # Initialise the sub menu.
- sub_menu = wx.Menu()
- class_item.SetSubMenu(sub_menu)
-
- # Add the class name to the list to block further sub
menu creation.
- class_list.append(class_name)
-
- # Create the user function menu entry.
- uf_id = wx.NewId()
- sub_menu.AppendItem(build_menu_item(sub_menu, id=uf_id,
text=data.menu_text, icon=fetch_icon(data.gui_icon, size='16x16')))
-
- # No sub menu.
- else:
- # Add the last sub menu.
- if class_item != None:
- menu.AppendItem(class_item)
- class_item = None
-
- # The menu item.
- uf_id = wx.NewId()
- menu.AppendItem(build_menu_item(menu, id=uf_id,
text=data.menu_text, icon=fetch_icon(data.gui_icon, size='16x16')))
-
- # Bind the menu item.
- self.gui.Bind(wx.EVT_MENU, store[name], id=uf_id)
-
- # Add the very last sub menu.
- if class_item != None:
- menu.AppendItem(class_item)
-
- # Add the sub-menu.
- title = "&User functions"
- self.menubar.Append(menu, title)
- self.menu_uf_id = self.menubar.FindMenu(title)
-
-
def update_menus(self, event):
"""Update the menus dependent on the relax state.
Modified: branches/uf_redesign/gui/uf_objects.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/uf_objects.py?rev=16281&r1=16280&r2=16281&view=diff
==============================================================================
--- branches/uf_redesign/gui/uf_objects.py (original)
+++ branches/uf_redesign/gui/uf_objects.py Sun May 13 16:38:18 2012
@@ -32,16 +32,99 @@
# relax module imports.
import arg_check
+from graphics import fetch_icon
from prompt.base_class import _strip_lead
from relax_errors import AllRelaxErrors, RelaxError
from user_functions.data import Uf_info; uf_info = Uf_info()
# relax GUI imports.
from gui.components.free_file_format import Free_file_format
+from gui.components.menu import build_menu_item
from gui.errors import gui_raise
from gui.fonts import font
from gui.interpreter import Interpreter; interpreter = Interpreter()
from gui.wizard import Wiz_page, Wiz_window
+
+
+def build_uf_menus(parent=None, menubar=None):
+ """Auto-generate the user function sub-menu.
+
+ @keyword parent: The parent window to bind the events to.
+ @type parent: wx instance
+ @keyword menubar: The menubar to attach the user function menus to.
+ @type menubar: wx.MenuBar instance
+ @return: The menu ID.
+ @rtype: int
+ """
+
+ # The user function menu.
+ menu = wx.Menu()
+
+ # Initialise some variables.
+ class_list = []
+ uf_store = Uf_storage()
+
+ # Loop over the user functions.
+ class_item = None
+ for name, data in uf_info.uf_loop():
+ # Split up the name.
+ if search('\.', name):
+ class_name, uf_name = split(name, '.')
+ else:
+ class_name = None
+
+ # Generate a sub menu.
+ if class_name:
+ if class_name not in class_list:
+ # Add the last sub menu.
+ if class_item != None:
+ menu.AppendItem(class_item)
+
+ # Get the user function class data object.
+ class_data = uf_info.get_class(class_name)
+
+ # Create a unique ID.
+ class_id = wx.NewId()
+
+ # Create the menu entry.
+ class_item = build_menu_item(menu, id=class_id,
text=class_data.menu_text, icon=fetch_icon(class_data.gui_icon, size='16x16'))
+
+ # Initialise the sub menu.
+ sub_menu = wx.Menu()
+ class_item.SetSubMenu(sub_menu)
+
+ # Add the class name to the list to block further sub menu
creation.
+ class_list.append(class_name)
+
+ # Create the user function menu entry.
+ uf_id = wx.NewId()
+ sub_menu.AppendItem(build_menu_item(sub_menu, id=uf_id,
text=data.menu_text, icon=fetch_icon(data.gui_icon, size='16x16')))
+
+ # No sub menu.
+ else:
+ # Add the last sub menu.
+ if class_item != None:
+ menu.AppendItem(class_item)
+ class_item = None
+
+ # The menu item.
+ uf_id = wx.NewId()
+ menu.AppendItem(build_menu_item(menu, id=uf_id,
text=data.menu_text, icon=fetch_icon(data.gui_icon, size='16x16')))
+
+ # Bind the menu item to the parent.
+ parent.Bind(wx.EVT_MENU, uf_store[name], id=uf_id)
+
+ # Add the very last sub menu.
+ if class_item != None:
+ menu.AppendItem(class_item)
+
+ # Add the user function menu to the menu bar.
+ title = "&User functions"
+ menubar.Append(menu, title)
+
+ # Return the menu ID.
+ return menubar.FindMenu(title)
+
class Uf_object(object):
r16281 - in /branches/uf_redesign/gui: menu.py uf_objects.py