merge r10496 and r10497 to 1.0

git-svn-id: http://svn.osgeo.org/qgis/branches/Version-1_0@10499 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: jef

src/plugins/grass/config/default.qgc

@@ -68,16 +68,14 @@
 		</section>
 	</section>
 
-	<section label=" ">
-	</section>
-
 	<section label="Config">
 		<section label="Region">
 			<section label="Region settings">
                                 <grass name="g.region.save"/> 
                                 <grass name="g.region.zoom"/> 
                                 <grass name="g.region.multiple.raster"/> 
-                                <grass name="g.region.multiple.vector"/> 			</section>
+                                <grass name="g.region.multiple.vector"/>
+			</section>
 			<section label="Projection management">
                                 <section label="Print projection information of the current location"> 					<grass name="g.proj.print"/>
 				</section>
@@ -98,9 +96,6 @@
 		</section>
 	</section>
 
-	<section label=" ">
-	</section>
-
 	<section label="Raster">
 		<section label="Develop map">
 			<section label="Compress raster">
@@ -241,9 +236,6 @@
 		</section>
 	</section>
 
-	<section label=" ">
-	</section>
-
 	<section label="Vector">
 		<section label="Develop map">
 			<section label="Topology management">
@@ -370,9 +362,6 @@
 		</section>
 	</section>
 
-	<section label=" ">
-	</section>
-
 	<section label="Imagery">
 		<section label="Develop images and group">
 			<grass name="i.image.mosaic"/>
@@ -404,9 +393,6 @@
 		</section>
 	</section>
 
-	<section label=" ">
-	</section>
-
 	<section label="Database">
 		<section label="Database management">
 			<grass name="db.connect"/>
@@ -438,16 +424,10 @@
 		</section>
 	</section>
 
-	<section label=" ">
-	</section>
-
 	<section label="3d Visualization">
 		<grass name="nviz"/>
 	</section>
 
-	<section label=" ">
-	</section>
-
 	<section label="Help">
 		<grass name="g.manual"/>
 	</section>

src/plugins/grass/qgsgrasstools.cpp

@@ -171,8 +171,9 @@ void QgsGrassTools::runModule( QString name )
 #endif
 
 #ifdef WIN32
-    if( !QProcess::startDetached( getenv("COMSPEC") ) ) {
-      QMessageBox::warning( 0, "Warning", tr("Cannot start command shell (%1)").arg( getenv("COMSPEC") ) );
+    if ( !QProcess::startDetached( getenv( "COMSPEC" ) ) )
+    {
+      QMessageBox::warning( 0, "Warning", tr( "Cannot start command shell (%1)" ).arg( getenv( "COMSPEC" ) ) );
     }
     return;
 #else
@@ -266,6 +267,8 @@ bool QgsGrassTools::loadConfig( QString filePath )
   // Go through the sections and modules and add them to the list view
   addModules( 0, modulesElem );
 
+  mModules->topLevelItem( 0 )->setExpanded( true );
+
   file.close();
   return true;
 }
@@ -303,7 +306,7 @@ void QgsGrassTools::addModules( QTreeWidgetItem *parent, QDomElement &element )
         QString label = e.attribute( "label" );
         QgsDebugMsg( QString( "label = %1" ).arg( label ) );
         item->setText( 0, label );
-        item->setExpanded( true );
+        item->setExpanded( false );
 
         addModules( item, e );