[cig-commits] r5476 - mc/3D/CitcomS/trunk/visual/Mayavi2/citcoms_display

[luis at geodynamics.org]

Author: luis
Date: 2006-12-05 22:55:03 -0800 (Tue, 05 Dec 2006)
New Revision: 5476

Modified:
   mc/3D/CitcomS/trunk/visual/Mayavi2/citcoms_display/mayavi_custom_ui.py
Log:
Group all CitcomS options under a single menu group.


Modified: mc/3D/CitcomS/trunk/visual/Mayavi2/citcoms_display/mayavi_custom_ui.py
===================================================================
--- mc/3D/CitcomS/trunk/visual/Mayavi2/citcoms_display/mayavi_custom_ui.py	2006-12-06 05:58:52 UTC (rev 5475)
+++ mc/3D/CitcomS/trunk/visual/Mayavi2/citcoms_display/mayavi_custom_ui.py	2006-12-06 06:55:03 UTC (rev 5476)
@@ -13,27 +13,43 @@
                       location=Location(path="MenuBar",
                                         after="FileMenuGroup"))
 
-###############################################################################
-
 citcoms_menu = Menu(
     id = "CitcomsMenu",
     name = "&CitcomS",
-    location = Location(path="MenuBar/VisualizeMenu/additions",
-                        after="FiltersMenu"),
+    location = Location(path="MenuBar/CitcomsMenuGroup"),
 )
 
+citcoms_open_menu = Menu(
+    id = "CitcomsOpenMenu",
+    name = "&Open",
+    location = Location(path="MenuBar/CitcomsMenu/additions"),
+)
+
+citcoms_modules_menu = Menu(
+    id = "CitcomsModulesMenu",
+    name = "&Modules",
+    location = Location(path="MenuBar/CitcomsMenu/additions",
+                        after="CitcomsOpenMenu"),
+)
+
+citcoms_filters_menu = Menu(
+    id = "CitcomsFiltersMenu",
+    name = "&Filters",
+    location = Location(path="MenuBar/CitcomsMenu/additions",
+                        after="CitcomsModulesMenu"),
+)
+
 ###############################################################################
 
 # old name: enthought.mayavi.plugins.OpenCitcomSFILES.OpenCitcomSVTKFILE
 citcoms_open_vtk = Action(
     id          = "OpenCitcomsVTKFile",
     class_name  = "citcoms_display.actions.OpenVTKAction",
-    name        = "&CitcomS VTK file",
+    name        = "CitcomS &VTK file",
     #image      = "images/new_scene.png",
     tooltip     = "Open a CitcomS VTK data file",
     description = "Open a CitcomS VTK data file",
-    locations   = [Location(path="MenuBar/FileMenu/OpenMenu/additions",
-                            after="OpenVTKFile"),]
+    locations   = [Location(path="MenuBar/CitcomsMenu/CitcomsOpenMenu/additions")]
 )
 
 # old name: enthought.mayavi.plugins.OpenCitcomSFILES.OpenCitcomSHDFFILE
@@ -44,42 +60,46 @@
     #image      = "images/new_scene.png",
     tooltip     = "Open a CitcomS HDF5 data file",
     description = "Open a CitcomS HDF5 data file",
-    locations   = [Location(path="MenuBar/FileMenu/OpenMenu/additions",
+    locations   = [Location(path="MenuBar/CitcomsMenu/CitcomsOpenMenu/additions",
                             after="OpenCitcomsVTKFile"),]
 )
 
-# old name: enthought.mayavi.plugins.CitcomSFilterActions.CitcomSshowCaps
-citcoms_cap_filter = Action(
-    id          = "CitcomsCapFilter",
-    class_name  = "citcoms_display.actions.ShowCapsFilterAction",
-    name        = "&Show Citcom Caps",
-    #image      = "images/new_scene.png",
-    tooltip     = "Display a specified range of caps",
-    description = "Display a specified range of caps",
-    locations   = [Location(path="MenuBar/VisualizeMenu/CitcomsMenu/additions"),]
-)
-
 # old name: enthought.mayavi.plugins.CitcomSFilterActions.CitcomSreduce
 citcoms_reduce_filter = Action(
     id          = "CitcomsReduceFilter",
     class_name  = "citcoms_display.actions.ReduceFilterAction",
-    name        = "&Reduce CitcomS grid",
+    name        = "&Reduce Grid",
     #image      = "images/new_scene.png",
     tooltip     = "Display a ReduceGrid for interpolation",
     description = "Display a ReduceGrid for interpolation",
-    locations   = [Location(path="MenuBar/VisualizeMenu/CitcomsMenu/additions"),]
+    locations   = [Location(path="MenuBar/CitcomsMenu/CitcomsFiltersMenu/additions"),]
 )
 
+# old name: enthought.mayavi.plugins.CitcomSFilterActions.CitcomSshowCaps
+citcoms_cap_filter = Action(
+    id          = "CitcomsShowCapsFilter",
+    class_name  = "citcoms_display.actions.ShowCapsFilterAction",
+    name        = "&Show Caps",
+    #image      = "images/new_scene.png",
+    tooltip     = "Display a specified range of caps",
+    description = "Display a specified range of caps",
+    locations   = [Location(path="MenuBar/CitcomsMenu/CitcomsFiltersMenu/additions"),]
+)
+
 ###############################################################################
 
 action_set = WorkbenchActionSet(
-    id = 'CitcomS.action_set',
-    name = 'CitcomsActionSet',
-    menus = [citcoms_menu],
+    id      = 'citcoms_display.action_set',
+    name    = 'CitcomsActionSet',
+    groups  = [citcoms_group],
+    menus   = [citcoms_menu,
+               citcoms_open_menu,
+               citcoms_modules_menu,
+               citcoms_filters_menu,],
     actions = [citcoms_open_vtk,
                citcoms_open_hdf,
-               citcoms_cap_filter,
-               citcoms_reduce_filter,]
+               citcoms_reduce_filter,
+               citcoms_cap_filter,]
 )
 
 ###############################################################################