fix enabling of field edit buttons in vector properties

git-svn-id: http://svn.osgeo.org/qgis/trunk@15615 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 27, 2011 · 3d89da0 · 3d89da0
1 parent e2de267
commit 3d89da0
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -398,20 +398,22 @@ void QgsVectorLayerProperties::editingToggled()
 
 void QgsVectorLayerProperties::updateButtons()
 {
+  int cap = layer->dataProvider()->capabilities();
+
+  mToggleEditingButton->setEnabled(( cap & QgsVectorDataProvider::EditingCapabilities ) && !layer->isReadOnly() );
+  mToggleEditingButton->setChecked( layer->isEditable() );
+
   if ( layer->isEditable() )
   {
-    int cap = layer->dataProvider()->capabilities();
     mAddAttributeButton->setEnabled( cap & QgsVectorDataProvider::AddAttributes );
     mDeleteAttributeButton->setEnabled( cap & QgsVectorDataProvider::DeleteAttributes );
     mCalculateFieldButton->setEnabled( cap & QgsVectorDataProvider::ChangeAttributeValues );
-    mToggleEditingButton->setChecked( true );
   }
   else
   {
-    mAddAttributeButton->setEnabled( false );
-    mDeleteAttributeButton->setEnabled( false );
-    mToggleEditingButton->setChecked( false );
-    mCalculateFieldButton->setEnabled( false );
+    mAddAttributeButton->setDisabled( true );
+    mDeleteAttributeButton->setDisabled( true );
+    mCalculateFieldButton->setDisabled( true );
   }
 }
 
@@ -863,7 +865,7 @@ QString QgsVectorLayerProperties::metadata()
 
   QGis::GeometryType type = layer->geometryType();
 
-  if ( type < 0 || type > QGis::Polygon )
+  if ( type < 0 || type > QGis::NoGeometry )
   {
     QgsDebugMsg( "Invalid vector type" );
   }