[FIX] Fix loading projects with . in name

At least on Windows 2.18.qgs is a valid name for a file.
This commit is contained in:
Nathan Woodrow 2018-02-19 15:07:48 +10:00
parent 2c53630747
commit 71a7de6890
2 changed files with 5 additions and 5 deletions

View File

@ -5947,20 +5947,20 @@ void QgisApp::openFile( const QString &fileName )
{
// check to see if we are opening a project file
QFileInfo fi( fileName );
if ( fi.completeSuffix() == QLatin1String( "qgs" ) || fi.completeSuffix() == QLatin1String( "qgz" ) )
if ( fi.suffix() == QLatin1String( "qgs" ) || fi.suffix() == QLatin1String( "qgz" ) )
{
QgsDebugMsg( "Opening project " + fileName );
openProject( fileName );
}
else if ( fi.completeSuffix() == QLatin1String( "qlr" ) )
else if ( fi.suffix() == QLatin1String( "qlr" ) )
{
openLayerDefinition( fileName );
}
else if ( fi.completeSuffix() == QLatin1String( "qpt" ) )
else if ( fi.suffix() == QLatin1String( "qpt" ) )
{
openTemplate( fileName );
}
else if ( fi.completeSuffix() == QLatin1String( "py" ) )
else if ( fi.suffix() == QLatin1String( "py" ) )
{
runScript( fileName );
}

View File

@ -798,7 +798,7 @@ QVector<QgsDataItem *> QgsDirectoryItem::createChildren()
if ( fileInfo.suffix() == QLatin1String( "qgs" ) || fileInfo.suffix() == QLatin1String( "qgz" ) )
{
QgsDataItem *item = new QgsProjectItem( this, fileInfo.baseName(), path );
QgsDataItem *item = new QgsProjectItem( this, fileInfo.completeBaseName(), path );
children.append( item );
continue;
}