apply #2376

jef · jef · commit d2d8a55b0fa3 · 2010-04-08T18:55:07.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13287 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -305,7 +305,7 @@ void QgsRasterLayer::buildSupportedRasterFileFilter( QString & theFileFiltersStr
   // same form.
 
   // start with the default case
-  theFileFiltersString = tr( "All files (*)" );
+  theFileFiltersString = tr( "[GDAL] All files (*)" );
 
   for ( int i = 0; i < GDALGetDriverCount(); ++i )
   {
@@ -364,7 +364,7 @@ void QgsRasterLayer::buildSupportedRasterFileFilter( QString & theFileFiltersStr
       if ( !( myGdalDriverExtension.isEmpty() || myGdalDriverLongName.isEmpty() ) )
       {
         // XXX add check for SDTS; in that case we want (*CATD.DDF)
-        QString glob = "*." + myGdalDriverExtension;
+        QString glob = "*." + myGdalDriverExtension.replace("/", " *.");
         // Add only the first JP2 driver found to the filter list (it's the one GDAL uses)
         if ( myGdalDriverDescription == "JPEG2000" ||
              myGdalDriverDescription.startsWith( "JP2" ) ) // JP2ECW, JP2KAK, JP2MrSID
@@ -384,7 +384,7 @@ void QgsRasterLayer::buildSupportedRasterFileFilter( QString & theFileFiltersStr
           glob += " *.jpeg";
         }
 
-        theFileFiltersString += ";;" + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";
+        theFileFiltersString += ";;[GDAL] " + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";
 
         break;            // ... to next driver, if any.
       }
@@ -410,21 +410,21 @@ void QgsRasterLayer::buildSupportedRasterFileFilter( QString & theFileFiltersStr
       if ( myGdalDriverDescription.startsWith( "USGSDEM" ) )
       {
         QString glob = "*.dem";
-        theFileFiltersString += ";;" + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";
+        theFileFiltersString += ";;[GDAL] " + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";
       }
       else if ( myGdalDriverDescription.startsWith( "DTED" ) )
       {
         // DTED use "*.dt0, *.dt1, *.dt2"
         QString glob = "*.dt0";
         glob += " *.dt1";
         glob += " *.dt2";
-        theFileFiltersString += ";;" + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";
+        theFileFiltersString += ";;[GDAL] " + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";
       }
       else if ( myGdalDriverDescription.startsWith( "MrSID" ) )
       {
         // MrSID use "*.sid"
         QString glob = "*.sid";
-        theFileFiltersString += ";;" + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";
+        theFileFiltersString += ";;[GDAL] " + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";
       }
       else
       {

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ void QgsRasterLayer::buildSupportedRasterFileFilter( QString & theFileFiltersStr`
`305`	`305`	`// same form.`
`306`	`306`
`307`	`307`	`// start with the default case`
`308`		`- theFileFiltersString = tr( "All files (*)" );`
	`308`	`+ theFileFiltersString = tr( "[GDAL] All files (*)" );`
`309`	`309`
`310`	`310`	`for ( int i = 0; i < GDALGetDriverCount(); ++i )`
`311`	`311`	`{`
`@@ -364,7 +364,7 @@ void QgsRasterLayer::buildSupportedRasterFileFilter( QString & theFileFiltersStr`
`364`	`364`	`if ( !( myGdalDriverExtension.isEmpty() \|\| myGdalDriverLongName.isEmpty() ) )`
`365`	`365`	`{`
`366`	`366`	`// XXX add check for SDTS; in that case we want (*CATD.DDF)`
`367`		`- QString glob = "*." + myGdalDriverExtension;`
	`367`	`+ QString glob = "." + myGdalDriverExtension.replace("/", " .");`
`368`	`368`	`// Add only the first JP2 driver found to the filter list (it's the one GDAL uses)`
`369`	`369`	`if ( myGdalDriverDescription == "JPEG2000" \|\|`
`370`	`370`	`myGdalDriverDescription.startsWith( "JP2" ) ) // JP2ECW, JP2KAK, JP2MrSID`
`@@ -384,7 +384,7 @@ void QgsRasterLayer::buildSupportedRasterFileFilter( QString & theFileFiltersStr`
`384`	`384`	`glob += " *.jpeg";`
`385`	`385`	`}`
`386`	`386`
`387`		`- theFileFiltersString += ";;" + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";`
	`387`	`+ theFileFiltersString += ";;[GDAL] " + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";`
`388`	`388`
`389`	`389`	`break; // ... to next driver, if any.`
`390`	`390`	`}`
`@@ -410,21 +410,21 @@ void QgsRasterLayer::buildSupportedRasterFileFilter( QString & theFileFiltersStr`
`410`	`410`	`if ( myGdalDriverDescription.startsWith( "USGSDEM" ) )`
`411`	`411`	`{`
`412`	`412`	`QString glob = "*.dem";`
`413`		`- theFileFiltersString += ";;" + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";`
	`413`	`+ theFileFiltersString += ";;[GDAL] " + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";`
`414`	`414`	`}`
`415`	`415`	`else if ( myGdalDriverDescription.startsWith( "DTED" ) )`
`416`	`416`	`{`
`417`	`417`	`// DTED use ".dt0, .dt1, *.dt2"`
`418`	`418`	`QString glob = "*.dt0";`
`419`	`419`	`glob += " *.dt1";`
`420`	`420`	`glob += " *.dt2";`
`421`		`- theFileFiltersString += ";;" + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";`
	`421`	`+ theFileFiltersString += ";;[GDAL] " + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";`
`422`	`422`	`}`
`423`	`423`	`else if ( myGdalDriverDescription.startsWith( "MrSID" ) )`
`424`	`424`	`{`
`425`	`425`	`// MrSID use "*.sid"`
`426`	`426`	`QString glob = "*.sid";`
`427`		`- theFileFiltersString += ";;" + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";`
	`427`	`+ theFileFiltersString += ";;[GDAL] " + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";`
`428`	`428`	`}`
`429`	`429`	`else`
`430`	`430`	`{`