Show project path using native OS format

nyalldawson · nyalldawson · commit 71347c4564b6 · 2017-05-04T13:41:40.000+10:00
Avoids showing project paths as d:/... on windows, and instead
uses the more familiar d:\... format
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3518,7 +3518,8 @@ void QgisApp::updateRecentProjectPaths()
 
   Q_FOREACH ( const QgsWelcomePageItemsModel::RecentProjectData &recentProject, mRecentProjects )
   {
-    QAction *action = mRecentProjectsMenu->addAction( QStringLiteral( "%1 (%2)" ).arg( recentProject.title != recentProject.path ? recentProject.title : QFileInfo( recentProject.path ).baseName(), recentProject.path ) );
+    QAction *action = mRecentProjectsMenu->addAction( QStringLiteral( "%1 (%2)" ).arg( recentProject.title != recentProject.path ? recentProject.title : QFileInfo( recentProject.path ).baseName(),
+                      QDir::toNativeSeparators( recentProject.path ) ) );
     action->setEnabled( QFile::exists( ( recentProject.path ) ) );
     action->setData( recentProject.path );
   }
@@ -5382,7 +5383,7 @@ bool QgisApp::fileSave()
   if ( QgsProject::instance()->write() )
   {
     setTitleBarText_( *this ); // update title bar
-    statusBar()->showMessage( tr( "Saved project to: %1" ).arg( QgsProject::instance()->fileName() ), 5000 );
+    statusBar()->showMessage( tr( "Saved project to: %1" ).arg( QDir::toNativeSeparators( QgsProject::instance()->fileName() ) ), 5000 );
 
     saveRecentProjectPath( fullPath.filePath() );
 
@@ -5392,7 +5393,7 @@ bool QgisApp::fileSave()
   else
   {
     QMessageBox::critical( this,
-                           tr( "Unable to save project %1" ).arg( QgsProject::instance()->fileName() ),
+                           tr( "Unable to save project %1" ).arg( QDir::toNativeSeparators( QgsProject::instance()->fileName() ) ),
                            QgsProject::instance()->error() );
     return false;
   }
@@ -5434,15 +5435,15 @@ void QgisApp::fileSaveAs()
   if ( QgsProject::instance()->write() )
   {
     setTitleBarText_( *this ); // update title bar
-    statusBar()->showMessage( tr( "Saved project to: %1" ).arg( QgsProject::instance()->fileName() ), 5000 );
+    statusBar()->showMessage( tr( "Saved project to: %1" ).arg( QDir::toNativeSeparators( QgsProject::instance()->fileName() ) ), 5000 );
     // add this to the list of recently used project files
     saveRecentProjectPath( fullPath.filePath() );
     mProjectLastModified = fullPath.lastModified();
   }
   else
   {
     QMessageBox::critical( this,
-                           tr( "Unable to save project %1" ).arg( QgsProject::instance()->fileName() ),
+                           tr( "Unable to save project %1" ).arg( QDir::toNativeSeparators( QgsProject::instance()->fileName() ) ),
                            QgsProject::instance()->error(),
                            QMessageBox::Ok,
                            Qt::NoButton );
diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp
@@ -147,7 +147,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa
 
   mAutoTransaction->setChecked( QgsProject::instance()->autoTransaction() );
   title( QgsProject::instance()->title() );
-  mProjectFileLineEdit->setText( QgsProject::instance()->fileName() );
+  mProjectFileLineEdit->setText( QDir::toNativeSeparators( QgsProject::instance()->fileName() ) );
 
   // get the manner in which the number of decimal places in the mouse
   // position display is set (manual or automatic)
diff --git a/src/app/qgswelcomepageitemsmodel.cpp b/src/app/qgswelcomepageitemsmodel.cpp
@@ -24,6 +24,7 @@
 #include <QFileInfo>
 #include <QPainter>
 #include <QTextDocument>
+#include <QDir>
 
 QgsWelcomePageItemDelegate::QgsWelcomePageItemDelegate( QObject *parent )
   : QStyledItemDelegate( parent )
@@ -145,7 +146,7 @@ QVariant QgsWelcomePageItemsModel::data( const QModelIndex &index, int role ) co
     case TitleRole:
       return mRecentProjects.at( index.row() ).title != mRecentProjects.at( index.row() ).path ? mRecentProjects.at( index.row() ).title : QFileInfo( mRecentProjects.at( index.row() ).path ).completeBaseName();
     case PathRole:
-      return mRecentProjects.at( index.row() ).path;
+      return QDir::toNativeSeparators( mRecentProjects.at( index.row() ).path );
     case CrsRole:
       if ( mRecentProjects.at( index.row() ).crs != QLatin1String( "" ) )
       {

Original file line number	Diff line number	Diff line change
`@@ -3518,7 +3518,8 @@ void QgisApp::updateRecentProjectPaths()`
`3518`	`3518`
`3519`	`3519`	`Q_FOREACH ( const QgsWelcomePageItemsModel::RecentProjectData &recentProject, mRecentProjects )`
`3520`	`3520`	`{`
`3521`		`- QAction *action = mRecentProjectsMenu->addAction( QStringLiteral( "%1 (%2)" ).arg( recentProject.title != recentProject.path ? recentProject.title : QFileInfo( recentProject.path ).baseName(), recentProject.path ) );`
	`3521`	`+ QAction *action = mRecentProjectsMenu->addAction( QStringLiteral( "%1 (%2)" ).arg( recentProject.title != recentProject.path ? recentProject.title : QFileInfo( recentProject.path ).baseName(),`
	`3522`	`+ QDir::toNativeSeparators( recentProject.path ) ) );`
`3522`	`3523`	`action->setEnabled( QFile::exists( ( recentProject.path ) ) );`
`3523`	`3524`	`action->setData( recentProject.path );`
`3524`	`3525`	`}`
`@@ -5382,7 +5383,7 @@ bool QgisApp::fileSave()`
`5382`	`5383`	`if ( QgsProject::instance()->write() )`
`5383`	`5384`	`{`
`5384`	`5385`	`setTitleBarText_( *this ); // update title bar`
`5385`		`- statusBar()->showMessage( tr( "Saved project to: %1" ).arg( QgsProject::instance()->fileName() ), 5000 );`
	`5386`	`+ statusBar()->showMessage( tr( "Saved project to: %1" ).arg( QDir::toNativeSeparators( QgsProject::instance()->fileName() ) ), 5000 );`
`5386`	`5387`
`5387`	`5388`	`saveRecentProjectPath( fullPath.filePath() );`
`5388`	`5389`
`@@ -5392,7 +5393,7 @@ bool QgisApp::fileSave()`
`5392`	`5393`	`else`
`5393`	`5394`	`{`
`5394`	`5395`	`QMessageBox::critical( this,`
`5395`		`- tr( "Unable to save project %1" ).arg( QgsProject::instance()->fileName() ),`
	`5396`	`+ tr( "Unable to save project %1" ).arg( QDir::toNativeSeparators( QgsProject::instance()->fileName() ) ),`
`5396`	`5397`	`QgsProject::instance()->error() );`
`5397`	`5398`	`return false;`
`5398`	`5399`	`}`
`@@ -5434,15 +5435,15 @@ void QgisApp::fileSaveAs()`
`5434`	`5435`	`if ( QgsProject::instance()->write() )`
`5435`	`5436`	`{`
`5436`	`5437`	`setTitleBarText_( *this ); // update title bar`
`5437`		`- statusBar()->showMessage( tr( "Saved project to: %1" ).arg( QgsProject::instance()->fileName() ), 5000 );`
	`5438`	`+ statusBar()->showMessage( tr( "Saved project to: %1" ).arg( QDir::toNativeSeparators( QgsProject::instance()->fileName() ) ), 5000 );`
`5438`	`5439`	`// add this to the list of recently used project files`
`5439`	`5440`	`saveRecentProjectPath( fullPath.filePath() );`
`5440`	`5441`	`mProjectLastModified = fullPath.lastModified();`
`5441`	`5442`	`}`
`5442`	`5443`	`else`
`5443`	`5444`	`{`
`5444`	`5445`	`QMessageBox::critical( this,`
`5445`		`- tr( "Unable to save project %1" ).arg( QgsProject::instance()->fileName() ),`
	`5446`	`+ tr( "Unable to save project %1" ).arg( QDir::toNativeSeparators( QgsProject::instance()->fileName() ) ),`
`5446`	`5447`	`QgsProject::instance()->error(),`
`5447`	`5448`	`QMessageBox::Ok,`
`5448`	`5449`	`Qt::NoButton );`