[GRASS-SVN] r30970 - in grass/trunk/gui/wxpython: . gui_modules xml
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Apr 13 11:10:58 EDT 2008
Author: martinl
Date: 2008-04-13 11:10:57 -0400 (Sun, 13 Apr 2008)
New Revision: 30970
Added:
grass/trunk/gui/wxpython/xml/
grass/trunk/gui/wxpython/xml/grass-gxw.dtd
Removed:
grass/trunk/gui/wxpython/gui_modules/grass-gxw.dtd
Modified:
grass/trunk/gui/wxpython/Makefile
grass/trunk/gui/wxpython/wxgui.py
Log:
wxGUI: workspace dtd file moved from 'gui_modules' to 'xml'
Modified: grass/trunk/gui/wxpython/Makefile
===================================================================
--- grass/trunk/gui/wxpython/Makefile 2008-04-13 14:28:36 UTC (rev 30969)
+++ grass/trunk/gui/wxpython/Makefile 2008-04-13 15:10:57 UTC (rev 30970)
@@ -18,12 +18,13 @@
$(MAKE) parsubdirs
install_scripts:
- $(MKDIR) $(ETCDIR) $(ETCDIR)/compat $(ETCDIR)/gui_modules $(ETCDIR)/icons $(ETCDIR)/icons/silk $(ETCDIR)/images $(ETCDIR)/scripts $(ETCDIR)/vdigit
+ $(MKDIR) $(ETCDIR) $(ETCDIR)/compat $(ETCDIR)/gui_modules $(ETCDIR)/icons $(ETCDIR)/icons/silk $(ETCDIR)/images $(ETCDIR)/scripts $(ETCDIR)/vdigit $(ETCDIR)/xml
$(INSTALL_DATA) compat/* $(ETCDIR)/compat/
$(INSTALL_DATA) gui_modules/* $(ETCDIR)/gui_modules/
$(INSTALL_DATA) icons/*.* $(ETCDIR)/icons/
$(INSTALL_DATA) icons/silk/* $(ETCDIR)/icons/silk/
$(INSTALL_DATA) images/* $(ETCDIR)/images/
+ $(INSTALL_DATA) xml/* $(ETCDIR)/xml/
$(INSTALL_DATA) gis_set.py wxgui.py README $(ETCDIR)/
$(INSTALL) scripts/* $(ETCDIR)/scripts/
$(INSTALL) wxgui $(ETCDIR)/scripts/
Deleted: grass/trunk/gui/wxpython/gui_modules/grass-gxw.dtd
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/grass-gxw.dtd 2008-04-13 14:28:36 UTC (rev 30969)
+++ grass/trunk/gui/wxpython/gui_modules/grass-gxw.dtd 2008-04-13 15:10:57 UTC (rev 30970)
@@ -1,57 +0,0 @@
-<!-- grass-gxw.dtd
-
- Copyright (C) 2007 by the GRASS Development Team
- Author: Martin Landa <landa.martin gmail.com>
-
- This program is free software under the GPL (>=v2)
- Read the file COPYING coming with GRASS for details.
--->
-
-
-<!--
- a grass-gxw defines workspace file content
--->
-
-<!ELEMENT grass-gxw (gxw)>
-
-<!ELEMENT gxw (display*)>
-
-<!-- a display element defines map layer connected to given
- map display widnow
--->
-<!ELEMENT display (group*, layer*)>
-
-<!-- group of map layers
--->
-<!ELEMENT group (layer*)>
-<!ATTLIST group name CDATA #REQUIRED>
-<!ATTLIST group checked CDATA #REQUIRED>
-
-<!-- map layer
--->
-<!ELEMENT layer (task?)>
-<!ATTLIST layer type CDATA #REQUIRED>
-<!ATTLIST layer name CDATA #REQUIRED>
-<!ATTLIST layer checked CDATA #REQUIRED>
-<!ATTLIST layer opacity CDATA #IMPLIED>
-
-<!-- task describes the interface of a single
- GRASS command.
--->
-<!ELEMENT task (parameter*, flag*)>
-<!ATTLIST task name CDATA #REQUIRED>
-
-<!-- a parameter must have a name and a value
--->
-<!ELEMENT parameter (value)>
-<!ATTLIST parameter name CDATA #REQUIRED>
-
-<!-- value of parameter
--->
-<!ELEMENT value (#PCDATA)>
-
-
-<!-- enabled flag
--->
-<!ELEMENT flag EMPTY>
-<!ATTLIST flag name CDATA #REQUIRED>
Modified: grass/trunk/gui/wxpython/wxgui.py
===================================================================
--- grass/trunk/gui/wxpython/wxgui.py 2008-04-13 14:28:36 UTC (rev 30969)
+++ grass/trunk/gui/wxpython/wxgui.py 2008-04-13 15:10:57 UTC (rev 30970)
@@ -548,7 +548,7 @@
Return False on error"""
# dtd
- dtdFilename = os.path.join(globalvar.ETCWXDIR, "gui_modules", "grass-gxw.dtd")
+ dtdFilename = os.path.join(globalvar.ETCWXDIR, "xml", "grass-gxw.dtd")
# validate xml agains dtd
# dtd = xmldtd.load_dtd(dtdFilename)
Copied: grass/trunk/gui/wxpython/xml/grass-gxw.dtd (from rev 30946, grass/trunk/gui/wxpython/gui_modules/grass-gxw.dtd)
===================================================================
--- grass/trunk/gui/wxpython/xml/grass-gxw.dtd (rev 0)
+++ grass/trunk/gui/wxpython/xml/grass-gxw.dtd 2008-04-13 15:10:57 UTC (rev 30970)
@@ -0,0 +1,57 @@
+<!-- grass-gxw.dtd
+
+ Copyright (C) 2007 by the GRASS Development Team
+ Author: Martin Landa <landa.martin gmail.com>
+
+ This program is free software under the GPL (>=v2)
+ Read the file COPYING coming with GRASS for details.
+-->
+
+
+<!--
+ a grass-gxw defines workspace file content
+-->
+
+<!ELEMENT grass-gxw (gxw)>
+
+<!ELEMENT gxw (display*)>
+
+<!-- a display element defines map layer connected to given
+ map display widnow
+-->
+<!ELEMENT display (group*, layer*)>
+
+<!-- group of map layers
+-->
+<!ELEMENT group (layer*)>
+<!ATTLIST group name CDATA #REQUIRED>
+<!ATTLIST group checked CDATA #REQUIRED>
+
+<!-- map layer
+-->
+<!ELEMENT layer (task?)>
+<!ATTLIST layer type CDATA #REQUIRED>
+<!ATTLIST layer name CDATA #REQUIRED>
+<!ATTLIST layer checked CDATA #REQUIRED>
+<!ATTLIST layer opacity CDATA #IMPLIED>
+
+<!-- task describes the interface of a single
+ GRASS command.
+-->
+<!ELEMENT task (parameter*, flag*)>
+<!ATTLIST task name CDATA #REQUIRED>
+
+<!-- a parameter must have a name and a value
+-->
+<!ELEMENT parameter (value)>
+<!ATTLIST parameter name CDATA #REQUIRED>
+
+<!-- value of parameter
+-->
+<!ELEMENT value (#PCDATA)>
+
+
+<!-- enabled flag
+-->
+<!ELEMENT flag EMPTY>
+<!ATTLIST flag name CDATA #REQUIRED>
More information about the grass-commit
mailing list