Stop editing before layer remove if necessary

jef · jef · commit a45bf797579b · 2008-03-11T23:42:09.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8205 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/legend/qgslegendlayerfile.cpp b/src/app/legend/qgslegendlayerfile.cpp
@@ -476,6 +476,12 @@ void QgsLegendLayerFile::toggleEditing()
 
 }
 
+bool QgsLegendLayerFile::isEditing()
+{
+  QgsVectorLayer* vlayer = dynamic_cast<QgsVectorLayer*>(mLyr.layer());
+  return vlayer && vlayer->isEditable();
+} 
+
 void QgsLegendLayerFile::layerNameChanged()
 {
   QString name = mLyr.layer()->name();
diff --git a/src/app/legend/qgslegendlayerfile.h b/src/app/legend/qgslegendlayerfile.h
@@ -89,6 +89,9 @@ class QgsLegendLayerFile : public QgsLegendItem
     /**Toggle editing for layer*/
     void toggleEditing();
     
+    /**Return editing status for layer*/
+    bool isEditing();
+
     /**Toggle show in overview*/
     void showInOverview();
     
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3774,6 +3774,11 @@ void QgisApp::inOverview()
 
 void QgisApp::removeLayer()
 {
+  QgsLegendLayerFile* currentLayerFile = mMapLegend->currentLayerFile();
+  if(currentLayerFile && currentLayerFile->isEditing() )
+  {
+    currentLayerFile->toggleEditing();
+  }
   mMapLegend->legendLayerRemove();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -476,6 +476,12 @@ void QgsLegendLayerFile::toggleEditing()`
`476`	`476`
`477`	`477`	`}`
`478`	`478`
	`479`	`+bool QgsLegendLayerFile::isEditing()`
	`480`	`+{`
	`481`	`+ QgsVectorLayer* vlayer = dynamic_cast<QgsVectorLayer*>(mLyr.layer());`
	`482`	`+ return vlayer && vlayer->isEditable();`
	`483`	`+}`
	`484`	`+`
`479`	`485`	`void QgsLegendLayerFile::layerNameChanged()`
`480`	`486`	`{`
`481`	`487`	`QString name = mLyr.layer()->name();`
Original file line number	Diff line number	Diff line change
`@@ -3774,6 +3774,11 @@ void QgisApp::inOverview()`
`3774`	`3774`
`3775`	`3775`	`void QgisApp::removeLayer()`
`3776`	`3776`	`{`
	`3777`	`+ QgsLegendLayerFile* currentLayerFile = mMapLegend->currentLayerFile();`
	`3778`	`+ if(currentLayerFile && currentLayerFile->isEditing() )`
	`3779`	`+ {`
	`3780`	`+ currentLayerFile->toggleEditing();`
	`3781`	`+ }`
`3777`	`3782`	`mMapLegend->legendLayerRemove();`
`3778`	`3783`	`}`
`3779`	`3784`