[layouts] Better error messages when atlas exports fail, hinting that path may be invalid and using correct file format

nyalldawson · nyalldawson · commit a8ef508a3336 · 2018-07-19T15:16:17.000+10:00
(cherry-picked from 3abbb47)
diff --git a/src/core/layout/qgslayoutexporter.cpp b/src/core/layout/qgslayoutexporter.cpp
@@ -439,7 +439,7 @@ QgsLayoutExporter::ExportResult QgsLayoutExporter::exportToImage( QgsAbstractLay
     if ( result != Success )
     {
       if ( result == FileError )
-        error = QObject::tr( "Cannot write to %1. This file may be open in another application." ).arg( filePath );
+        error = QObject::tr( "Cannot write to %1. This file may be open in another application or may be an invalid path." ).arg( QDir::toNativeSeparators( filePath ) );
       iterator->endRender();
       return result;
     }
@@ -566,7 +566,7 @@ QgsLayoutExporter::ExportResult QgsLayoutExporter::exportToPdf( QgsAbstractLayou
     if ( result != Success )
     {
       if ( result == FileError )
-        error = QObject::tr( "Cannot write to %1. This file may be open in another application." ).arg( fileName );
+        error = QObject::tr( "Cannot write to %1. This file may be open in another application or may be an invalid path." ).arg( QDir::toNativeSeparators( fileName ) );
       iterator->endRender();
       return result;
     }
@@ -616,7 +616,7 @@ QgsLayoutExporter::ExportResult QgsLayoutExporter::exportToPdfs( QgsAbstractLayo
     if ( result != Success )
     {
       if ( result == FileError )
-        error = QObject::tr( "Cannot write to %1. This file may be open in another application." ).arg( filePath );
+        error = QObject::tr( "Cannot write to %1. This file may be open in another application or may be an invalid path." ).arg( QDir::toNativeSeparators( filePath ) );
       iterator->endRender();
       return result;
     }
@@ -981,7 +981,7 @@ QgsLayoutExporter::ExportResult QgsLayoutExporter::exportToSvg( QgsAbstractLayou
     if ( result != Success )
     {
       if ( result == FileError )
-        error = QObject::tr( "Cannot write to %1. This file may be open in another application." ).arg( filePath );
+        error = QObject::tr( "Cannot write to %1. This file may be open in another application or may be an invalid path." ).arg( QDir::toNativeSeparators( filePath ) );
       iterator->endRender();
       return result;
     }

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ QgsLayoutExporter::ExportResult QgsLayoutExporter::exportToImage( QgsAbstractLay`
`439`	`439`	`if ( result != Success )`
`440`	`440`	`{`
`441`	`441`	`if ( result == FileError )`
`442`		`- error = QObject::tr( "Cannot write to %1. This file may be open in another application." ).arg( filePath );`
	`442`	`+ error = QObject::tr( "Cannot write to %1. This file may be open in another application or may be an invalid path." ).arg( QDir::toNativeSeparators( filePath ) );`
`443`	`443`	`iterator->endRender();`
`444`	`444`	`return result;`
`445`	`445`	`}`
`@@ -566,7 +566,7 @@ QgsLayoutExporter::ExportResult QgsLayoutExporter::exportToPdf( QgsAbstractLayou`
`566`	`566`	`if ( result != Success )`
`567`	`567`	`{`
`568`	`568`	`if ( result == FileError )`
`569`		`- error = QObject::tr( "Cannot write to %1. This file may be open in another application." ).arg( fileName );`
	`569`	`+ error = QObject::tr( "Cannot write to %1. This file may be open in another application or may be an invalid path." ).arg( QDir::toNativeSeparators( fileName ) );`
`570`	`570`	`iterator->endRender();`
`571`	`571`	`return result;`
`572`	`572`	`}`
`@@ -616,7 +616,7 @@ QgsLayoutExporter::ExportResult QgsLayoutExporter::exportToPdfs( QgsAbstractLayo`
`616`	`616`	`if ( result != Success )`
`617`	`617`	`{`
`618`	`618`	`if ( result == FileError )`
`619`		`- error = QObject::tr( "Cannot write to %1. This file may be open in another application." ).arg( filePath );`
	`619`	`+ error = QObject::tr( "Cannot write to %1. This file may be open in another application or may be an invalid path." ).arg( QDir::toNativeSeparators( filePath ) );`
`620`	`620`	`iterator->endRender();`
`621`	`621`	`return result;`
`622`	`622`	`}`
`@@ -981,7 +981,7 @@ QgsLayoutExporter::ExportResult QgsLayoutExporter::exportToSvg( QgsAbstractLayou`
`981`	`981`	`if ( result != Success )`
`982`	`982`	`{`
`983`	`983`	`if ( result == FileError )`
`984`		`- error = QObject::tr( "Cannot write to %1. This file may be open in another application." ).arg( filePath );`
	`984`	`+ error = QObject::tr( "Cannot write to %1. This file may be open in another application or may be an invalid path." ).arg( QDir::toNativeSeparators( filePath ) );`
`985`	`985`	`iterator->endRender();`
`986`	`986`	`return result;`
`987`	`987`	`}`