@@ -468,8 +468,7 @@ static void setTitleBarText_( QWidget &qgisApp )
468
468
}
469
469
else
470
470
{
471
- QFileInfo projectFileInfo ( QgsProject::instance ()->fileName () );
472
- caption = projectFileInfo.completeBaseName ();
471
+ caption = QgsProject::instance ()->baseName ();
473
472
}
474
473
}
475
474
else
@@ -3964,19 +3963,20 @@ void QgisApp::updateRecentProjectPaths()
3964
3963
} // QgisApp::updateRecentProjectPaths
3965
3964
3966
3965
// add this file to the recently opened/saved projects list
3967
- void QgisApp::saveRecentProjectPath ( const QString &projectPath, bool savePreviewImage )
3966
+ void QgisApp::saveRecentProjectPath ( bool savePreviewImage )
3968
3967
{
3969
3968
// first, re-read the recent project paths. This prevents loss of recent
3970
3969
// projects when multiple QGIS sessions are open
3971
3970
readRecentProjects ();
3972
3971
3973
3972
// Get canonical absolute path
3974
- QFileInfo myFileInfo ( projectPath );
3975
3973
QgsWelcomePageItemsModel::RecentProjectData projectData;
3976
- projectData.path = myFileInfo.absoluteFilePath ();
3974
+ projectData.path = QgsProject::instance ()->absoluteFilePath ();
3975
+ if ( projectData.path .isEmpty () ) // in case of custom project storage
3976
+ projectData.path = QgsProject::instance ()->fileName ();
3977
3977
projectData.title = QgsProject::instance ()->title ();
3978
3978
if ( projectData.title .isEmpty () )
3979
- projectData.title = projectData. path ;
3979
+ projectData.title = QgsProject::instance ()-> baseName () ;
3980
3980
3981
3981
projectData.crs = QgsProject::instance ()->crs ().authid ();
3982
3982
@@ -5681,7 +5681,7 @@ bool QgisApp::addProject( const QString &projectFile )
5681
5681
// specific plug-in state
5682
5682
5683
5683
// add this to the list of recently used project files
5684
- saveRecentProjectPath ( projectFile, false );
5684
+ saveRecentProjectPath ( false );
5685
5685
5686
5686
QApplication::restoreOverrideCursor ();
5687
5687
@@ -5767,7 +5767,7 @@ bool QgisApp::fileSave()
5767
5767
setTitleBarText_ ( *this ); // update title bar
5768
5768
mStatusBar ->showMessage ( tr ( " Saved project to: %1" ).arg ( QDir::toNativeSeparators ( QgsProject::instance ()->fileName () ) ), 5000 );
5769
5769
5770
- saveRecentProjectPath ( fullPath. filePath () );
5770
+ saveRecentProjectPath ();
5771
5771
5772
5772
QFileInfo fi ( QgsProject::instance ()->fileName () );
5773
5773
mProjectLastModified = fi.lastModified ();
@@ -5827,7 +5827,7 @@ void QgisApp::fileSaveAs()
5827
5827
setTitleBarText_ ( *this ); // update title bar
5828
5828
mStatusBar ->showMessage ( tr ( " Saved project to: %1" ).arg ( QDir::toNativeSeparators ( QgsProject::instance ()->fileName () ) ), 5000 );
5829
5829
// add this to the list of recently used project files
5830
- saveRecentProjectPath ( fullPath. filePath () );
5830
+ saveRecentProjectPath ();
5831
5831
mProjectLastModified = fullPath.lastModified ();
5832
5832
}
5833
5833
else
@@ -13582,7 +13582,7 @@ void QgisApp::populateProjectStorageMenu( QMenu *menu, bool saving )
13582
13582
setTitleBarText_ ( *this ); // update title bar
13583
13583
mStatusBar ->showMessage ( tr ( " Saved project to: %1" ).arg ( uri ), 5000 );
13584
13584
// add this to the list of recently used project files
13585
- saveRecentProjectPath ( uri );
13585
+ saveRecentProjectPath ();
13586
13586
mProjectLastModified = QgsProject::instance ()->lastModified ();
13587
13587
}
13588
13588
else
0 commit comments