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. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11078 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jul 15, 2009 · 650b51b · 650b51b
1 parent 610a44d
commit 650b51b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/plugins/grass/modules-6.4/qgis.db.connect-login.pg.qgm b/src/plugins/grass/modules-6.4/qgis.db.connect-login.pg.qgm
@@ -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" />

diff --git a/src/plugins/grass/modules-6.4/qgis.r.external.all.qgm b/src/plugins/grass/modules-6.4/qgis.r.external.all.qgm
@@ -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"/>

diff --git a/src/plugins/grass/modules-6.4/qgis.v.out.ogr.pg.qgm b/src/plugins/grass/modules-6.4/qgis.v.out.ogr.pg.qgm
@@ -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" />

diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp
@@ -195,7 +195,11 @@ QgsGrassModule::QgsGrassModule( QgsGrassTools *tools, QString moduleName, QgisIn
   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)