wxGUI/menudata: rename menudata classes

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@53886 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/core/menudata.py

@@ -215,11 +215,11 @@ if __name__ == "__main__":
     sys.path.append(os.path.join(os.getenv("GISBASE"), "etc", "gui", "wxpython"))
     
     if menu == 'manager':
-        from lmgr.menudata     import ManagerData
-        data = ManagerData()
+        from lmgr.menudata     import LayerManagerMenuData
+        data = LayerManagerMenuData()
     else:
-        from gmodeler.menudata import ModelerData
-        data = ModelerData()
+        from gmodeler.menudata import ModelerMenuData
+        data = ModelerMenuData()
     
     if action == 'strings':
         data.PrintStrings(sys.stdout)

gui/wxpython/core/modulesdata.py

@@ -23,7 +23,7 @@ if __name__ == '__main__':
     sys.path.append(os.path.join(os.environ['GISBASE'], "etc", "gui", "wxpython"))
 
 from core import globalvar
-from lmgr.menudata import ManagerData
+from lmgr.menudata import LayerManagerMenuData
 
 
 class ModulesData(object):
@@ -36,7 +36,7 @@ class ModulesData(object):
         if modulesDesc is not None:
             self.moduleDesc = modulesDesc
         else:
-            self.moduleDesc = ManagerData().GetModules()
+            self.moduleDesc = LayerManagerMenuData().GetModules()
 
         self.moduleList = self._getListOfModules()
 

gui/wxpython/gmodeler/frame.py

@@ -42,7 +42,7 @@ from gui_core.preferences import PreferencesBaseDialog
 from core.settings        import UserSettings
 from core.menudata        import MenuData
 from gui_core.menu        import Menu
-from gmodeler.menudata    import ModelerData
+from gmodeler.menudata    import ModelerMenuData
 from gui_core.forms       import GUI
 from gmodeler.preferences import PreferencesDialog, PropertiesDialog
 from gmodeler.toolbars    import ModelerToolbar
@@ -79,7 +79,7 @@ class ModelFrame(wx.Frame):
         self.SetName("Modeler")
         self.SetIcon(wx.Icon(os.path.join(globalvar.ETCICONDIR, 'grass.ico'), wx.BITMAP_TYPE_ICO))
         
-        self.menubar = Menu(parent = self, data = ModelerData())
+        self.menubar = Menu(parent = self, data = ModelerMenuData())
         
         self.SetMenuBar(self.menubar)
         

gui/wxpython/gmodeler/menudata.py

@@ -4,7 +4,7 @@
 @brief wxGUI Graphical Modeler - menu data
 
 Classes:
- - menudata::ModelerData
+ - menudata::ModelerMenuData
 
 (C) 2010-2011 by the GRASS Development Team
 
@@ -19,7 +19,7 @@ import os
 from core                 import globalvar
 from core.menudata        import MenuData
 
-class ModelerData(MenuData):
+class ModelerMenuData(MenuData):
     def __init__(self, filename = None):
         if not filename:
             gisbase = os.getenv('GISBASE')

gui/wxpython/gui_core/menu.py

@@ -27,7 +27,7 @@ from core              import utils
 from core.gcmd         import EncodeString
 from core.settings     import UserSettings
 from gui_core.widgets  import ItemTree
-from lmgr.menudata     import ManagerData
+from lmgr.menudata     import LayerManagerMenuData
 from gui_core.ghelp    import SearchModuleWindow
 
 class Menu(wx.MenuBar):
@@ -134,7 +134,7 @@ class MenuTreeWindow(wx.Panel):
         self.dataBox = wx.StaticBox(parent = self, id = wx.ID_ANY,
                                     label = " %s " % _("Menu tree (double-click or Ctrl-Enter to run command)"))
         # tree
-        menuData = ManagerData()
+        menuData = LayerManagerMenuData()
         self.tree = MenuTree(parent = self, data = menuData)
         self.tree.Load()
 

gui/wxpython/gui_core/prompt.py

@@ -34,7 +34,7 @@ from grass.script import task as gtask
 
 from core          import globalvar
 from core          import utils
-from lmgr.menudata import ManagerData
+from lmgr.menudata import LayerManagerMenuData
 from core.gcmd     import EncodeString, DecodeString, GetRealCmd
 
 class PromptListCtrl(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin):

gui/wxpython/lmgr/frame.py

@@ -44,7 +44,7 @@ from core.settings         import UserSettings, GetDisplayVectSettings
 from core.utils            import SetAddOnPath
 from gui_core.preferences  import MapsetAccess, PreferencesDialog, EVT_SETTINGS_CHANGED
 from lmgr.layertree        import LayerTree, LMIcons
-from lmgr.menudata         import ManagerData
+from lmgr.menudata         import LayerManagerMenuData
 from gui_core.widgets      import GNotebook
 from modules.mcalc_builder import MapCalcFrame
 from dbmgr.manager         import AttributeManager
@@ -214,7 +214,7 @@ class GMFrame(wx.Frame):
         
     def _createMenuBar(self):
         """!Creates menu bar"""
-        self.menubar = Menu(parent = self, data = ManagerData())
+        self.menubar = Menu(parent = self, data = LayerManagerMenuData())
         self.SetMenuBar(self.menubar)
         self.menucmd = self.menubar.GetCmd()
         

gui/wxpython/lmgr/menudata.py

@@ -1,32 +1,18 @@
 """!
-@package lmrg.menudata
+@package lmgr.menudata
 
-@brief Complex list for menu entries for wxGUI
+@brief wxGUI Layer Manager - menu data
 
 Classes:
- - menudata::MenuData
+ - menudata::LayerManagerMenuData
 
-Usage:
-@code
-python menudata.py [action] [manager|modeler]
-@endcode
 
-where <i>action</i>:
- - strings (default)
- - tree
- - commands
- - dump
-
-(C) 2007-2011 by the GRASS Development Team
+(C) 2007-2012 by the GRASS Development Team
 
 This program is free software under the GNU General Public License
 (>=v2). Read the file COPYING that comes with GRASS for details.
 
-@author Michael Barton (Arizona State University)
-@author Yann Chemin <yann.chemin gmail.com>
 @author Martin Landa <landa.martin gmail.com>
-@author Glynn Clements
-@author Anna Kratochvilova <kratochanna gmail.com>
 """
 
 import os
@@ -35,12 +21,12 @@ import sys
 from core.globalvar import ETCWXDIR
 from core.menudata  import MenuData
 
-class ManagerData(MenuData):
+class LayerManagerMenuData(MenuData):
     def __init__(self, filename = None):
         if not filename:
             gisbase = os.getenv('GISBASE')
             global etcwxdir
-	    filename = os.path.join(ETCWXDIR, 'xml', 'menudata.xml')
+            filename = os.path.join(ETCWXDIR, 'xml', 'menudata.xml')
         
         MenuData.__init__(self, filename)
         

gui/wxpython/psmap/frame.py

@@ -39,7 +39,7 @@ from psmap.toolbars     import PsMapToolbar
 from core.gcmd          import RunCommand, GError, GMessage
 from core.settings      import UserSettings
 from gui_core.forms     import GUI
-from psmap.menudata     import PsMapData
+from psmap.menudata     import PsMapMenuData
 
 from psmap.dialogs      import *
 from psmap.instructions import *
@@ -61,7 +61,7 @@ class PsMapFrame(wx.Frame):
         wx.Frame.__init__(self, parent = parent, id = id, title = title, name = "PsMap", **kwargs)
         self.SetIcon(wx.Icon(os.path.join(globalvar.ETCICONDIR, 'grass.ico'), wx.BITMAP_TYPE_ICO))
         #menubar
-        self.menubar = Menu(parent = self, data = PsMapData())
+        self.menubar = Menu(parent = self, data = PsMapMenuData())
         self.SetMenuBar(self.menubar)
         #toolbar
 

gui/wxpython/psmap/menudata.py

@@ -4,7 +4,7 @@
 @brief wxPsMap - menu entries
 
 Classes:
- - menudata::PsMapData
+ - menudata::PsMapMenuData
 
 (C) 2011 by the GRASS Development Team
 
@@ -19,7 +19,7 @@ import os
 from core                 import globalvar
 from core.menudata        import MenuData
 
-class PsMapData(MenuData):
+class PsMapMenuData(MenuData):
     def __init__(self, path = None):
         """!Menu for Cartographic Composer (psmap.py)
         

gui/wxpython/tools/update_menudata.py

@@ -32,7 +32,7 @@ from grass.script import task as gtask
 
 if __name__ == "__main__":
     sys.path.append(os.path.join(os.getenv('GISBASE'), 'etc', 'gui', 'wxpython'))
-from lmgr.menudata  import ManagerData
+from lmgr.menudata  import LayerManagerMenuData
 from core.globalvar import grassCmd
 
 def parseModules():
@@ -151,7 +151,7 @@ def main(argv = None):
     modules = dict()
     modules = parseModules()
     grass.info("Step 3: reading menu data...")
-    data = ManagerData()
+    data = LayerManagerMenuData()
     grass.info("Step 4: updating menu data...")
     updateData(data, modules)
     

gui/wxpython/wxpythonlib.dox

@@ -186,7 +186,7 @@ available in GRASS 5 and GRASS 6.
 - lmgr::layertree
  - lmgr::LayerTree
 - lmgr::menudata
- - menudata::MenuData
+ - menudata::LayerManagerMenuData
 - lmgr::pyshell
  - pyshell::PyShellWindow
 - lmgr::toolbars
@@ -295,7 +295,7 @@ available in GRASS 5 and GRASS 6.
  - frame::ItemPanel
  - frame::PythonPanel
 - gmodeler::menudata
- - menudata::ModelerData
+ - menudata::ModelerMenuData
 - gmodeler::model
  - model::Model
  - model::ModelObject
@@ -409,7 +409,7 @@ available in GRASS 5 and GRASS 6.
  - frame::PsMapFrame
  - frame::PsMapBufferedWindow
 - psmap::menudata
- - menudata::PsMapData
+ - menudata::PsMapMenuData
 - psmap::toolbars
  - toolbars::PsMapToolbar