set default GRASS_GUI

rblazek · rblazek · commit 49a6486dfa51 · 2010-03-15T17:59:53.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@13057 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp
@@ -519,6 +519,7 @@ QString GRASS_EXPORT QgsGrass::openMapset( QString gisdbase, QString location, Q
 
   QFile in( globalGisrc );
   QString line;
+  bool guiSet = false;
   char buf[1000];
   if ( in.open( QIODevice::ReadOnly ) )
   {
@@ -531,6 +532,7 @@ QString GRASS_EXPORT QgsGrass::openMapset( QString gisdbase, QString location, Q
       {
         continue;
       }
+      if ( line.contains( "GRASS_GUI:" ) ) guiSet = true;
       stream << line;
     }
     in.close();
@@ -541,6 +543,9 @@ QString GRASS_EXPORT QgsGrass::openMapset( QString gisdbase, QString location, Q
   stream << line;
   line = "MAPSET: " + mapset + "\n";
   stream << line;
+  if ( !guiSet ) {
+    stream << "GRASS_GUI: wxpython\n";
+  }
 
   out.close();
 

Original file line number	Diff line number	Diff line change
`@@ -519,6 +519,7 @@ QString GRASS_EXPORT QgsGrass::openMapset( QString gisdbase, QString location, Q`
`519`	`519`
`520`	`520`	`QFile in( globalGisrc );`
`521`	`521`	`QString line;`
	`522`	`+ bool guiSet = false;`
`522`	`523`	`char buf[1000];`
`523`	`524`	`if ( in.open( QIODevice::ReadOnly ) )`
`524`	`525`	`{`
`@@ -531,6 +532,7 @@ QString GRASS_EXPORT QgsGrass::openMapset( QString gisdbase, QString location, Q`
`531`	`532`	`{`
`532`	`533`	`continue;`
`533`	`534`	`}`
	`535`	`+ if ( line.contains( "GRASS_GUI:" ) ) guiSet = true;`
`534`	`536`	`stream << line;`
`535`	`537`	`}`
`536`	`538`	`in.close();`
`@@ -541,6 +543,9 @@ QString GRASS_EXPORT QgsGrass::openMapset( QString gisdbase, QString location, Q`
`541`	`543`	`stream << line;`
`542`	`544`	`line = "MAPSET: " + mapset + "\n";`
`543`	`545`	`stream << line;`
	`546`	`+ if ( !guiSet ) {`
	`547`	`+ stream << "GRASS_GUI: wxpython\n";`
	`548`	`+ }`
`544`	`549`
`545`	`550`	`out.close();`
`546`	`551`