Ask confirmation before removing a map theme

DelazJ · DelazJ · commit ecde835a30fc · 2017-11-18T14:08:29.000+01:00
diff --git a/src/app/qgsmapthemes.cpp b/src/app/qgsmapthemes.cpp
@@ -156,11 +156,17 @@ void QgsMapThemes::applyState( const QString &presetName )
 
 void QgsMapThemes::removeCurrentPreset()
 {
-  Q_FOREACH ( QAction *a, mMenuPresetActions )
+  for ( QAction *actionPreset : qgis::as_const( mMenuPresetActions ) )
   {
-    if ( a->isChecked() )
+    if ( actionPreset->isChecked() )
     {
-      QgsProject::instance()->mapThemeCollection()->removeMapTheme( a->text() );
+      int res = QMessageBox::question( mMenu, tr( "Remove Theme" ),
+                                       trUtf8( "Are you sure you want to remove the existing theme “%1”?" ).arg( actionPreset->text() ),
+                                       QMessageBox::Yes | QMessageBox::No, QMessageBox::No );
+      if ( res != QMessageBox::Yes )
+        return;
+      //remove the selected preset
+      QgsProject::instance()->mapThemeCollection()->removeMapTheme( actionPreset->text() );
       break;
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -156,11 +156,17 @@ void QgsMapThemes::applyState( const QString &presetName )`
`156`	`156`
`157`	`157`	`void QgsMapThemes::removeCurrentPreset()`
`158`	`158`	`{`
`159`		`- Q_FOREACH ( QAction *a, mMenuPresetActions )`
	`159`	`+ for ( QAction *actionPreset : qgis::as_const( mMenuPresetActions ) )`
`160`	`160`	`{`
`161`		`- if ( a->isChecked() )`
	`161`	`+ if ( actionPreset->isChecked() )`
`162`	`162`	`{`
`163`		`- QgsProject::instance()->mapThemeCollection()->removeMapTheme( a->text() );`
	`163`	`+ int res = QMessageBox::question( mMenu, tr( "Remove Theme" ),`
	`164`	`+ trUtf8( "Are you sure you want to remove the existing theme “%1”?" ).arg( actionPreset->text() ),`
	`165`	`+ QMessageBox::Yes \| QMessageBox::No, QMessageBox::No );`
	`166`	`+ if ( res != QMessageBox::Yes )`
	`167`	`+ return;`
	`168`	`+ //remove the selected preset`
	`169`	`+ QgsProject::instance()->mapThemeCollection()->removeMapTheme( actionPreset->text() );`
`164`	`170`	`break;`
`165`	`171`	`}`
`166`	`172`	`}`