Skip to content

Commit

Permalink
GRASS plugin update
Browse files Browse the repository at this point in the history
- toolbox: show module name in front of the label
- cleanup QGM modules
 * fix typos
 * reindent and unify line endings
 * remove leading blanks and trailing blanks and dots from labels
 * remove leading module name as the toolbox now shows them automatically
 * rename r.cats.* to r.category.*


git-svn-id: http://svn.osgeo.org/qgis/trunk@8339 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Apr 11, 2008
1 parent cd70d46 commit c32b69b
Show file tree
Hide file tree
Showing 248 changed files with 1,036 additions and 1,061 deletions.
2 changes: 1 addition & 1 deletion src/plugins/grass/config/default.qgc
Expand Up @@ -215,7 +215,7 @@
</section>
<section label="Reports and statistics">
<section label="Reports">
<grass name="r.cats"/>
<grass name="r.category"/>
</section>
<section label="Statistics">
<grass name="r.sum"/>
Expand Down
14 changes: 7 additions & 7 deletions src/plugins/grass/modules/db.connect.qgm
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label=" db.connect - Sets general DB connection mapset" module="db.connect">
<option key="driver" answer="dbf" hidden="no"/>
<option key="database" answer="$GISDBASE/$LOCATION_NAME/$MAPSET/dbf/" hidden="no"/>
</qgisgrassmodule>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Sets general DB connection mapset" module="db.connect">
<option key="driver" answer="dbf" hidden="no"/>
<option key="database" answer="$GISDBASE/$LOCATION_NAME/$MAPSET/dbf/" hidden="no"/>
</qgisgrassmodule>
16 changes: 8 additions & 8 deletions src/plugins/grass/modules/db.connect.schema.qgm
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label=" db.connect - Sets general DB connection mapset with a schema" module="db.connect">
<option key="driver" answer="dbf" hidden="no"/>
<option key="database" answer="$GISDBASE/$LOCATION_NAME/$MAPSET/dbf/" hidden="no"/>
<option key="schema" answer=" " hidden="no"/>
</qgisgrassmodule>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Sets general DB connection mapset with a schema" module="db.connect">
<option key="driver" answer="dbf" hidden="no"/>
<option key="database" answer="$GISDBASE/$LOCATION_NAME/$MAPSET/dbf/" hidden="no"/>
<option key="schema" answer=" " hidden="no"/>
</qgisgrassmodule>
12 changes: 6 additions & 6 deletions src/plugins/grass/modules/db.connect.wich.qgm
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label=" db.connect - Prints general DB connection mapset" module="db.connect">
<flag key="p" answer="on" hidden="yes"/>
</qgisgrassmodule>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Prints general DB connection mapset" module="db.connect">
<flag key="p" answer="on" hidden="yes"/>
</qgisgrassmodule>
16 changes: 8 additions & 8 deletions src/plugins/grass/modules/db.execute.qgm
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label=" db.execute - Execute any SQL statement" module="db.execute">
<file key="input" type="old" />
<option key="driver" answer="dbf" hidden="no"/>
<option key="database" answer="$GISDBASE/$LOCATION_NAME/$MAPSET/dbf/" hidden="no"/>
</qgisgrassmodule>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Execute any SQL statement" module="db.execute">
<file key="input" type="old" />
<option key="driver" answer="dbf" hidden="no"/>
<option key="database" answer="$GISDBASE/$LOCATION_NAME/$MAPSET/dbf/" hidden="no"/>
</qgisgrassmodule>
2 changes: 1 addition & 1 deletion src/plugins/grass/modules/db.in.ogr.qgm
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label=" db.in.ogr - Imports attribute tables in various formats" module="db.in.ogr">
<qgisgrassmodule label="Imports attribute tables in various formats" module="db.in.ogr">
<file key="dsn" type="old" label="Input table" filters="dbf, csv (*.csv *.dbf)" />
<option key="output"/>
</qgisgrassmodule>
18 changes: 9 additions & 9 deletions src/plugins/grass/modules/db.login.qgm
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label=" db.login - Set user/password for driver/database" module="db.login">
<option key="driver" answer="dbf" hidden="no"/>
<option key="database" answer="$GISDBASE/$LOCATION_NAME/$MAPSET/dbf/" hidden="no"/>
<option key="user"/>
<option key="password"/>
</qgisgrassmodule>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Set user/password for driver/database" module="db.login">
<option key="driver" answer="dbf" hidden="no"/>
<option key="database" answer="$GISDBASE/$LOCATION_NAME/$MAPSET/dbf/" hidden="no"/>
<option key="user"/>
<option key="password"/>
</qgisgrassmodule>
7 changes: 4 additions & 3 deletions src/plugins/grass/modules/g.manual.qgm
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
<qgisgrassmodule label="g.manual - display the HTML man pages of GRASS" module="g.manual">
<flag key="i" answer="on" />
</qgisgrassmodule>

<qgisgrassmodule label="display the HTML man pages of GRASS" module="g.manual">
<flag key="i" answer="on" />
</qgisgrassmodule>
10 changes: 5 additions & 5 deletions src/plugins/grass/modules/g.proj.ascii.new.qgm
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
<qgisgrassmodule label="g.proj - Converts coordinate system descriptions (i.e. projection information) between ASCII formats and creaye NEW LOACATIO " module="g.proj">
<file key="wkt" type="old" />
<option key="location" />
</qgisgrassmodule>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Converts coordinate system descriptions (i.e. projection information) between ASCII formats and create NEW LOCATION" module="g.proj">
<file key="wkt" type="old" />
<option key="location" />
</qgisgrassmodule>
10 changes: 5 additions & 5 deletions src/plugins/grass/modules/g.proj.geo.new.qgm
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
<qgisgrassmodule label="g.proj - Converts coordinate system descriptions (i.e. projection information) between GEOREFERENCED FILE (including GRASS format) and create a NEW LOACATION" module="g.proj">
<file key="georef" type="old" />
<option key="location" />
</qgisgrassmodule>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Converts coordinate system descriptions (i.e. projection information) between GEOREFERENCED FILE (including GRASS format) and create a NEW LOCATION" module="g.proj">
<file key="georef" type="old" />
<option key="location" />
</qgisgrassmodule>
10 changes: 5 additions & 5 deletions src/plugins/grass/modules/g.proj.geo.qgm
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
<qgisgrassmodule label="g.proj - Converts coordinate system descriptions (i.e. projection information) between GEOREFERENED FILE (including GRASS format). " module="g.proj">
<file key="georef" type="old" />
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Converts coordinate system descriptions (i.e. projection information) between GEOREFERENED FILE (including GRASS format)" module="g.proj">
<file key="georef" type="old" />
<flag key="p" />
<flag key="d" />
<flag key="j" />
<flag key="w" />
<flag key="e" />
<flag key="f" />
</qgisgrassmodule>

</qgisgrassmodule>
8 changes: 4 additions & 4 deletions src/plugins/grass/modules/g.proj.print.qgm
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
<qgisgrassmodule label="g.proj - print projection information. " module="g.proj">
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="print projection information" module="g.proj">
<flag key="p" />
<flag key="d" />
<flag key="j" />
<flag key="w" />
<flag key="e" />
<flag key="f" />
</qgisgrassmodule>

</qgisgrassmodule>
9 changes: 4 additions & 5 deletions src/plugins/grass/modules/g.proj.proj.new.qgm
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
<qgisgrassmodule label="g.proj - Converts coordinate system descriptions (i.e. projection information) between PROJ INORMATION and produce a NEW LOCATION " module="g.proj">
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Converts coordinate system descriptions (i.e. projection information) between PROJ INFORMATION and produce a NEW LOCATION" module="g.proj">
<file key="proj4" type="new"/>
<option key="location" />
</qgisgrassmodule>


</qgisgrassmodule>
9 changes: 4 additions & 5 deletions src/plugins/grass/modules/g.proj.proj.qgm
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
<qgisgrassmodule label="g.proj - Converts coordinate system descriptions (i.e. projection information) between PROJ INFORMATION . " module="g.proj">
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Converts coordinate system descriptions (i.e. projection information) between PROJ INFORMATION" module="g.proj">
<flag key="p" />
<flag