[QGIS Commit] r11078 - in trunk/qgis/src/plugins/grass: . modules-6.4

[svn_qgis at osgeo.org]

Author: rugginoso
Date: 2009-07-15 04:26:28 -0400 (Wed, 15 Jul 2009)
New Revision: 11078

Modified:
   trunk/qgis/src/plugins/grass/modules-6.4/qgis.db.connect-login.pg.qgm
   trunk/qgis/src/plugins/grass/modules-6.4/qgis.r.external.all.qgm
   trunk/qgis/src/plugins/grass/modules-6.4/qgis.v.out.ogr.pg.qgm
   trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
Log:
Added the possibility to specify the manpage of the modules into .qgm files.
Updated .qgm files for qgis.r.externa.all, qgis.v.out.ogr.pg and qgis.db.connect-login.pg to fix #1774.


Modified: trunk/qgis/src/plugins/grass/modules-6.4/qgis.db.connect-login.pg.qgm
===================================================================
--- trunk/qgis/src/plugins/grass/modules-6.4/qgis.db.connect-login.pg.qgm	2009-07-15 07:31:15 UTC (rev 11077)
+++ trunk/qgis/src/plugins/grass/modules-6.4/qgis.db.connect-login.pg.qgm	2009-07-15 08:26:28 UTC (rev 11078)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
-<qgisgrassmodule label="Set PostgreSQL DB connection" module="qgis.db.connect-login.pg.py">
+<qgisgrassmodule label="Set PostgreSQL DB connection" module="qgis.db.connect-login.pg.py" manual="db.connect">
 	<option key="database" />
 	<option key="schema" />
 	<option key="host" />

Modified: trunk/qgis/src/plugins/grass/modules-6.4/qgis.r.external.all.qgm
===================================================================
--- trunk/qgis/src/plugins/grass/modules-6.4/qgis.r.external.all.qgm	2009-07-15 07:31:15 UTC (rev 11077)
+++ trunk/qgis/src/plugins/grass/modules-6.4/qgis.r.external.all.qgm	2009-07-15 08:26:28 UTC (rev 11078)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassdatamodule.dtd">
-<qgisgrassmodule label="Link all GDAL supported raster files into a directory to binary raster map layers." module="qgis.r.external.all.py">
+<qgisgrassmodule label="Link all GDAL supported raster files into a directory to binary raster map layers." module="qgis.r.external.all.py" manual="r.external">
 	<flag key="o"/>
 	<flag key="e"/>
 	<flag key="r"/>

Modified: trunk/qgis/src/plugins/grass/modules-6.4/qgis.v.out.ogr.pg.qgm
===================================================================
--- trunk/qgis/src/plugins/grass/modules-6.4/qgis.v.out.ogr.pg.qgm	2009-07-15 07:31:15 UTC (rev 11077)
+++ trunk/qgis/src/plugins/grass/modules-6.4/qgis.v.out.ogr.pg.qgm	2009-07-15 08:26:28 UTC (rev 11078)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
-<qgisgrassmodule label="Export vector to PostGIS (PostgreSQL) database table." module="qgis.v.out.ogr.pg.py">
+<qgisgrassmodule label="Export vector to PostGIS (PostgreSQL) database table." module="qgis.v.out.ogr.pg.py" manual="v.out.ogr">
 	<option key="input" layeroption="layer" typeoption="type" />
 	<option key="olayer" />
 	<option key="database" />

Modified: trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp	2009-07-15 07:31:15 UTC (rev 11077)
+++ trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp	2009-07-15 08:26:28 UTC (rev 11078)
@@ -195,7 +195,11 @@
   QDomElement qDocElem = qDoc.documentElement();
 
   // Read GRASS module description
-  QString xName = qDocElem.attribute( "module" );
+  QString xName = qDocElem.attribute( "manual" );
+  if ( xName.isEmpty() )
+  {
+      xName = qDocElem.attribute( "module" );
+  }
 
   // Binary modules on windows has .exe extension
   // but not all modules have to be binary (can be scripts)