Merge pull request #2745 from medspx/gdal_invalid_messagebar

nyalldawson · nyalldawson · commit 8abeb8d09e23 · 2016-02-24T11:38:26.000+11:00
Replace QgsErrorDialog by messageBar for raster loading (fix #6967)
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -10369,7 +10369,8 @@ QgsRasterLayer* QgisApp::addRasterLayerPrivate(
     // don't show the gui warning if we are loading from command line
     if ( guiWarning )
     {
-      QgsErrorDialog::show( error, title );
+      messageBar()->pushMessage( title, error.message( QgsErrorMessage::Text ),
+                                 QgsMessageBar::CRITICAL, messageTimeout() );
     }
 
     if ( layer )
@@ -10481,15 +10482,11 @@ bool QgisApp::addRasterLayers( QStringList const &theFileNameQStringList, bool g
       // loaded afterwards (see main.cpp)
       if ( guiWarning )
       {
-        QgsError error;
-        QString msg;
-
-        msg = tr( "%1 is not a supported raster data source" ).arg( *myIterator );
+        QString msg = tr( "%1 is not a supported raster data source" ).arg( *myIterator );
         if ( !errMsg.isEmpty() )
           msg += '\n' + errMsg;
-        error.append( QGS_ERROR_MESSAGE( msg, tr( "Raster layer" ) ) );
 
-        QgsErrorDialog::show( error, tr( "Unsupported Data Source" ) );
+        messageBar()->pushMessage( tr( "Unsupported Data Source" ), msg, QgsMessageBar::CRITICAL, messageTimeout() );
       }
     }
     if ( ! ok )

Original file line number	Diff line number	Diff line change
`@@ -10369,7 +10369,8 @@ QgsRasterLayer* QgisApp::addRasterLayerPrivate(`
`10369`	`10369`	`// don't show the gui warning if we are loading from command line`
`10370`	`10370`	`if ( guiWarning )`
`10371`	`10371`	`{`
`10372`		`- QgsErrorDialog::show( error, title );`
	`10372`	`+ messageBar()->pushMessage( title, error.message( QgsErrorMessage::Text ),`
	`10373`	`+ QgsMessageBar::CRITICAL, messageTimeout() );`
`10373`	`10374`	`}`
`10374`	`10375`
`10375`	`10376`	`if ( layer )`
`@@ -10481,15 +10482,11 @@ bool QgisApp::addRasterLayers( QStringList const &theFileNameQStringList, bool g`
`10481`	`10482`	`// loaded afterwards (see main.cpp)`
`10482`	`10483`	`if ( guiWarning )`
`10483`	`10484`	`{`
`10484`		`- QgsError error;`
`10485`		`- QString msg;`
`10486`		`-`
`10487`		`- msg = tr( "%1 is not a supported raster data source" ).arg( *myIterator );`
	`10485`	`+ QString msg = tr( "%1 is not a supported raster data source" ).arg( *myIterator );`
`10488`	`10486`	`if ( !errMsg.isEmpty() )`
`10489`	`10487`	`msg += '\n' + errMsg;`
`10490`		`- error.append( QGS_ERROR_MESSAGE( msg, tr( "Raster layer" ) ) );`
`10491`	`10488`
`10492`		`- QgsErrorDialog::show( error, tr( "Unsupported Data Source" ) );`
	`10489`	`+ messageBar()->pushMessage( tr( "Unsupported Data Source" ), msg, QgsMessageBar::CRITICAL, messageTimeout() );`
`10493`	`10490`	`}`
`10494`	`10491`	`}`
`10495`	`10492`	`if ( ! ok )`