change to messagebar some messageboxes in mainapp

slarosa · slarosa · commit 2f4489de7e08 · 2014-09-26T20:35:25.000+02:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -7714,8 +7714,8 @@ QgsVectorLayer* QgisApp::addVectorLayer( QString vectorLayerPath, QString baseNa
   }
   else
   {
-    QMessageBox::critical( this, tr( "Layer is not valid" ),
-                           tr( "The layer %1 is not a valid layer and can not be added to the map" ).arg( vectorLayerPath ) );
+    QString msg = tr( "The layer %1 is not a valid layer and can not be added to the map" ).arg( vectorLayerPath );
+    messageBar()->pushMessage( tr( "Layer is not valid" ), msg, QgsMessageBar::CRITICAL, messageTimeout() );
 
     delete layer;
     mMapCanvas->freeze( false );
@@ -7757,8 +7757,8 @@ void QgisApp::addMapLayer( QgsMapLayer *theMapLayer )
   }
   else
   {
-    QMessageBox::critical( this, tr( "Layer is not valid" ),
-                           tr( "The layer is not a valid layer and can not be added to the map" ) );
+    QString msg = tr( "The layer is not a valid layer and can not be added to the map" );
+    messageBar()->pushMessage( tr( "Layer is not valid" ), msg, QgsMessageBar::CRITICAL, messageTimeout() );
   }
 
   // draw the map

Original file line number	Diff line number	Diff line change
`@@ -7714,8 +7714,8 @@ QgsVectorLayer* QgisApp::addVectorLayer( QString vectorLayerPath, QString baseNa`
`7714`	`7714`	`}`
`7715`	`7715`	`else`
`7716`	`7716`	`{`
`7717`		`- QMessageBox::critical( this, tr( "Layer is not valid" ),`
`7718`		`- tr( "The layer %1 is not a valid layer and can not be added to the map" ).arg( vectorLayerPath ) );`
	`7717`	`+ QString msg = tr( "The layer %1 is not a valid layer and can not be added to the map" ).arg( vectorLayerPath );`
	`7718`	`+ messageBar()->pushMessage( tr( "Layer is not valid" ), msg, QgsMessageBar::CRITICAL, messageTimeout() );`
`7719`	`7719`
`7720`	`7720`	`delete layer;`
`7721`	`7721`	`mMapCanvas->freeze( false );`
`@@ -7757,8 +7757,8 @@ void QgisApp::addMapLayer( QgsMapLayer *theMapLayer )`
`7757`	`7757`	`}`
`7758`	`7758`	`else`
`7759`	`7759`	`{`
`7760`		`- QMessageBox::critical( this, tr( "Layer is not valid" ),`
`7761`		`- tr( "The layer is not a valid layer and can not be added to the map" ) );`
	`7760`	`+ QString msg = tr( "The layer is not a valid layer and can not be added to the map" );`
	`7761`	`+ messageBar()->pushMessage( tr( "Layer is not valid" ), msg, QgsMessageBar::CRITICAL, messageTimeout() );`
`7762`	`7762`	`}`
`7763`	`7763`
`7764`	`7764`	`// draw the map`