[QGIS Commit] r14485 - in trunk/qgis/src/plugins/grass: modules-6.4 modules-common

[svn_qgis at osgeo.org]

Author: pcav
Date: 2010-11-01 12:45:52 -0700 (Mon, 01 Nov 2010)
New Revision: 14485

Modified:
   trunk/qgis/src/plugins/grass/modules-6.4/default.qgc
   trunk/qgis/src/plugins/grass/modules-6.4/g.proj.wkt.qgm
   trunk/qgis/src/plugins/grass/modules-common/r.proj.qgm
   trunk/qgis/src/plugins/grass/modules-common/v.proj.qgm
Log:
Fixes and cosmetcs fro GRASS toolbox - Thanks Markus Neteler. Fixes #3104

Modified: trunk/qgis/src/plugins/grass/modules-6.4/default.qgc
===================================================================
--- trunk/qgis/src/plugins/grass/modules-6.4/default.qgc	2010-11-01 18:55:50 UTC (rev 14484)
+++ trunk/qgis/src/plugins/grass/modules-6.4/default.qgc	2010-11-01 19:45:52 UTC (rev 14485)
@@ -51,7 +51,6 @@
 					<grass name="r.in.aster"/>
 					<grass name="r.in.wms"/>
 				</section>
-
 			</section>
 			<section label="Import vector into GRASS">
 				<section label="Import vector into GRASS from QGIS view">
@@ -73,7 +72,7 @@
 					<grass name="v.in.gns"/>
 				</section>
 			</section>
-<section label="Import from database into GRASS">
+			<section label="Import from database into GRASS">
 				<grass name="db.in.ogr"/>
 			</section>
 		</section>

Modified: trunk/qgis/src/plugins/grass/modules-6.4/g.proj.wkt.qgm
===================================================================
--- trunk/qgis/src/plugins/grass/modules-6.4/g.proj.wkt.qgm	2010-11-01 18:55:50 UTC (rev 14484)
+++ trunk/qgis/src/plugins/grass/modules-6.4/g.proj.wkt.qgm	2010-11-01 19:45:52 UTC (rev 14485)
@@ -4,5 +4,5 @@
 <qgisgrassmodule label="Create new location from .prj (WKT) file" module="g.proj">
 	<flag key="c" answer="on" hidden="yes" />
 	<file key="wkt"/>
-	<file key="location"/>
+	<option key="location"/>
 </qgisgrassmodule>

Modified: trunk/qgis/src/plugins/grass/modules-common/r.proj.qgm
===================================================================
--- trunk/qgis/src/plugins/grass/modules-common/r.proj.qgm	2010-11-01 18:55:50 UTC (rev 14484)
+++ trunk/qgis/src/plugins/grass/modules-common/r.proj.qgm	2010-11-01 19:45:52 UTC (rev 14485)
@@ -3,10 +3,10 @@
 
 <qgisgrassmodule label="Re-project raster from a location to the current location" module="r.proj">
 	<option key="input" />
-	<option key="dbase"/>
+	<option key="mapset"/>
 	<option key="location"/>
-	<option key="mapset"/>
 	<option key="method" />
 	<option key="resolution" />
-	<option key="output" />
+	<option key="output" label="Name for the output raster map (optional)"/>
+        <option key="dbase" label="Path to GRASS database of input location (optional)"/> 
 </qgisgrassmodule>

Modified: trunk/qgis/src/plugins/grass/modules-common/v.proj.qgm
===================================================================
--- trunk/qgis/src/plugins/grass/modules-common/v.proj.qgm	2010-11-01 18:55:50 UTC (rev 14484)
+++ trunk/qgis/src/plugins/grass/modules-common/v.proj.qgm	2010-11-01 19:45:52 UTC (rev 14485)
@@ -3,8 +3,8 @@
 
 <qgisgrassmodule label="Projection conversion of vector" module="v.proj">
 	<option key="input" />
-	<option key="dbase" />
+	<option key="mapset" />
 	<option key="location" />
-	<option key="mapset" />
-	<option key="output" />
+	<option key="output" label="Name for output vector map (optional)" />
+        <option key="dbase" label="Path to GRASS database of input location (optional)" /> 
 </qgisgrassmodule>