[FEATURE][welcome page] remove from list action (fixes #13722)

nirvn · web-flow · commit d40447e7d0ca · 2017-10-26T19:25:49.000+07:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -744,6 +744,12 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
 
   startProfile( QStringLiteral( "Welcome page" ) );
   mWelcomePage = new QgsWelcomePage( skipVersionCheck );
+  connect( mWelcomePage, &QgsWelcomePage::projectRemoved, this, [ this ]( int row )
+  {
+    mRecentProjects.removeAt( row );
+    saveRecentProjects();
+  } );
+
   endProfile();
 
   mCentralContainer = new QStackedWidget;
@@ -3830,8 +3836,6 @@ void QgisApp::saveRecentProjectPath( const QString &projectPath, bool savePrevie
   // projects when multiple QGIS sessions are open
   readRecentProjects();
 
-  QgsSettings settings;
-
   // Get canonical absolute path
   QFileInfo myFileInfo( projectPath );
   QgsWelcomePageItemsModel::RecentProjectData projectData;
@@ -3883,10 +3887,22 @@ void QgisApp::saveRecentProjectPath( const QString &projectPath, bool savePrevie
     QFile( mRecentProjects.takeLast().previewImagePath ).remove();
   }
 
+  // Persist the list
+  saveRecentProjects();
+
+  // Update menu list of paths
+  updateRecentProjectPaths();
+
+} // QgisApp::saveRecentProjectPath
+
+// Save recent projects list to settings
+void QgisApp::saveRecentProjects()
+{
+  QgsSettings settings;
+
   settings.remove( QStringLiteral( "/UI/recentProjects" ) );
   int idx = 0;
 
-  // Persist the list
   Q_FOREACH ( const QgsWelcomePageItemsModel::RecentProjectData &recentProject, mRecentProjects )
   {
     ++idx;
@@ -3897,11 +3913,7 @@ void QgisApp::saveRecentProjectPath( const QString &projectPath, bool savePrevie
     settings.setValue( QStringLiteral( "crs" ), recentProject.crs );
     settings.endGroup();
   }
-
-  // Update menu list of paths
-  updateRecentProjectPaths();
-
-} // QgisApp::saveRecentProjectPath
+}
 
 // Update project menu with the project templates
 void QgisApp::updateProjectFromTemplates()
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -1691,6 +1691,8 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
      * \param savePreviewImage Set to false when the preview image should not be saved. E.g. project load.
      */
     void saveRecentProjectPath( const QString &projectPath, bool savePreviewImage = true );
+    //! Save recent projects list to settings
+    void saveRecentProjects();
     //! Update project menu with the current list of recently accessed projects
     void updateRecentProjectPaths();
     //! Read Well Known Binary stream from PostGIS
diff --git a/src/app/qgswelcomepage.cpp b/src/app/qgswelcomepage.cpp
@@ -145,6 +145,13 @@ void QgsWelcomePage::showContextMenuForProjects( QPoint point )
     } );
     menu->addAction( rescanAction );
   }
+  QAction *removeProjectAction = new QAction( tr( "Remove from List" ), menu );
+  connect( removeProjectAction, &QAction::triggered, this, [this, index]
+  {
+    mModel->removeProject( index );
+    emit projectRemoved( index.row() );
+  } );
+  menu->addAction( removeProjectAction );
 
   menu->popup( mapToGlobal( point ) );
 }
diff --git a/src/app/qgswelcomepage.h b/src/app/qgswelcomepage.h
@@ -35,6 +35,9 @@ class QgsWelcomePage : public QWidget
 
     void setRecentProjects( const QList<QgsWelcomePageItemsModel::RecentProjectData> &recentProjects );
 
+  signals:
+    void projectRemoved( int row );
+
   private slots:
     void itemActivated( const QModelIndex &index );
     void versionInfoReceived();
diff --git a/src/app/qgswelcomepageitemsmodel.cpp b/src/app/qgswelcomepageitemsmodel.cpp
@@ -214,6 +214,11 @@ Qt::ItemFlags QgsWelcomePageItemsModel::flags( const QModelIndex &index ) const
   return flags;
 }
 
+void QgsWelcomePageItemsModel::removeProject( const QModelIndex &index )
+{
+  mRecentProjects.removeAt( index.row() );
+}
+
 void QgsWelcomePageItemsModel::recheckProject( const QModelIndex &index )
 {
   const RecentProjectData &projectData = mRecentProjects.at( index.row() );
diff --git a/src/app/qgswelcomepageitemsmodel.h b/src/app/qgswelcomepageitemsmodel.h
@@ -62,6 +62,7 @@ class QgsWelcomePageItemsModel : public QAbstractListModel
     QVariant data( const QModelIndex &index, int role ) const override;
     Qt::ItemFlags flags( const QModelIndex &index ) const override;
 
+    void removeProject( const QModelIndex &index );
     void recheckProject( const QModelIndex &index );
 
   private:

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,13 @@ void QgsWelcomePage::showContextMenuForProjects( QPoint point )`
`145`	`145`	`} );`
`146`	`146`	`menu->addAction( rescanAction );`
`147`	`147`	`}`
	`148`	`+ QAction *removeProjectAction = new QAction( tr( "Remove from List" ), menu );`
	`149`	`+ connect( removeProjectAction, &QAction::triggered, this, [this, index]`
	`150`	`+ {`
	`151`	`+ mModel->removeProject( index );`
	`152`	`+ emit projectRemoved( index.row() );`
	`153`	`+ } );`
	`154`	`+ menu->addAction( removeProjectAction );`
`148`	`155`
`149`	`156`	`menu->popup( mapToGlobal( point ) );`
`150`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -214,6 +214,11 @@ Qt::ItemFlags QgsWelcomePageItemsModel::flags( const QModelIndex &index ) const`
`214`	`214`	`return flags;`
`215`	`215`	`}`
`216`	`216`
	`217`	`+void QgsWelcomePageItemsModel::removeProject( const QModelIndex &index )`
	`218`	`+{`
	`219`	`+ mRecentProjects.removeAt( index.row() );`
	`220`	`+}`
	`221`	`+`
`217`	`222`	`void QgsWelcomePageItemsModel::recheckProject( const QModelIndex &index )`
`218`	`223`	`{`
`219`	`224`	`const RecentProjectData &projectData = mRecentProjects.at( index.row() );`