sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-08 00:02:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate "save as template" action being shown under the

Browse Source 
"Open Project From" menu item
This commit is contained in:
Nyall Dawson 2019-06-24 08:27:11 +10:00
parent 8663011287
commit 9ab1b3e1ed
1 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/app/qgisapp.cpp
View File

@ -14513,55 +14513,60 @@ QgsFeature QgisApp::duplicateFeatureDigitized( QgsMapLayer *mlayer, const QgsFea
}
void QgisApp::populateProjectStorageMenu( QMenu *menu, bool saving )
void QgisApp::populateProjectStorageMenu( QMenu *menu, const bool saving )
{
menu->clear();
const QList<QgsProjectStorage *> storages = QgsApplication::projectStorageRegistry()->projectStorages();
QAction *action = menu->addAction( tr( "Templates" ) + QChar( 0x2026 ) ); // 0x2026 = ellipsis character
connect( action, &QAction::triggered, this, [ this ]
if ( saving )
{
QgsSettings settings;
QString templateDirName = settings.value( QStringLiteral( "qgis/projectTemplateDir" ),
QgsApplication::qgisSettingsDirPath() + "project_templates" ).toString();
const QString originalFilename = QgsProject::instance()->fileName();
QString templateName = QFileInfo( originalFilename ).baseName();
if ( templateName.isEmpty() )
QAction *action = menu->addAction( tr( "Templates" ) + QChar( 0x2026 ) ); // 0x2026 = ellipsis character
connect( action, &QAction::triggered, this, [ this ]
{
bool ok;
templateName = QInputDialog::getText( this, tr( "Template Name" ),
tr( "Name for the template" ), QLineEdit::Normal,
QString(), &ok );
QgsSettings settings;
QString templateDirName = settings.value( QStringLiteral( "qgis/projectTemplateDir" ),
QgsApplication::qgisSettingsDirPath() + "project_templates" ).toString();
const QString originalFilename = QgsProject::instance()->fileName();
QString templateName = QFileInfo( originalFilename ).baseName();
if ( !ok )
return;
if ( templateName.isEmpty() )
{
messageBar()->pushInfo( tr( "Template not saved" ), tr( "The template can not have an empty name." ) );
bool ok;
templateName = QInputDialog::getText( this, tr( "Template Name" ),
tr( "Name for the template" ), QLineEdit::Normal,
QString(), &ok );
if ( !ok )
return;
if ( templateName.isEmpty() )
{
messageBar()->pushInfo( tr( "Template not saved" ), tr( "The template can not have an empty name." ) );
}
}
}
const QString filePath = templateDirName + QDir::separator() + templateName + QStringLiteral( ".qgz" );
if ( QFileInfo::exists( filePath ) )
{
QMessageBox msgBox( this );
msgBox.setWindowTitle( tr( "Overwrite template" ) );
msgBox.setText( tr( "The template %1 already exists, do you want to replace it?" ).arg( templateName ) );
msgBox.addButton( tr( "Overwrite" ), QMessageBox::YesRole );
auto cancelButton = msgBox.addButton( QMessageBox::Cancel );
msgBox.setIcon( QMessageBox::Question );
msgBox.exec();
if ( msgBox.clickedButton() == cancelButton )
const QString filePath = templateDirName + QDir::separator() + templateName + QStringLiteral( ".qgz" );
if ( QFileInfo::exists( filePath ) )
{
return;
QMessageBox msgBox( this );
msgBox.setWindowTitle( tr( "Overwrite Template" ) );
msgBox.setText( tr( "The template %1 already exists, do you want to replace it?" ).arg( templateName ) );
msgBox.addButton( tr( "Overwrite" ), QMessageBox::YesRole );
auto cancelButton = msgBox.addButton( QMessageBox::Cancel );
msgBox.setIcon( QMessageBox::Question );
msgBox.exec();
if ( msgBox.clickedButton() == cancelButton )
{
return;
}
}
}
QgsProject::instance()->write( filePath );
QgsProject::instance()->setFileName( originalFilename );
messageBar()->pushInfo( tr( "Template saved" ), tr( "Template %1 was saved" ).arg( templateName ) );
QgsProject::instance()->write( filePath );
QgsProject::instance()->setFileName( originalFilename );
messageBar()->pushInfo( tr( "Template saved" ), tr( "Template %1 was saved" ).arg( templateName ) );
} );
}
} );
for ( QgsProjectStorage *storage : storages )
{
QString name = storage->visibleName();