[GRASS-SVN] r49429 - in grass/trunk/gui/wxpython: . dbmgr mapdisp psmap vdigit

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Nov 30 05:44:37 EST 2011


Author: martinl
Date: 2011-11-30 02:44:37 -0800 (Wed, 30 Nov 2011)
New Revision: 49429

Added:
   grass/trunk/gui/wxpython/dbmgr/
Removed:
   grass/trunk/gui/wxpython/dbm/
Modified:
   grass/trunk/gui/wxpython/Makefile
   grass/trunk/gui/wxpython/dbmgr/dialogs.py
   grass/trunk/gui/wxpython/dbmgr/manager.py
   grass/trunk/gui/wxpython/dbmgr/sqlbuilder.py
   grass/trunk/gui/wxpython/dbmgr/vinfo.py
   grass/trunk/gui/wxpython/mapdisp/frame.py
   grass/trunk/gui/wxpython/psmap/dialogs.py
   grass/trunk/gui/wxpython/vdigit/mapwindow.py
   grass/trunk/gui/wxpython/wxpythonlib.dox
Log:
wxGUI: rename `dbm` package to `dbmgr` (consilate package name with `lmgr`), `dbm` is also standard Python package


Modified: grass/trunk/gui/wxpython/Makefile
===================================================================
--- grass/trunk/gui/wxpython/Makefile	2011-11-29 20:11:54 UTC (rev 49428)
+++ grass/trunk/gui/wxpython/Makefile	2011-11-30 10:44:37 UTC (rev 49429)
@@ -10,12 +10,12 @@
 ETCDIR = $(ETC)/gui/wxpython
 
 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/* ) \
 	gis_set.py gis_set_error.py wxgui.py README
 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)
 DSTDIRS := $(patsubst %,$(ETCDIR)/%,compat icons scripts xml)
 

Modified: grass/trunk/gui/wxpython/dbmgr/dialogs.py
===================================================================
--- grass/trunk/gui/wxpython/dbm/dialogs.py	2011-11-29 10:01:37 UTC (rev 49418)
+++ grass/trunk/gui/wxpython/dbmgr/dialogs.py	2011-11-30 10:44:37 UTC (rev 49429)
@@ -1,5 +1,5 @@
 """!
- at package dbm.dialogs
+ at package dbmgr.dialogs
 
 @brief DBM-related dialogs
 
@@ -24,7 +24,7 @@
 from core.gcmd     import RunCommand
 from core.debug    import Debug
 from core.settings import UserSettings
-from dbm.vinfo     import VectorDBInfo
+from dbmgr.vinfo   import VectorDBInfo
 
 class DisplayAttributesDialog(wx.Dialog):
     def __init__(self, parent, map,

Modified: grass/trunk/gui/wxpython/dbmgr/manager.py
===================================================================
--- grass/trunk/gui/wxpython/dbm/manager.py	2011-11-29 10:01:37 UTC (rev 49418)
+++ grass/trunk/gui/wxpython/dbmgr/manager.py	2011-11-30 10:44:37 UTC (rev 49429)
@@ -1,5 +1,5 @@
 """!
- at package dbm.manager
+ at package dbmgr.manager
 
 @brief GRASS Attribute Table Manager
 
@@ -44,13 +44,13 @@
 
 import grass.script as grass
 
-from dbm.sqlbuilder   import SQLFrame
+from dbmgr.sqlbuilder import SQLFrame
 from core.gcmd        import RunCommand, GException, GError
 from core.utils       import ListOfCatsToRange
 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 dbm.dialogs      import ModifyTableRecord
+from dbmgr.dialogs    import ModifyTableRecord
 from core.settings    import UserSettings
 from gui_core.widgets import GNotebook
 

Modified: grass/trunk/gui/wxpython/dbmgr/sqlbuilder.py
===================================================================
--- grass/trunk/gui/wxpython/dbm/sqlbuilder.py	2011-11-29 10:01:37 UTC (rev 49418)
+++ grass/trunk/gui/wxpython/dbmgr/sqlbuilder.py	2011-11-30 10:44:37 UTC (rev 49429)
@@ -1,5 +1,5 @@
 """!
- at package dbm.sqlbuilder
+ at package dbmgr.sqlbuilder
 
 @brief GRASS SQL Builder
 
@@ -29,8 +29,8 @@
 
 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):
     """!SQL Frame class"""

Modified: grass/trunk/gui/wxpython/dbmgr/vinfo.py
===================================================================
--- grass/trunk/gui/wxpython/dbm/vinfo.py	2011-11-29 10:01:37 UTC (rev 49418)
+++ grass/trunk/gui/wxpython/dbmgr/vinfo.py	2011-11-30 10:44:37 UTC (rev 49429)
@@ -1,5 +1,5 @@
 """
- at package dbm.vinfo
+ at package dbmgr.vinfo
 
 @brief Support classes for Database Manager
 

Modified: grass/trunk/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/frame.py	2011-11-29 20:11:54 UTC (rev 49428)
+++ grass/trunk/gui/wxpython/mapdisp/frame.py	2011-11-30 10:44:37 UTC (rev 49429)
@@ -43,7 +43,7 @@
 from mapdisp.toolbars   import MapToolbar
 from mapdisp.gprint     import PrintOptions
 from core.gcmd          import GError, GMessage, RunCommand
-from dbm.dialogs        import DisplayAttributesDialog
+from dbmgr.dialogs      import DisplayAttributesDialog
 from core.utils         import ListOfCatsToRange, GetLayerNameFromCmd
 from gui_core.dialogs   import GetImageHandlers, ImageSizeDialog, DecorationDialog, TextLayerDialog
 from core.debug         import Debug

Modified: grass/trunk/gui/wxpython/psmap/dialogs.py
===================================================================
--- grass/trunk/gui/wxpython/psmap/dialogs.py	2011-11-29 20:11:54 UTC (rev 49428)
+++ grass/trunk/gui/wxpython/psmap/dialogs.py	2011-11-30 10:44:37 UTC (rev 49429)
@@ -73,7 +73,7 @@
 import grass.script as grass
 
 from core             import globalvar
-from dbm.vinfo        import VectorDBInfo
+from dbmgr.vinfo      import VectorDBInfo
 from core.utils       import CmdToTuple, GetCmdString
 from gui_core.gselect import Select
 from core.gcmd        import RunCommand, GError, GMessage, GWarning

Modified: grass/trunk/gui/wxpython/vdigit/mapwindow.py
===================================================================
--- grass/trunk/gui/wxpython/vdigit/mapwindow.py	2011-11-29 20:11:54 UTC (rev 49428)
+++ grass/trunk/gui/wxpython/vdigit/mapwindow.py	2011-11-30 10:44:37 UTC (rev 49429)
@@ -16,7 +16,7 @@
 
 import wx
 
-from dbm.dialogs    import DisplayAttributesDialog
+from dbmgr.dialogs  import DisplayAttributesDialog
 from core.gcmd      import RunCommand, GMessage, GError
 from core.debug     import Debug
 from mapdisp.mapwindow import BufferedWindow

Modified: grass/trunk/gui/wxpython/wxpythonlib.dox
===================================================================
--- grass/trunk/gui/wxpython/wxpythonlib.dox	2011-11-29 20:11:54 UTC (rev 49428)
+++ grass/trunk/gui/wxpython/wxpythonlib.dox	2011-11-30 10:44:37 UTC (rev 49429)
@@ -28,7 +28,7 @@
  - \ref lmgr
  - \ref mapdisp
  - \ref wscreen
- - \ref dbm
+ - \ref dbmgr
  - \ref gpc
  - \ref gmodeler
  - \ref vdigit
@@ -228,21 +228,21 @@
  - gis_set::StartUp
  - gis_set::GListBox
 
-\subsection dbm Database Manager
+\subsection dbmgr Database Manager
 
-- dbm::dialogs
+- dbmgr::dialogs
  - dialogs::DisplayAttributesDialog
  - dialogs::ModifyTableRecord
-- dbm::manager
+- dbmgr::manager
  - manager::Log
  - manager::VirtualAttributeList
  - manager::AttributeManager
  - manager::TableListCtrl
  - manager::LayerListCtrl
  - manager::LayerBook
-- dbm::sqlbuilder
+- dbmgr::sqlbuilder
  - sqlbuilder::SQLFrame
-- dbm::vinfo
+- dbmgr::vinfo
  - vinfo::VectorDBInfo
 
 \subsection gpc Georectifier



More information about the grass-commit mailing list