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

[layouts] Fix handling of layout name when dropping qpt file to app

Browse Source 
- Fix entered name is ignored and replaced by stored name
- Default to name stored in qpt as initial name for layout

Fixes #18790
This commit is contained in:
Nyall Dawson 2018-05-01 12:00:00 +10:00
parent 386495bc76
commit b63733ed96
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/app/qgisapp.cpp
View File

@ -5930,30 +5930,36 @@ void QgisApp::openTemplate( const QString &fileName )
return;
}
QString title;
if ( !uniqueLayoutTitle( this, title, true, QgsMasterLayoutInterface::PrintLayout ) )
{
return;
}
QgsLayoutDesignerDialog *designer = createNewPrintLayout( title );
if ( !designer )
{
messageBar()->pushMessage( tr( "Load template" ), tr( "Could not create print layout" ), Qgis::Warning );
return;
}
bool loadedOk = false;
QDomDocument templateDoc;
if ( templateDoc.setContent( &templateFile, false ) )
if ( !templateDoc.setContent( &templateFile, false ) )
{
designer->currentLayout()->loadFromTemplate( templateDoc, QgsReadWriteContext(), true, &loadedOk );
designer->activate();
messageBar()->pushMessage( tr( "Load template" ), tr( "Could not load template file" ), Qgis::Warning );
return;
}
if ( !loadedOk )
QString title;
QDomElement layoutElem = templateDoc.documentElement();
if ( !layoutElem.isNull() )
title = layoutElem.attribute( QStringLiteral( "name" ) );
if ( !uniqueLayoutTitle( this, title, true, QgsMasterLayoutInterface::PrintLayout, title ) )
{
return;
}
//create new layout object
std::unique_ptr< QgsPrintLayout > layout = qgis::make_unique< QgsPrintLayout >( QgsProject::instance() );
bool loadedOk = false;
layout->loadFromTemplate( templateDoc, QgsReadWriteContext(), true, &loadedOk );
if ( loadedOk )
{
layout->setName( title );
openLayoutDesignerDialog( layout.get() );
QgsProject::instance()->layoutManager()->addLayout( layout.release() );
}
else
{
designer->close();
messageBar()->pushMessage( tr( "Load template" ), tr( "Could not load template file" ), Qgis::Warning );
}
}