attribute table: allow toggling editing if layer is capabable of any change, not only attributes (fixes #7504)

jef-n · jef-n · commit ce96eaae5937 · 2014-06-21T22:06:38.000+02:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3641,7 +3641,7 @@ void QgisApp::newVectorLayer()
     //todo: the last parameter will change accordingly to layer type
     addVectorLayers( fileNames, enc, "file" );
   }
-  else if( fileName.isNull() )
+  else if ( fileName.isNull() )
   {
     QLabel *msgLabel = new QLabel( tr( "Layer creation failed. Please check the <a href=\"#messageLog\">message log</a> for further information." ), messageBar() );
     msgLabel->setWordWrap( true );
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -168,10 +168,10 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
   mToggleEditingButton->blockSignals( true );
   mToggleEditingButton->setCheckable( true );
   mToggleEditingButton->setChecked( mLayer->isEditable() );
-  mToggleEditingButton->setEnabled( canChangeAttributes && !mLayer->isReadOnly() );
+  mToggleEditingButton->setEnabled(( canChangeAttributes || canDeleteFeatures || canAddAttributes || canDeleteAttributes || canAddFeatures ) && !mLayer->isReadOnly() );
   mToggleEditingButton->blockSignals( false );
 
-  mSaveEditsButton->setEnabled( canChangeAttributes && mLayer->isEditable() );
+  mSaveEditsButton->setEnabled( mToggleEditingButton->isEnabled() && mLayer->isEditable() );
   mOpenFieldCalculator->setEnabled(( canChangeAttributes || canAddAttributes ) && mLayer->isEditable() );
   mDeleteSelectedButton->setEnabled( canDeleteFeatures && mLayer->isEditable() );
   mAddAttribute->setEnabled( canAddAttributes && mLayer->isEditable() );

Original file line number	Diff line number	Diff line change
`@@ -3641,7 +3641,7 @@ void QgisApp::newVectorLayer()`
`3641`	`3641`	`//todo: the last parameter will change accordingly to layer type`
`3642`	`3642`	`addVectorLayers( fileNames, enc, "file" );`
`3643`	`3643`	`}`
`3644`		`- else if( fileName.isNull() )`
	`3644`	`+ else if ( fileName.isNull() )`
`3645`	`3645`	`{`
`3646`	`3646`	`QLabel *msgLabel = new QLabel( tr( "Layer creation failed. Please check the <a href=\"#messageLog\">message log</a> for further information." ), messageBar() );`
`3647`	`3647`	`msgLabel->setWordWrap( true );`