fix #2025

jef · jef · commit dc92ab0f2b62 · 2009-10-21T11:22:09.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@11824 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -5577,8 +5577,10 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
       }
 
       //merge tool needs editable layer and provider with the capability of adding and deleting features
-      if ( vlayer->isEditable() && ( dprovider->capabilities() & QgsVectorDataProvider::DeleteFeatures ) \
-           &&  QgsVectorDataProvider::AddFeatures )
+      if ( vlayer->isEditable() &&
+           (dprovider->capabilities() & QgsVectorDataProvider::DeleteFeatures) &&
+           (dprovider->capabilities() & QgsVectorDataProvider::ChangeAttributeValues) &&
+           (dprovider->capabilities() & QgsVectorDataProvider::AddFeatures) )
       {
         mActionMergeFeatures->setEnabled( layerHasSelection );
       }

Original file line number	Diff line number	Diff line change
`@@ -5577,8 +5577,10 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )`
`5577`	`5577`	`}`
`5578`	`5578`
`5579`	`5579`	`//merge tool needs editable layer and provider with the capability of adding and deleting features`
`5580`		`- if ( vlayer->isEditable() && ( dprovider->capabilities() & QgsVectorDataProvider::DeleteFeatures ) \`
`5581`		`- && QgsVectorDataProvider::AddFeatures )`
	`5580`	`+ if ( vlayer->isEditable() &&`
	`5581`	`+ (dprovider->capabilities() & QgsVectorDataProvider::DeleteFeatures) &&`
	`5582`	`+ (dprovider->capabilities() & QgsVectorDataProvider::ChangeAttributeValues) &&`
	`5583`	`+ (dprovider->capabilities() & QgsVectorDataProvider::AddFeatures) )`
`5582`	`5584`	`{`
`5583`	`5585`	`mActionMergeFeatures->setEnabled( layerHasSelection );`
`5584`	`5586`	`}`