Переглянути джерело

wxGUI: rename `dbm` package to `dbmgr` (consilate package name with `lmgr`), `dbm` is also standard Python package

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@49429 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 13 роки тому
батько
коміт
e3bc8ce84b

+ 2 - 2
gui/wxpython/Makefile

@@ -10,12 +10,12 @@ include $(MODULE_TOPDIR)/include/Make/Python.make
 ETCDIR = $(ETC)/gui/wxpython
 ETCDIR = $(ETC)/gui/wxpython
 
 
 SRCFILES := $(wildcard compat/* icons/*.* scripts/* xml/*) \
 SRCFILES := $(wildcard compat/* icons/*.* scripts/* xml/*) \
-	$(wildcard core/* dbm/* gcp/* gmodeler/* gui_core/* lmgr/* location_wizard/* \
+	$(wildcard core/* dbmgr/* gcp/* gmodeler/* gui_core/* lmgr/* location_wizard/* \
 	mapdisp/* modules/* nviz/* psmap/* vdigit/* wxplot/* ) \
 	mapdisp/* modules/* nviz/* psmap/* vdigit/* wxplot/* ) \
 	gis_set.py gis_set_error.py wxgui.py README
 	gis_set.py gis_set_error.py wxgui.py README
 DSTFILES := $(patsubst %,$(ETCDIR)/%,$(SRCFILES)) $(patsubst %.py,$(ETCDIR)/%.pyc,$(filter %.py,$(SRCFILES)))
 DSTFILES := $(patsubst %,$(ETCDIR)/%,$(SRCFILES)) $(patsubst %.py,$(ETCDIR)/%.pyc,$(filter %.py,$(SRCFILES)))
 
 
-PYDSTDIRS := $(patsubst %,$(ETCDIR)/%,core dbm gcp gmodeler gui_core lmgr location_wizard \
+PYDSTDIRS := $(patsubst %,$(ETCDIR)/%,core dbmgr gcp gmodeler gui_core lmgr location_wizard \
 	mapdisp modules nviz psmap vdigit wxplot)
 	mapdisp modules nviz psmap vdigit wxplot)
 DSTDIRS := $(patsubst %,$(ETCDIR)/%,compat icons scripts xml)
 DSTDIRS := $(patsubst %,$(ETCDIR)/%,compat icons scripts xml)
 
 

+ 2 - 2
gui/wxpython/dbm/dialogs.py

@@ -1,5 +1,5 @@
 """!
 """!
-@package dbm.dialogs
+@package dbmgr.dialogs
 
 
 @brief DBM-related dialogs
 @brief DBM-related dialogs
 
 
@@ -24,7 +24,7 @@ import wx.lib.scrolledpanel as scrolled
 from core.gcmd     import RunCommand
 from core.gcmd     import RunCommand
 from core.debug    import Debug
 from core.debug    import Debug
 from core.settings import UserSettings
 from core.settings import UserSettings
-from dbm.vinfo     import VectorDBInfo
+from dbmgr.vinfo   import VectorDBInfo
 
 
 class DisplayAttributesDialog(wx.Dialog):
 class DisplayAttributesDialog(wx.Dialog):
     def __init__(self, parent, map,
     def __init__(self, parent, map,

+ 4 - 4
gui/wxpython/dbm/manager.py

@@ -1,5 +1,5 @@
 """!
 """!
-@package dbm.manager
+@package dbmgr.manager
 
 
 @brief GRASS Attribute Table Manager
 @brief GRASS Attribute Table Manager
 
 
@@ -44,13 +44,13 @@ import wx.lib.flatnotebook    as FN
 
 
 import grass.script as grass
 import grass.script as grass
 
 
-from dbm.sqlbuilder   import SQLFrame
+from dbmgr.sqlbuilder import SQLFrame
 from core.gcmd        import RunCommand, GException, GError
 from core.gcmd        import RunCommand, GException, GError
 from core.utils       import ListOfCatsToRange
 from core.utils       import ListOfCatsToRange
 from gui_core.dialogs import CreateNewVector
 from gui_core.dialogs import CreateNewVector
-from dbm.vinfo        import VectorDBInfo, unicodeValue, createDbInfoDesc
+from dbmgr.vinfo      import VectorDBInfo, unicodeValue, createDbInfoDesc
 from core.debug       import Debug
 from core.debug       import Debug
-from dbm.dialogs      import ModifyTableRecord
+from dbmgr.dialogs    import ModifyTableRecord
 from core.settings    import UserSettings
 from core.settings    import UserSettings
 from gui_core.widgets import GNotebook
 from gui_core.widgets import GNotebook
 
 

+ 3 - 3
gui/wxpython/dbm/sqlbuilder.py

@@ -1,5 +1,5 @@
 """!
 """!
-@package dbm.sqlbuilder
+@package dbmgr.sqlbuilder
 
 
 @brief GRASS SQL Builder
 @brief GRASS SQL Builder
 
 
@@ -29,8 +29,8 @@ import wx
 
 
 import grass.script as grass
 import grass.script as grass
 
 
-from core.gcmd import RunCommand, GError
-from dbm.vinfo import createDbInfoDesc, VectorDBInfo
+from core.gcmd   import RunCommand, GError
+from dbmgr.vinfo import createDbInfoDesc, VectorDBInfo
 
 
 class SQLFrame(wx.Frame):
 class SQLFrame(wx.Frame):
     """!SQL Frame class"""
     """!SQL Frame class"""

+ 1 - 1
gui/wxpython/dbm/vinfo.py

@@ -1,5 +1,5 @@
 """
 """
-@package dbm.vinfo
+@package dbmgr.vinfo
 
 
 @brief Support classes for Database Manager
 @brief Support classes for Database Manager
 
 

+ 1 - 1
gui/wxpython/mapdisp/frame.py

@@ -43,7 +43,7 @@ from vdigit.toolbars    import VDigitToolbar
 from mapdisp.toolbars   import MapToolbar
 from mapdisp.toolbars   import MapToolbar
 from mapdisp.gprint     import PrintOptions
 from mapdisp.gprint     import PrintOptions
 from core.gcmd          import GError, GMessage, RunCommand
 from core.gcmd          import GError, GMessage, RunCommand
-from dbm.dialogs        import DisplayAttributesDialog
+from dbmgr.dialogs      import DisplayAttributesDialog
 from core.utils         import ListOfCatsToRange, GetLayerNameFromCmd
 from core.utils         import ListOfCatsToRange, GetLayerNameFromCmd
 from gui_core.dialogs   import GetImageHandlers, ImageSizeDialog, DecorationDialog, TextLayerDialog
 from gui_core.dialogs   import GetImageHandlers, ImageSizeDialog, DecorationDialog, TextLayerDialog
 from core.debug         import Debug
 from core.debug         import Debug

+ 1 - 1
gui/wxpython/psmap/dialogs.py

@@ -73,7 +73,7 @@ except ImportError:
 import grass.script as grass
 import grass.script as grass
 
 
 from core             import globalvar
 from core             import globalvar
-from dbm.vinfo        import VectorDBInfo
+from dbmgr.vinfo      import VectorDBInfo
 from core.utils       import CmdToTuple, GetCmdString
 from core.utils       import CmdToTuple, GetCmdString
 from gui_core.gselect import Select
 from gui_core.gselect import Select
 from core.gcmd        import RunCommand, GError, GMessage, GWarning
 from core.gcmd        import RunCommand, GError, GMessage, GWarning

+ 1 - 1
gui/wxpython/vdigit/mapwindow.py

@@ -16,7 +16,7 @@ This program is free software under the GNU General Public License
 
 
 import wx
 import wx
 
 
-from dbm.dialogs    import DisplayAttributesDialog
+from dbmgr.dialogs  import DisplayAttributesDialog
 from core.gcmd      import RunCommand, GMessage, GError
 from core.gcmd      import RunCommand, GMessage, GError
 from core.debug     import Debug
 from core.debug     import Debug
 from mapdisp.mapwindow import BufferedWindow
 from mapdisp.mapwindow import BufferedWindow

+ 6 - 6
gui/wxpython/wxpythonlib.dox

@@ -28,7 +28,7 @@ vector digitizer or georectification tool are also available.
  - \ref lmgr
  - \ref lmgr
  - \ref mapdisp
  - \ref mapdisp
  - \ref wscreen
  - \ref wscreen
- - \ref dbm
+ - \ref dbmgr
  - \ref gpc
  - \ref gpc
  - \ref gmodeler
  - \ref gmodeler
  - \ref vdigit
  - \ref vdigit
@@ -228,21 +228,21 @@ available in GRASS 5 and GRASS 6.
  - gis_set::StartUp
  - gis_set::StartUp
  - gis_set::GListBox
  - gis_set::GListBox
 
 
-\subsection dbm Database Manager
+\subsection dbmgr Database Manager
 
 
-- dbm::dialogs
+- dbmgr::dialogs
  - dialogs::DisplayAttributesDialog
  - dialogs::DisplayAttributesDialog
  - dialogs::ModifyTableRecord
  - dialogs::ModifyTableRecord
-- dbm::manager
+- dbmgr::manager
  - manager::Log
  - manager::Log
  - manager::VirtualAttributeList
  - manager::VirtualAttributeList
  - manager::AttributeManager
  - manager::AttributeManager
  - manager::TableListCtrl
  - manager::TableListCtrl
  - manager::LayerListCtrl
  - manager::LayerListCtrl
  - manager::LayerBook
  - manager::LayerBook
-- dbm::sqlbuilder
+- dbmgr::sqlbuilder
  - sqlbuilder::SQLFrame
  - sqlbuilder::SQLFrame
-- dbm::vinfo
+- dbmgr::vinfo
  - vinfo::VectorDBInfo
  - vinfo::VectorDBInfo
 
 
 \subsection gpc Georectifier
 \subsection gpc Georectifier