follow up e8061c7

qgis · Oct 3, 2012 · 7bff3cf · 7bff3cf
1 parent eeefecf
commit 7bff3cf
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -110,7 +110,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
   if ( layer->hasGeometryType() )
   {
     // Create the Labeling dialog tab
-    layout= new QVBoxLayout( labelingFrame );
+    layout = new QVBoxLayout( labelingFrame );
     layout->setMargin( 0 );
     labelingDialog = new QgsLabelingGui( QgisApp::instance()->palLabeling(), layer, QgisApp::instance()->mapCanvas(), labelingFrame );
     layout->addWidget( labelingDialog );
@@ -470,10 +470,12 @@ void QgsVectorLayerProperties::updateButtons()
   }
   else
   {
+    int cap = layer->dataProvider()->capabilities();
+    bool canChangeAttributes = cap & QgsVectorDataProvider::ChangeAttributeValues;
     mAddAttributeButton->setEnabled( false );
     mDeleteAttributeButton->setEnabled( false );
     mToggleEditingButton->setChecked( false );
-    mToggleEditingButton->setEnabled( false );
+    mToggleEditingButton->setEnabled( canChangeAttributes && !layer->isReadOnly() );
     mCalculateFieldButton->setEnabled( false );
   }
 }