fix for bug #925 'Add Island' and 'Add Ring' not greyed-out when leaving edit mode

mhugent · mhugent · commit 0eca4621e739 · 2008-01-30T16:12:29.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@8097 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4809,17 +4809,20 @@ void QgisApp::activateDeactivateLayerRelatedActions(QgsMapLayer* layer)
         if(vlayer->isEditable() && dprovider->capabilities() & QgsVectorDataProvider::AddFeatures)
         {
           mActionCapturePoint->setEnabled(true);
+	  mActionMoveFeature->setEnabled(true);
         }
         else
         {
           mActionCapturePoint->setEnabled(false);
+	  mActionMoveFeature->setEnabled(false);
         }
         mActionCaptureLine->setEnabled(false);
         mActionCapturePolygon->setEnabled(false);
         mActionAddVertex->setEnabled(false);
         mActionDeleteVertex->setEnabled(false);
         mActionAddRing->setEnabled(false);
         mActionAddIsland->setEnabled(false);
+	mActionSplitFeatures->setEnabled(false);
         if(vlayer->isEditable() && dprovider->capabilities() & QgsVectorDataProvider::ChangeGeometries)
         {
           mActionMoveVertex->setEnabled(true);
@@ -4832,10 +4835,14 @@ void QgisApp::activateDeactivateLayerRelatedActions(QgsMapLayer* layer)
         if(vlayer->isEditable() && dprovider->capabilities() & QgsVectorDataProvider::AddFeatures)
         {
           mActionCaptureLine->setEnabled(true);
+	  mActionSplitFeatures->setEnabled(true);
+	  mActionMoveFeature->setEnabled(true);
         }
         else
         {
           mActionCaptureLine->setEnabled(false);
+	  mActionSplitFeatures->setEnabled(false);
+	  mActionMoveFeature->setEnabled(false);
         }
         mActionCapturePoint->setEnabled(false);
         mActionCapturePolygon->setEnabled(false);
@@ -4847,10 +4854,18 @@ void QgisApp::activateDeactivateLayerRelatedActions(QgsMapLayer* layer)
         if(vlayer->isEditable() && dprovider->capabilities() & QgsVectorDataProvider::AddFeatures)
         {
           mActionCapturePolygon->setEnabled(true);
+	  mActionAddRing->setEnabled(true);
+	  mActionAddIsland->setEnabled(true);
+	  mActionSplitFeatures->setEnabled(true);
+	  mActionMoveFeature->setEnabled(true);
         }
         else
         {
           mActionCapturePolygon->setEnabled(false);
+	  mActionAddRing->setEnabled(false);
+	  mActionAddIsland->setEnabled(false);
+	  mActionSplitFeatures->setEnabled(false);
+	  mActionMoveFeature->setEnabled(false);
         }
         mActionCapturePoint->setEnabled(false);
         mActionCaptureLine->setEnabled(false);

Original file line number	Diff line number	Diff line change
`@@ -4809,17 +4809,20 @@ void QgisApp::activateDeactivateLayerRelatedActions(QgsMapLayer* layer)`
`4809`	`4809`	`if(vlayer->isEditable() && dprovider->capabilities() & QgsVectorDataProvider::AddFeatures)`
`4810`	`4810`	`{`
`4811`	`4811`	`mActionCapturePoint->setEnabled(true);`
	`4812`	`+ mActionMoveFeature->setEnabled(true);`
`4812`	`4813`	`}`
`4813`	`4814`	`else`
`4814`	`4815`	`{`
`4815`	`4816`	`mActionCapturePoint->setEnabled(false);`
	`4817`	`+ mActionMoveFeature->setEnabled(false);`
`4816`	`4818`	`}`
`4817`	`4819`	`mActionCaptureLine->setEnabled(false);`
`4818`	`4820`	`mActionCapturePolygon->setEnabled(false);`
`4819`	`4821`	`mActionAddVertex->setEnabled(false);`
`4820`	`4822`	`mActionDeleteVertex->setEnabled(false);`
`4821`	`4823`	`mActionAddRing->setEnabled(false);`
`4822`	`4824`	`mActionAddIsland->setEnabled(false);`
	`4825`	`+ mActionSplitFeatures->setEnabled(false);`
`4823`	`4826`	`if(vlayer->isEditable() && dprovider->capabilities() & QgsVectorDataProvider::ChangeGeometries)`
`4824`	`4827`	`{`
`4825`	`4828`	`mActionMoveVertex->setEnabled(true);`
`@@ -4832,10 +4835,14 @@ void QgisApp::activateDeactivateLayerRelatedActions(QgsMapLayer* layer)`
`4832`	`4835`	`if(vlayer->isEditable() && dprovider->capabilities() & QgsVectorDataProvider::AddFeatures)`
`4833`	`4836`	`{`
`4834`	`4837`	`mActionCaptureLine->setEnabled(true);`
	`4838`	`+ mActionSplitFeatures->setEnabled(true);`
	`4839`	`+ mActionMoveFeature->setEnabled(true);`
`4835`	`4840`	`}`
`4836`	`4841`	`else`
`4837`	`4842`	`{`
`4838`	`4843`	`mActionCaptureLine->setEnabled(false);`
	`4844`	`+ mActionSplitFeatures->setEnabled(false);`
	`4845`	`+ mActionMoveFeature->setEnabled(false);`
`4839`	`4846`	`}`
`4840`	`4847`	`mActionCapturePoint->setEnabled(false);`
`4841`	`4848`	`mActionCapturePolygon->setEnabled(false);`
`@@ -4847,10 +4854,18 @@ void QgisApp::activateDeactivateLayerRelatedActions(QgsMapLayer* layer)`
`4847`	`4854`	`if(vlayer->isEditable() && dprovider->capabilities() & QgsVectorDataProvider::AddFeatures)`
`4848`	`4855`	`{`
`4849`	`4856`	`mActionCapturePolygon->setEnabled(true);`
	`4857`	`+ mActionAddRing->setEnabled(true);`
	`4858`	`+ mActionAddIsland->setEnabled(true);`
	`4859`	`+ mActionSplitFeatures->setEnabled(true);`
	`4860`	`+ mActionMoveFeature->setEnabled(true);`
`4850`	`4861`	`}`
`4851`	`4862`	`else`
`4852`	`4863`	`{`
`4853`	`4864`	`mActionCapturePolygon->setEnabled(false);`
	`4865`	`+ mActionAddRing->setEnabled(false);`
	`4866`	`+ mActionAddIsland->setEnabled(false);`
	`4867`	`+ mActionSplitFeatures->setEnabled(false);`
	`4868`	`+ mActionMoveFeature->setEnabled(false);`
`4854`	`4869`	`}`
`4855`	`4870`	`mActionCapturePoint->setEnabled(false);`
`4856`	`4871`	`mActionCaptureLine->setEnabled(false);`