Disable Add Preset menu if current style is already a preset

nyalldawson · nyalldawson · commit 415aa83bf0d6 · 2015-08-20T16:09:52.000+10:00
Prevents duplicate entries which have unexpected behaviour
diff --git a/src/app/qgsvisibilitypresets.cpp b/src/app/qgsvisibilitypresets.cpp
@@ -44,7 +44,7 @@ QgsVisibilityPresets::QgsVisibilityPresets()
   mMenu->addAction( QgisApp::instance()->actionHideSelectedLayers() );
   mMenu->addSeparator();
 
-  mMenu->addAction( tr( "Add Preset..." ), this, SLOT( addPreset() ) );
+  mActionAddPreset = mMenu->addAction( tr( "Add Preset..." ), this, SLOT( addPreset() ) );
   mMenuSeparator = mMenu->addSeparator();
 
   mActionRemoveCurrentPreset = mMenu->addAction( tr( "Remove Current Preset" ), this, SLOT( removeCurrentPreset() ) );
@@ -263,5 +263,6 @@ void QgsVisibilityPresets::menuAboutToShow()
   }
   mMenu->insertActions( mMenuSeparator, mMenuPresetActions );
 
+  mActionAddPreset->setEnabled( !hasCurrent );
   mActionRemoveCurrentPreset->setEnabled( hasCurrent );
 }
diff --git a/src/app/qgsvisibilitypresets.h b/src/app/qgsvisibilitypresets.h
@@ -87,6 +87,7 @@ class APP_EXPORT QgsVisibilityPresets : public QObject
 
     QMenu* mMenu;
     QAction* mMenuSeparator;
+    QAction* mActionAddPreset;
     QAction* mActionRemoveCurrentPreset;
     QList<QAction*> mMenuPresetActions;
 };

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ QgsVisibilityPresets::QgsVisibilityPresets()`
`44`	`44`	`mMenu->addAction( QgisApp::instance()->actionHideSelectedLayers() );`
`45`	`45`	`mMenu->addSeparator();`
`46`	`46`
`47`		`- mMenu->addAction( tr( "Add Preset..." ), this, SLOT( addPreset() ) );`
	`47`	`+ mActionAddPreset = mMenu->addAction( tr( "Add Preset..." ), this, SLOT( addPreset() ) );`
`48`	`48`	`mMenuSeparator = mMenu->addSeparator();`
`49`	`49`
`50`	`50`	`mActionRemoveCurrentPreset = mMenu->addAction( tr( "Remove Current Preset" ), this, SLOT( removeCurrentPreset() ) );`
`@@ -263,5 +263,6 @@ void QgsVisibilityPresets::menuAboutToShow()`
`263`	`263`	`}`
`264`	`264`	`mMenu->insertActions( mMenuSeparator, mMenuPresetActions );`
`265`	`265`
	`266`	`+ mActionAddPreset->setEnabled( !hasCurrent );`
`266`	`267`	`mActionRemoveCurrentPreset->setEnabled( hasCurrent );`
`267`	`268`	`}`