sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-07 00:05:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

[layouts] Save last used export folder in project

Browse Source 
And use it in preference to the global last used export folder.
Because GIS use is typically specific project based, and it makes
little sense to default to an output folder related to
a different project.
This commit is contained in:
Nyall Dawson 2018-06-22 11:22:15 +10:00
parent feea121096
commit 58548e044a
3 changed files with 69 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/app/layout/qgslayoutdesignerdialog.cpp
View File

@ -1831,14 +1831,17 @@ void QgsLayoutDesignerDialog::exportToRaster()
if ( !showFileSizeWarning() ) if ( !showFileSizeWarning() )
return; return;
QgsSettings s; QString outputFileName;
QString outputFileName = QgsFileUtils::stringToSafeFilename( mMasterLayout->name() );
QgsLayoutAtlas *printAtlas = atlas(); QgsLayoutAtlas *printAtlas = atlas();
QString lastUsedDir = defaultExportPath();
if ( printAtlas && printAtlas->enabled() && mActionAtlasPreview->isChecked() ) if ( printAtlas && printAtlas->enabled() && mActionAtlasPreview->isChecked() )
{ {
QString lastUsedDir = s.value( QStringLiteral( "lastSaveAsImageDir" ), QDir::homePath(), QgsSettings::App ).toString();
outputFileName = QDir( lastUsedDir ).filePath( QgsFileUtils::stringToSafeFilename( printAtlas->currentFilename() ) ); outputFileName = QDir( lastUsedDir ).filePath( QgsFileUtils::stringToSafeFilename( printAtlas->currentFilename() ) );
} }
else
{
outputFileName = QDir( lastUsedDir ).filePath( QgsFileUtils::stringToSafeFilename( mMasterLayout->name() ) );
}
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
QgisApp::instance()->activateWindow(); QgisApp::instance()->activateWindow();
@ -1852,6 +1855,8 @@ void QgsLayoutDesignerDialog::exportToRaster()
return; return;
} }
setLastExportPath( fileNExt.first );
QgsLayoutExporter::ImageExportSettings settings; QgsLayoutExporter::ImageExportSettings settings;
QSize imageSize; QSize imageSize;
if ( !getRasterExportSettings( settings, imageSize ) ) if ( !getRasterExportSettings( settings, imageSize ) )
@ -1921,19 +1926,17 @@ void QgsLayoutDesignerDialog::exportToPdf()
showForceVectorWarning(); showForceVectorWarning();
} }
QgsSettings settings; const QString exportPath = defaultExportPath();
QString lastUsedFile = settings.value( QStringLiteral( "lastSaveAsPdfFile" ), QStringLiteral( "qgis.pdf" ), QgsSettings::App ).toString();
QFileInfo file( lastUsedFile );
QString outputFileName; QString outputFileName;
QgsLayoutAtlas *printAtlas = atlas(); QgsLayoutAtlas *printAtlas = atlas();
if ( printAtlas && printAtlas->enabled() && mActionAtlasPreview->isChecked() ) if ( printAtlas && printAtlas->enabled() && mActionAtlasPreview->isChecked() )
{ {
outputFileName = QDir( file.path() ).filePath( QgsFileUtils::stringToSafeFilename( printAtlas->currentFilename() ) + QStringLiteral( ".pdf" ) ); outputFileName = QDir( exportPath ).filePath( QgsFileUtils::stringToSafeFilename( printAtlas->currentFilename() ) + QStringLiteral( ".pdf" ) );
} }
else else
{ {
outputFileName = file.path() + '/' + QgsFileUtils::stringToSafeFilename( mMasterLayout->name() ) + QStringLiteral( ".pdf" ); outputFileName = exportPath + '/' + QgsFileUtils::stringToSafeFilename( mMasterLayout->name() ) + QStringLiteral( ".pdf" );
} }
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
@ -1956,7 +1959,7 @@ void QgsLayoutDesignerDialog::exportToPdf()
outputFileName += QLatin1String( ".pdf" ); outputFileName += QLatin1String( ".pdf" );
} }
settings.setValue( QStringLiteral( "lastSaveAsPdfFile" ), outputFileName, QgsSettings::App ); setLastExportPath( outputFileName );
mView->setPaintingEnabled( false ); mView->setPaintingEnabled( false );
QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor ); QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor );
@ -2025,19 +2028,17 @@ void QgsLayoutDesignerDialog::exportToSvg()
showSvgExportWarning(); showSvgExportWarning();
QgsSettings settings; const QString defaultPath = defaultExportPath();
QString lastUsedFile = settings.value( QStringLiteral( "lastSaveAsSvgFile" ), QStringLiteral( "qgis.svg" ), QgsSettings::App ).toString();
QFileInfo file( lastUsedFile );
QString outputFileName = QgsFileUtils::stringToSafeFilename( mMasterLayout->name() ); QString outputFileName = QgsFileUtils::stringToSafeFilename( mMasterLayout->name() );
QgsLayoutAtlas *printAtlas = atlas(); QgsLayoutAtlas *printAtlas = atlas();
if ( printAtlas && printAtlas->enabled() && mActionAtlasPreview->isChecked() ) if ( printAtlas && printAtlas->enabled() && mActionAtlasPreview->isChecked() )
{ {
outputFileName = QDir( file.path() ).filePath( QgsFileUtils::stringToSafeFilename( printAtlas->currentFilename() + QStringLiteral( ".svg" ) ) ); outputFileName = QDir( defaultPath ).filePath( QgsFileUtils::stringToSafeFilename( printAtlas->currentFilename() + QStringLiteral( ".svg" ) ) );
} }
else else
{ {
outputFileName = file.path() + '/' + QgsFileUtils::stringToSafeFilename( mMasterLayout->name() ) + QStringLiteral( ".svg" ); outputFileName = defaultPath + '/' + QgsFileUtils::stringToSafeFilename( mMasterLayout->name() ) + QStringLiteral( ".svg" );
} }
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
@ -2061,7 +2062,7 @@ void QgsLayoutDesignerDialog::exportToSvg()
} }
bool prevSettingLabelsAsOutlines = mLayout->project()->readBoolEntry( QStringLiteral( "PAL" ), QStringLiteral( "/DrawOutlineLabels" ), true ); bool prevSettingLabelsAsOutlines = mLayout->project()->readBoolEntry( QStringLiteral( "PAL" ), QStringLiteral( "/DrawOutlineLabels" ), true );
settings.setValue( QStringLiteral( "lastSaveAsSvgFile" ), outputFileName, QgsSettings::App ); setLastExportPath( outputFileName );
QgsLayoutExporter::SvgExportSettings svgSettings; QgsLayoutExporter::SvgExportSettings svgSettings;
bool exportAsText = false; bool exportAsText = false;
@ -2437,8 +2438,7 @@ void QgsLayoutDesignerDialog::exportAtlasToRaster()
printAtlas->setFilenameExpression( QStringLiteral( "'output_'||@atlas_featurenumber" ), error ); printAtlas->setFilenameExpression( QStringLiteral( "'output_'||@atlas_featurenumber" ), error );
} }
QgsSettings s; QString lastUsedDir = defaultExportPath();
QString lastUsedDir = s.value( QStringLiteral( "lastSaveAtlasAsImagesDir" ), QDir::homePath(), QgsSettings::App ).toString();
QFileDialog dlg( this, tr( "Export Atlas to Directory" ) ); QFileDialog dlg( this, tr( "Export Atlas to Directory" ) );
dlg.setFileMode( QFileDialog::Directory ); dlg.setFileMode( QFileDialog::Directory );
@ -2461,7 +2461,7 @@ void QgsLayoutDesignerDialog::exportAtlasToRaster()
{ {
return; return;
} }
s.setValue( QStringLiteral( "lastSaveAtlasAsImagesDir" ), dir, QgsSettings::App ); setLastExportPath( dir );
// test directory (if it exists and is writable) // test directory (if it exists and is writable)
if ( !QDir( dir ).exists() || !QFileInfo( dir ).isWritable() ) if ( !QDir( dir ).exists() || !QFileInfo( dir ).isWritable() )
@ -2592,8 +2592,7 @@ void QgsLayoutDesignerDialog::exportAtlasToSvg()
printAtlas->setFilenameExpression( QStringLiteral( "'output_'||@atlas_featurenumber" ), error ); printAtlas->setFilenameExpression( QStringLiteral( "'output_'||@atlas_featurenumber" ), error );
} }
QgsSettings s; QString lastUsedDir = defaultExportPath();
QString lastUsedDir = s.value( QStringLiteral( "lastSaveAtlasAsSvgDir" ), QDir::homePath(), QgsSettings::App ).toString();
QFileDialog dlg( this, tr( "Export Atlas to Directory" ) ); QFileDialog dlg( this, tr( "Export Atlas to Directory" ) );
dlg.setFileMode( QFileDialog::Directory ); dlg.setFileMode( QFileDialog::Directory );
@ -2619,7 +2618,7 @@ void QgsLayoutDesignerDialog::exportAtlasToSvg()
{ {
return; return;
} }
s.setValue( QStringLiteral( "lastSaveAtlasAsSvgDir" ), dir, QgsSettings::App ); setLastExportPath( dir );
// test directory (if it exists and is writable) // test directory (if it exists and is writable)
if ( !QDir( dir ).exists() || !QFileInfo( dir ).isWritable() ) if ( !QDir( dir ).exists() || !QFileInfo( dir ).isWritable() )
@ -2754,13 +2753,11 @@ void QgsLayoutDesignerDialog::exportAtlasToPdf()
bool singleFile = mLayout->customProperty( QStringLiteral( "singleFile" ), true ).toBool(); bool singleFile = mLayout->customProperty( QStringLiteral( "singleFile" ), true ).toBool();
QString outputFileName; QString outputFileName;
QgsSettings settings;
QString dir; QString dir;
if ( singleFile ) if ( singleFile )
{ {
QString lastUsedFile = settings.value( QStringLiteral( "lastSaveAsPdfFile" ), QStringLiteral( "qgis.pdf" ), QgsSettings::App ).toString(); const QString defaultPath = defaultExportPath();
QFileInfo file( lastUsedFile ); outputFileName = defaultPath + '/' + QgsFileUtils::stringToSafeFilename( mMasterLayout->name() ) + QStringLiteral( ".pdf" );
outputFileName = file.path() + '/' + QgsFileUtils::stringToSafeFilename( mMasterLayout->name() ) + QStringLiteral( ".pdf" );
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
QgisApp::instance()->activateWindow(); QgisApp::instance()->activateWindow();
@ -2781,7 +2778,7 @@ void QgsLayoutDesignerDialog::exportAtlasToPdf()
{ {
outputFileName += QLatin1String( ".pdf" ); outputFileName += QLatin1String( ".pdf" );
} }
settings.setValue( QStringLiteral( "lastSaveAsPdfFile" ), outputFileName, QgsSettings::App ); setLastExportPath( outputFileName );
} }
else else
{ {
@ -2800,7 +2797,7 @@ void QgsLayoutDesignerDialog::exportAtlasToPdf()
} }
QString lastUsedDir = settings.value( QStringLiteral( "lastSaveAtlasAsPdfDir" ), QDir::homePath(), QgsSettings::App ).toString(); const QString lastUsedDir = defaultExportPath();
QFileDialog dlg( this, tr( "Export Atlas to Directory" ) ); QFileDialog dlg( this, tr( "Export Atlas to Directory" ) );
dlg.setFileMode( QFileDialog::Directory ); dlg.setFileMode( QFileDialog::Directory );
@ -2826,7 +2823,7 @@ void QgsLayoutDesignerDialog::exportAtlasToPdf()
{ {
return; return;
} }
settings.setValue( QStringLiteral( "lastSaveAtlasAsPdfDir" ), dir, QgsSettings::App ); setLastExportPath( dir );
// test directory (if it exists and is writable) // test directory (if it exists and is writable)
if ( !QDir( dir ).exists() || !QFileInfo( dir ).isWritable() ) if ( !QDir( dir ).exists() || !QFileInfo( dir ).isWritable() )
@ -2950,7 +2947,6 @@ void QgsLayoutDesignerDialog::exportAtlasToPdf()
void QgsLayoutDesignerDialog::exportReportToRaster() void QgsLayoutDesignerDialog::exportReportToRaster()
{ {
QgsSettings s;
QString outputFileName = QgsFileUtils::stringToSafeFilename( mMasterLayout->name() ); QString outputFileName = QgsFileUtils::stringToSafeFilename( mMasterLayout->name() );
QPair<QString, QString> fileNExt = QgsGuiUtils::getSaveAsImageName( this, tr( "Save Report As" ), outputFileName ); QPair<QString, QString> fileNExt = QgsGuiUtils::getSaveAsImageName( this, tr( "Save Report As" ), outputFileName );
@ -2961,6 +2957,8 @@ void QgsLayoutDesignerDialog::exportReportToRaster()
return; return;
} }
setLastExportPath( fileNExt.first );
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
QgisApp::instance()->activateWindow(); QgisApp::instance()->activateWindow();
this->raise(); this->raise();
@ -3051,10 +3049,8 @@ void QgsLayoutDesignerDialog::exportReportToSvg()
{ {
showSvgExportWarning(); showSvgExportWarning();
QgsSettings settings; const QString defaultPath = defaultExportPath();
QString lastUsedFile = settings.value( QStringLiteral( "lastSaveAsSvgFile" ), QStringLiteral( "qgis.svg" ), QgsSettings::App ).toString(); QString outputFileName = defaultPath + '/' + QgsFileUtils::stringToSafeFilename( mMasterLayout->name() ) + QStringLiteral( ".svg" );
QFileInfo file( lastUsedFile );
QString outputFileName = file.path() + '/' + QgsFileUtils::stringToSafeFilename( mMasterLayout->name() ) + QStringLiteral( ".svg" );
outputFileName = QFileDialog::getSaveFileName( outputFileName = QFileDialog::getSaveFileName(
this, this,
@ -3076,7 +3072,7 @@ void QgsLayoutDesignerDialog::exportReportToSvg()
this->raise(); this->raise();
#endif #endif
bool prevSettingLabelsAsOutlines = mMasterLayout->layoutProject()->readBoolEntry( QStringLiteral( "PAL" ), QStringLiteral( "/DrawOutlineLabels" ), true ); bool prevSettingLabelsAsOutlines = mMasterLayout->layoutProject()->readBoolEntry( QStringLiteral( "PAL" ), QStringLiteral( "/DrawOutlineLabels" ), true );
settings.setValue( QStringLiteral( "lastSaveAsSvgFile" ), outputFileName, QgsSettings::App ); setLastExportPath( outputFileName );
QgsLayoutExporter::SvgExportSettings svgSettings; QgsLayoutExporter::SvgExportSettings svgSettings;
bool exportAsText = false; bool exportAsText = false;
@ -3179,12 +3175,9 @@ void QgsLayoutDesignerDialog::exportReportToSvg()
void QgsLayoutDesignerDialog::exportReportToPdf() void QgsLayoutDesignerDialog::exportReportToPdf()
{ {
QgsSettings settings; const QString defaultPath = defaultExportPath();
QString lastUsedFile = settings.value( QStringLiteral( "lastSaveAsPdfFile" ), QStringLiteral( "qgis.pdf" ), QgsSettings::App ).toString(); QString outputFileName = defaultPath + '/' + QgsFileUtils::stringToSafeFilename( mMasterLayout->name() ) + QStringLiteral( ".pdf" );
QFileInfo file( lastUsedFile );
QString outputFileName = file.path() + '/' + QgsFileUtils::stringToSafeFilename( mMasterLayout->name() ) + QStringLiteral( ".pdf" );
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
QgisApp::instance()->activateWindow(); QgisApp::instance()->activateWindow();
@ -3205,7 +3198,7 @@ void QgsLayoutDesignerDialog::exportReportToPdf()
{ {
outputFileName += QLatin1String( ".pdf" ); outputFileName += QLatin1String( ".pdf" );
} }
settings.setValue( QStringLiteral( "lastSaveAsPdfFile" ), outputFileName, QgsSettings::App ); setLastExportPath( outputFileName );
mView->setPaintingEnabled( false ); mView->setPaintingEnabled( false );
QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor ); QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor );
@ -4151,6 +4144,36 @@ void QgsLayoutDesignerDialog::updateActionNames( QgsMasterLayoutInterface::Type
} }
} }
QString QgsLayoutDesignerDialog::defaultExportPath() const
{
// first priority - last export folder saved in project
const QString projectLastExportPath = QgsFileUtils::findClosestExistingPath( QgsProject::instance()->readEntry( QStringLiteral( "Layouts" ), QStringLiteral( "/lastLayoutExportDir" ), QString() ) );
if ( !projectLastExportPath.isEmpty() )
return projectLastExportPath;
// second priority - project home path
const QString projectHome = QgsFileUtils::findClosestExistingPath( QgsProject::instance()->homePath() );
if ( !projectHome.isEmpty() )
return projectHome;
// last priority - app setting last export folder, with homepath as backup
QgsSettings s;
return QgsFileUtils::findClosestExistingPath( s.value( QStringLiteral( "lastLayoutExportDir" ), QDir::homePath(), QgsSettings::App ).toString() );
}
void QgsLayoutDesignerDialog::setLastExportPath( const QString &path ) const
{
QFileInfo fi( path );
QString savePath;
if ( fi.isFile() )
savePath = fi.path();
else
savePath = path;
QgsProject::instance()->writeEntry( QStringLiteral( "Layouts" ), QStringLiteral( "/lastLayoutExportDir" ), savePath );
QgsSettings().setValue( QStringLiteral( "lastLayoutExportDir" ), savePath, QgsSettings::App );
}
void QgsLayoutDesignerDialog::updateWindowTitle() void QgsLayoutDesignerDialog::updateWindowTitle()
{ {
QString title; QString title;

3
src/app/layout/qgslayoutdesignerdialog.h
View File

@ -502,6 +502,9 @@ class QgsLayoutDesignerDialog: public QMainWindow, private Ui::QgsLayoutDesigner
QString reportTypeString(); QString reportTypeString();
void updateActionNames( QgsMasterLayoutInterface::Type type ); void updateActionNames( QgsMasterLayoutInterface::Type type );
QString defaultExportPath() const;
void setLastExportPath( const QString &path ) const;
}; };
#endif // QGSLAYOUTDESIGNERDIALOG_H #endif // QGSLAYOUTDESIGNERDIALOG_H

3
src/core/qgsfileutils.cpp
View File

@ -96,6 +96,9 @@ QString QgsFileUtils::stringToSafeFilename( const QString &string )
QString QgsFileUtils::findClosestExistingPath( const QString &path ) QString QgsFileUtils::findClosestExistingPath( const QString &path )
{ {
if ( path.isEmpty() )
return QString();
QDir currentPath; QDir currentPath;
QFileInfo fi( path ); QFileInfo fi( path );
if ( fi.isFile() ) if ( fi.isFile() )