Allow field calculator also for layers where adding new fields is not possible (user will have to use one of the existing fields)

wonder · wonder · commit 6497f1043c82 · 2009-10-22T12:24:36.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@11828 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp
@@ -35,6 +35,14 @@ QgsFieldCalculator::QgsFieldCalculator( QgsVectorLayer* vl ): QDialog(), mVector
 
   //disable ok button until there is text for output field and expression
   mButtonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
+
+  // disable creation of new fields if not supported by data provider
+  if ( !( vl->dataProvider()->capabilities() & QgsVectorDataProvider::AddAttributes ) )
+  {
+    mUpdateExistingFieldCheckBox->setEnabled( false ); // must stay checked
+    mNewFieldGroupBox->setEnabled( false );
+    mNewFieldGroupBox->setTitle( mNewFieldGroupBox->title() + tr( " (not supported by provider)" ) );
+  }
 }
 
 QgsFieldCalculator::~QgsFieldCalculator()
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -355,7 +355,7 @@ void QgsVectorLayerProperties::updateButtons()
     int cap = layer->dataProvider()->capabilities();
     mAddAttributeButton->setEnabled( cap & QgsVectorDataProvider::AddAttributes );
     mDeleteAttributeButton->setEnabled( cap & QgsVectorDataProvider::DeleteAttributes );
-    mCalculateFieldButton->setEnabled(( cap &  QgsVectorDataProvider::AddAttributes ) && ( cap & QgsVectorDataProvider::ChangeAttributeValues ) );
+    mCalculateFieldButton->setEnabled( cap & QgsVectorDataProvider::ChangeAttributeValues );
     mToggleEditingButton->setChecked( true );
   }
   else

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ void QgsVectorLayerProperties::updateButtons()`
`355`	`355`	`int cap = layer->dataProvider()->capabilities();`
`356`	`356`	`mAddAttributeButton->setEnabled( cap & QgsVectorDataProvider::AddAttributes );`
`357`	`357`	`mDeleteAttributeButton->setEnabled( cap & QgsVectorDataProvider::DeleteAttributes );`
`358`		`- mCalculateFieldButton->setEnabled(( cap & QgsVectorDataProvider::AddAttributes ) && ( cap & QgsVectorDataProvider::ChangeAttributeValues ) );`
	`358`	`+ mCalculateFieldButton->setEnabled( cap & QgsVectorDataProvider::ChangeAttributeValues );`
`359`	`359`	`mToggleEditingButton->setChecked( true );`
`360`	`360`	`}`
`361`	`361`	`else`