Place 'allow editing' into the legend layer right click menu. Newly a…

…dded vector layers are not editable per default any more git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5335 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 21, 2006 · 97d368b · 97d368b
1 parent d3a17de
commit 97d368b
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 10 deletions.
diff --git a/src/gui/qgsvectorlayer.cpp b/src/gui/qgsvectorlayer.cpp
@@ -137,11 +137,6 @@ QgsVectorLayer::QgsVectorLayer(QString vectorLayerPath,
     // have no effect on existing layers
     QSettings settings;
     updateThreshold = settings.readNumEntry("Map/updateThreshold", 1000);
-    //editing is now enabled by default
-    if(dataProvider->capabilities()&QgsVectorDataProvider::AddFeatures)
-    {
-      startEditing();
-    }
   }
 } // QgsVectorLayer ctor
 

diff --git a/src/gui/qgsvectorlayer.h b/src/gui/qgsvectorlayer.h
@@ -183,6 +183,9 @@ public slots:
   void triggerRepaint();
   /**Shows the properties dialog*/
   virtual void showLayerProperties();
+  void startEditing();
+  void stopEditing();
+
 
 public:
 
@@ -471,12 +474,8 @@ public slots:
 
 
 protected slots:
-  void toggleEditing();
-
-  void startEditing();
-
-  void stopEditing();
 
+  void toggleEditing();
 
 private:                       // Private attributes
 

diff --git a/src/legend/qgslegend.cpp b/src/legend/qgslegend.cpp
@@ -407,6 +407,22 @@ void QgsLegend::handleRightClickEvent(QTreeWidgetItem* item, const QPoint& posit
 	    {
 	      theMenu.addAction(tr("&Make to toplevel item"), this, SLOT(makeToTopLevelItem()));
 	    }
+	  //add entry 'allow editing'
+	  QAction* toggleEditingAction = theMenu.addAction(tr("&Allow editing"), this, SLOT(legendLayerToggleEditing()));
+	  toggleEditingAction->setCheckable(true);
+	  QgsLegendLayer* theLayer = dynamic_cast<QgsLegendLayer*>(li);
+	  if(theLayer)
+	    {
+	      QgsVectorLayer* theVectorLayer = dynamic_cast<QgsVectorLayer*>(theLayer->firstMapLayer());
+	      if(!theVectorLayer || theLayer->mapLayers().size() !=1)
+		{
+		  toggleEditingAction->setEnabled(false);
+		}
+	      if(theVectorLayer)
+		{
+		  toggleEditingAction->setChecked(theVectorLayer->isEditable());
+		}
+	    }
 	}
       else if(li->type() == QgsLegendItem::LEGEND_GROUP)
 	{
@@ -652,6 +668,28 @@ void QgsLegend::legendLayerShowProperties()
     ml->showLayerProperties();
 }
 
+void QgsLegend::legendLayerToggleEditing()
+{
+  QgsLegendLayer* ll = dynamic_cast<QgsLegendLayer*>(currentItem());
+  if(!ll)
+    {
+      return;
+    }
+  QgsVectorLayer* theVectorLayer = dynamic_cast<QgsVectorLayer*>(ll->firstMapLayer());
+  if(!theVectorLayer)
+    {
+      return;
+    }
+  if(theVectorLayer->isEditable())
+    {
+      theVectorLayer->stopEditing();
+    }
+  else
+    {
+      theVectorLayer->startEditing();
+    }
+}
+
 void QgsLegend::expandAll()
 {
     QTreeWidgetItem* theItem = firstItem();

diff --git a/src/legend/qgslegend.h b/src/legend/qgslegend.h
@@ -256,6 +256,8 @@ this item may be moved back to the original position with resetToInitialPosition
   void legendLayerRemoveFromOverview();
   /**Shows the property dialog of the first legend layer file in a legend layer*/
   void legendLayerShowProperties();
+  /**Toggles the editing mode of the first layer file of a legend layer*/
+  void legendLayerToggleEditing();
    /**Sets all listview items to open*/
   void expandAll();
   /**Sets all listview items to closed*/