Allow usage of virtual fields also for layer w/o add attribute support

m-kuhn · m-kuhn · commit bed164e70c44 · 2014-10-06T10:25:02.000+02:00
Fix #11168
diff --git a/src/app/qgsaddattrdialog.cpp b/src/app/qgsaddattrdialog.cpp
@@ -22,6 +22,7 @@
 #include "qgsexpressionbuilderdialog.h"
 
 #include <QMessageBox>
+#include <QLabel>
 
 QgsAddAttrDialog::QgsAddAttrDialog( QgsVectorLayer *vlayer, QWidget *parent, Qt::WindowFlags fl )
     : QDialog( parent, fl )
@@ -58,6 +59,12 @@ QgsAddAttrDialog::QgsAddAttrDialog( QgsVectorLayer *vlayer, QWidget *parent, Qt:
     mNameEdit->setMaxLength( 10 );
 
   mExpressionWidget->setLayer( vlayer );
+
+  int cap = mLayer->dataProvider()->capabilities();
+
+  mButtonProviderField->setEnabled( cap & QgsVectorDataProvider::AddAttributes );
+
+  mInfoIcon->setPixmap( style()->standardPixmap( QStyle::SP_MessageBoxInformation ) );
 }
 
 void QgsAddAttrDialog::on_mTypeBox_currentIndexChanged( int idx )
@@ -87,6 +94,8 @@ void QgsAddAttrDialog::on_mFieldModeButtonGroup_buttonClicked( QAbstractButton*
     mExpressionWidget->show();
     mExpressionLabel->show();
   }
+
+  mLayerEditableInfo->setVisible( !mLayer->isEditable() && button == mButtonProviderField );
 }
 
 void QgsAddAttrDialog::on_mLength_editingFinished()
@@ -125,6 +134,12 @@ void QgsAddAttrDialog::accept()
                           tr( "No expression specified. Please enter an expression that will be used to calculate the field values." ) );
     return;
   }
+
+  if ( !mLayer->isEditable() && mode() == ProviderField )
+  {
+    mLayer->startEditing();
+  }
+
   QDialog::accept();
 }
 
diff --git a/src/app/qgsaddattrdialog.h b/src/app/qgsaddattrdialog.h
@@ -36,8 +36,6 @@ class APP_EXPORT QgsAddAttrDialog: public QDialog, private Ui::QgsAddAttrDialogB
 
     QgsAddAttrDialog( QgsVectorLayer *vlayer,
                       QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
-    QgsAddAttrDialog( const std::list<QString>& typelist,
-                      QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
 
     QgsField field() const;
     const QString expression() const;
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -174,8 +174,6 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
   mSaveEditsButton->setEnabled( mToggleEditingButton->isEnabled() && mLayer->isEditable() );
   mOpenFieldCalculator->setEnabled(( canChangeAttributes || canAddAttributes ) && mLayer->isEditable() );
   mDeleteSelectedButton->setEnabled( canDeleteFeatures && mLayer->isEditable() );
-  mAddAttribute->setEnabled( canAddAttributes && mLayer->isEditable() );
-  mRemoveAttribute->setEnabled( canDeleteAttributes && mLayer->isEditable() );
   mAddFeature->setEnabled( canAddFeatures && mLayer->isEditable() && mLayer->geometryType() == QGis::NoGeometry );
   mAddFeature->setHidden( !canAddFeatures || mLayer->geometryType() != QGis::NoGeometry );
 
@@ -559,12 +557,9 @@ void QgsAttributeTableDialog::editingToggled()
   bool canChangeAttributes = mLayer->dataProvider()->capabilities() & QgsVectorDataProvider::ChangeAttributeValues;
   bool canDeleteFeatures = mLayer->dataProvider()->capabilities() & QgsVectorDataProvider::DeleteFeatures;
   bool canAddAttributes = mLayer->dataProvider()->capabilities() & QgsVectorDataProvider::AddAttributes;
-  bool canDeleteAttributes = mLayer->dataProvider()->capabilities() & QgsVectorDataProvider::DeleteAttributes;
   bool canAddFeatures = mLayer->dataProvider()->capabilities() & QgsVectorDataProvider::AddFeatures;
   mOpenFieldCalculator->setEnabled(( canChangeAttributes || canAddAttributes ) && mLayer->isEditable() );
   mDeleteSelectedButton->setEnabled( canDeleteFeatures && mLayer->isEditable() );
-  mAddAttribute->setEnabled( canAddAttributes && mLayer->isEditable() );
-  mRemoveAttribute->setEnabled( canDeleteAttributes && mLayer->isEditable() );
   mAddFeature->setEnabled( canAddFeatures && mLayer->isEditable() && mLayer->geometryType() == QGis::NoGeometry );
 
   mUpdateExpressionBox->setVisible( mLayer->isEditable() );
@@ -597,8 +592,8 @@ void QgsAttributeTableDialog::on_mAddAttribute_clicked()
       }
       else
       {
-        QMessageBox::critical( 0, tr( "Attribute Error" ), tr( "The attribute could not be added to the layer" ) );
         mLayer->destroyEditCommand();
+        QMessageBox::critical( this, tr( "Failed to add field" ), tr( "Failed to add field '%1' of type '%2'. Is the field name unique?" ).arg( dialog.field().name() ).arg( dialog.field().typeName() ) );
       }
     }
 
diff --git a/src/app/qgsdelattrdialog.cpp b/src/app/qgsdelattrdialog.cpp
@@ -15,24 +15,49 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "qgsapplication.h"
 #include "qgsdelattrdialog.h"
 #include "qgsfield.h"
+#include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"
 
 #include <QSettings>
 
-QgsDelAttrDialog::QgsDelAttrDialog( const QgsVectorLayer* vl ): QDialog()
+QgsDelAttrDialog::QgsDelAttrDialog( const QgsVectorLayer* vl )
+    : QDialog()
 {
   setupUi( this );
   if ( vl )
   {
+    bool canDeleteAttributes = vl->dataProvider()->capabilities() & QgsVectorDataProvider::DeleteAttributes;
     listBox2->clear();
     const QgsFields& layerAttributes = vl->pendingFields();
     for ( int idx = 0; idx < layerAttributes.count(); ++idx )
     {
       QListWidgetItem* item = new QListWidgetItem( layerAttributes[idx].name(), listBox2 );
+      switch ( vl->pendingFields().fieldOrigin( idx ) )
+      {
+        case QgsFields::OriginExpression:
+          item->setIcon( QgsApplication::getThemeIcon( "/mIconExpression.svg" ) );
+          break;
+
+        case QgsFields::OriginJoin:
+          item->setIcon( QgsApplication::getThemeIcon( "/propertyicons/join.png" ) );
+          item->setFlags( item->flags() & ~Qt::ItemIsEnabled );
+          break;
+
+        default:
+          item->setIcon( QgsApplication::getThemeIcon( "/propertyicons/attributes.png" ) );
+          if ( !vl->isEditable() || !canDeleteAttributes )
+            item->setFlags( item->flags() & ~Qt::ItemIsEnabled );
+          break;
+      }
+
       item->setData( Qt::UserRole, idx );
     }
+
+    mEditModeInfo->setVisible( !vl->isEditable() );
+    mCanDeleteAttributesInfo->setVisible( !canDeleteAttributes );
   }
 
   QSettings settings;
diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp
@@ -140,6 +140,8 @@ void QgsFieldsProperties::onAttributeSelectionChanged()
     if ( mDesignerTree->selectedItems()[0]->data( 0, DesignerTreeRole ).value<DesignerTreeItemData>().type() == DesignerTreeItemData::Container )
       isAddPossible = true;
   mAddItemButton->setEnabled( isAddPossible );
+
+  updateButtons();
 }
 
 QTreeWidgetItem *QgsFieldsProperties::loadAttributeEditorTreeItem( QgsAttributeEditorElement* const widgetDef, QTreeWidgetItem* parent )
@@ -161,7 +163,7 @@ QTreeWidgetItem *QgsFieldsProperties::loadAttributeEditorTreeItem( QgsAttributeE
 
       const QgsAttributeEditorContainer* container = dynamic_cast<const QgsAttributeEditorContainer*>( widgetDef );
 
-      Q_FOREACH ( QgsAttributeEditorElement* wdg, container->children() )
+      Q_FOREACH( QgsAttributeEditorElement* wdg, container->children() )
       {
         loadAttributeEditorTreeItem( wdg, newWidget );
       }
@@ -185,7 +187,7 @@ void QgsFieldsProperties::loadAttributeEditorTree()
   mDesignerTree->setAcceptDrops( true );
   mDesignerTree->setDragDropMode( QAbstractItemView::DragDrop );
 
-  Q_FOREACH ( QgsAttributeEditorElement* wdg, mLayer->attributeEditorElements() )
+  Q_FOREACH( QgsAttributeEditorElement* wdg, mLayer->attributeEditorElements() )
   {
     loadAttributeEditorTreeItem( wdg, mDesignerTree->invisibleRootItem() );
   }
@@ -270,7 +272,7 @@ void QgsFieldsProperties::loadRelations()
 
   int idx = 0;
 
-  Q_FOREACH ( const QgsRelation& relation, relations )
+  Q_FOREACH( const QgsRelation& relation, relations )
   {
     mRelationsList->insertRow( idx );
 
@@ -308,7 +310,7 @@ void QgsFieldsProperties::on_mAddItemButton_clicked()
   if ( parent->data( 0, DesignerTreeRole ).value<DesignerTreeItemData>().type() != DesignerTreeItemData::Container )
     return;
 
-  Q_FOREACH ( QTableWidgetItem* item, listItems )
+  Q_FOREACH( QTableWidgetItem* item, listItems )
   {
     if ( item->column() == 0 ) // Information is in the first column
       mDesignerTree->addItem( parent , item->data( DesignerTreeRole ).value<DesignerTreeItemData>() );
@@ -407,7 +409,7 @@ void QgsFieldsProperties::attributeTypeDialog()
   int index = -1;
   int row = -1;
 
-  Q_FOREACH ( QTableWidgetItem* wdg, mIndexedWidgets )
+  Q_FOREACH( QTableWidgetItem* wdg, mIndexedWidgets )
   {
     cfg = wdg->data( FieldConfigRole ).value<FieldConfig>();
     if ( cfg.mButton == pb )
@@ -486,6 +488,7 @@ bool QgsFieldsProperties::addAttribute( const QgsField &field )
   else
   {
     mLayer->destroyEditCommand();
+    QMessageBox::critical( this, tr( "Failed to add field" ), tr( "Failed to add field '%1' of type '%2'. Is the field name unique?" ).arg( field.name() ).arg( field.typeName() ) );
     return false;
   }
 }
@@ -536,34 +539,38 @@ void QgsFieldsProperties::on_mAddAttributeButton_clicked()
     }
     else
     {
-      mLayer->beginEditCommand( "Attribute added" );
-      if ( !addAttribute( dialog.field() ) )
-      {
-        mLayer->destroyEditCommand();
-        QMessageBox::information( this, tr( "Name conflict" ), tr( "The attribute could not be inserted. The name already exists in the table." ) );
-      }
-      else
-      {
-        mLayer->endEditCommand();
-      }
+      addAttribute( dialog.field() );
     }
   }
 }
 
 void QgsFieldsProperties::on_mDeleteAttributeButton_clicked()
 {
-  QSet<int> attrs;
-  foreach ( QTableWidgetItem* item, mFieldsList->selectedItems() )
+  QSet<int> providerFields;
+  QSet<int> expressionFields;
+  Q_FOREACH( QTableWidgetItem* item, mFieldsList->selectedItems() )
   {
     if ( item->column() == 0 )
     {
-      attrs << mIndexedWidgets.indexOf( item );
+      int idx = mIndexedWidgets.indexOf( item );
+      if ( mLayer->pendingFields().fieldOrigin( idx ) == QgsFields::OriginExpression )
+        expressionFields << idx;
+      else
+        providerFields << idx;
     }
   }
 
-  mLayer->beginEditCommand( tr( "Deleted attribute" ) );
-  mLayer->deleteAttributes( attrs.toList() );
-  mLayer->endEditCommand();
+  if ( expressionFields.count() )
+    mLayer->deleteAttributes( expressionFields.toList() );
+
+  if ( providerFields.count() )
+  {
+    mLayer->beginEditCommand( tr( "Deleted attributes" ) );
+    if ( mLayer->deleteAttributes( providerFields.toList() ) )
+      mLayer->endEditCommand();
+    else
+      mLayer->destroyEditCommand();
+  }
 }
 
 void QgsFieldsProperties::updateButtons()
@@ -574,17 +581,31 @@ void QgsFieldsProperties::updateButtons()
 
   if ( mLayer->isEditable() )
   {
-    mAddAttributeButton->setEnabled( cap & QgsVectorDataProvider::AddAttributes );
     mDeleteAttributeButton->setEnabled( cap & QgsVectorDataProvider::DeleteAttributes );
     mCalculateFieldButton->setEnabled( cap & ( QgsVectorDataProvider::ChangeAttributeValues | QgsVectorDataProvider::AddAttributes ) );
     mToggleEditingButton->setChecked( true );
   }
   else
   {
-    mAddAttributeButton->setEnabled( false );
-    mDeleteAttributeButton->setEnabled( false );
     mToggleEditingButton->setChecked( false );
     mCalculateFieldButton->setEnabled( false );
+
+    // Enable delete button if items are selected
+    mDeleteAttributeButton->setEnabled( mFieldsList->selectedItems().count() > 0 );
+
+    // and only if all selected items have their origin in an expression
+    Q_FOREACH( QTableWidgetItem* item, mFieldsList->selectedItems() )
+    {
+      if ( item->column() == 0 )
+      {
+        int idx = mIndexedWidgets.indexOf( item );
+        if ( mLayer->pendingFields().fieldOrigin( idx ) != QgsFields::OriginExpression )
+        {
+          mDeleteAttributeButton->setEnabled( false );
+          break;
+        }
+      }
+    }
   }
 }
 
@@ -826,7 +847,7 @@ QMimeData* QgsFieldsProperties::DragList::mimeData( const QList<QTableWidgetItem
   QByteArray encoded;
   QDataStream stream( &encoded, QIODevice::WriteOnly );
 
-  Q_FOREACH ( const QTableWidgetItem* item, items )
+  Q_FOREACH( const QTableWidgetItem* item, items )
   {
     // Relevant information is always in the UserRole of the first column
     if ( item && item->column() == 0 )
@@ -996,7 +1017,7 @@ QMimeData* QgsFieldsProperties::DesignerTree::mimeData( const QList<QTreeWidgetI
   QByteArray encoded;
   QDataStream stream( &encoded, QIODevice::WriteOnly );
 
-  Q_FOREACH ( const QTreeWidgetItem* item, items )
+  Q_FOREACH( const QTreeWidgetItem* item, items )
   {
     if ( item )
     {
diff --git a/src/app/qgsfieldsproperties.h b/src/app/qgsfieldsproperties.h
@@ -150,7 +150,6 @@ class APP_EXPORT QgsFieldsProperties : public QWidget, private Ui_QgsFieldsPrope
     void init();
     void apply();
 
-    void updateButtons();
     void loadRows();
     void setRow( int row, int idx, const QgsField &field );
 
@@ -162,7 +161,7 @@ class APP_EXPORT QgsFieldsProperties : public QWidget, private Ui_QgsFieldsPrope
   signals:
     void toggleEditing();
 
-  public slots:
+  private slots:
     void on_mAddAttributeButton_clicked();
     void on_mDeleteAttributeButton_clicked();
     void on_mCalculateFieldButton_clicked();
@@ -182,11 +181,13 @@ class APP_EXPORT QgsFieldsProperties : public QWidget, private Ui_QgsFieldsPrope
 
     void attributesListCellChanged( int row, int column );
 
-  protected slots:
+
     /** editing of layer was toggled */
     void editingToggled();
 
   protected:
+    void updateButtons();
+
     FieldConfig configForRow( int row );
     void setConfigForRow( int row, FieldConfig cfg );
 
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2119,6 +2119,12 @@ QString QgsVectorLayer::attributeDisplayName( int attributeIndex ) const
 
 bool QgsVectorLayer::deleteAttribute( int index )
 {
+  if ( mUpdatedFields.fieldOrigin( index ) == QgsFields::OriginExpression )
+  {
+    removeExpressionField( index );
+    return true;
+  }
+
   if ( !mEditBuffer || !mDataProvider )
     return false;
 
@@ -2134,7 +2140,7 @@ bool QgsVectorLayer::deleteAttributes( QList<int> attrs )
 
   qSort( attrs.begin(), attrs.end(), qGreater<int>() );
 
-  foreach ( int attr, attrs )
+  Q_FOREACH( int attr, attrs )
   {
     if ( deleteAttribute( attr ) )
     {
diff --git a/src/ui/qgsaddattrdialogbase.ui b/src/ui/qgsaddattrdialogbase.ui
diff --git a/src/ui/qgsdelattrdialogbase.ui b/src/ui/qgsdelattrdialogbase.ui

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,8 @@ void QgsFieldsProperties::onAttributeSelectionChanged()`
`140`	`140`	`if ( mDesignerTree->selectedItems()[0]->data( 0, DesignerTreeRole ).value<DesignerTreeItemData>().type() == DesignerTreeItemData::Container )`
`141`	`141`	`isAddPossible = true;`
`142`	`142`	`mAddItemButton->setEnabled( isAddPossible );`
	`143`	`+`
	`144`	`+ updateButtons();`
`143`	`145`	`}`
`144`	`146`
`145`	`147`	`QTreeWidgetItem QgsFieldsProperties::loadAttributeEditorTreeItem( QgsAttributeEditorElement const widgetDef, QTreeWidgetItem* parent )`
`@@ -161,7 +163,7 @@ QTreeWidgetItem *QgsFieldsProperties::loadAttributeEditorTreeItem( QgsAttributeE`
`161`	`163`
`162`	`164`	`const QgsAttributeEditorContainer* container = dynamic_cast<const QgsAttributeEditorContainer*>( widgetDef );`
`163`	`165`
`164`		`- Q_FOREACH ( QgsAttributeEditorElement* wdg, container->children() )`
	`166`	`+ Q_FOREACH( QgsAttributeEditorElement* wdg, container->children() )`
`165`	`167`	`{`
`166`	`168`	`loadAttributeEditorTreeItem( wdg, newWidget );`
`167`	`169`	`}`
`@@ -185,7 +187,7 @@ void QgsFieldsProperties::loadAttributeEditorTree()`
`185`	`187`	`mDesignerTree->setAcceptDrops( true );`
`186`	`188`	`mDesignerTree->setDragDropMode( QAbstractItemView::DragDrop );`
`187`	`189`
`188`		`- Q_FOREACH ( QgsAttributeEditorElement* wdg, mLayer->attributeEditorElements() )`
	`190`	`+ Q_FOREACH( QgsAttributeEditorElement* wdg, mLayer->attributeEditorElements() )`
`189`	`191`	`{`
`190`	`192`	`loadAttributeEditorTreeItem( wdg, mDesignerTree->invisibleRootItem() );`
`191`	`193`	`}`
`@@ -270,7 +272,7 @@ void QgsFieldsProperties::loadRelations()`
`270`	`272`
`271`	`273`	`int idx = 0;`
`272`	`274`
`273`		`- Q_FOREACH ( const QgsRelation& relation, relations )`
	`275`	`+ Q_FOREACH( const QgsRelation& relation, relations )`
`274`	`276`	`{`
`275`	`277`	`mRelationsList->insertRow( idx );`
`276`	`278`
`@@ -308,7 +310,7 @@ void QgsFieldsProperties::on_mAddItemButton_clicked()`
`308`	`310`	`if ( parent->data( 0, DesignerTreeRole ).value<DesignerTreeItemData>().type() != DesignerTreeItemData::Container )`
`309`	`311`	`return;`
`310`	`312`
`311`		`- Q_FOREACH ( QTableWidgetItem* item, listItems )`
	`313`	`+ Q_FOREACH( QTableWidgetItem* item, listItems )`
`312`	`314`	`{`
`313`	`315`	`if ( item->column() == 0 ) // Information is in the first column`
`314`	`316`	`mDesignerTree->addItem( parent , item->data( DesignerTreeRole ).value<DesignerTreeItemData>() );`
`@@ -407,7 +409,7 @@ void QgsFieldsProperties::attributeTypeDialog()`
`407`	`409`	`int index = -1;`
`408`	`410`	`int row = -1;`
`409`	`411`
`410`		`- Q_FOREACH ( QTableWidgetItem* wdg, mIndexedWidgets )`
	`412`	`+ Q_FOREACH( QTableWidgetItem* wdg, mIndexedWidgets )`
`411`	`413`	`{`
`412`	`414`	`cfg = wdg->data( FieldConfigRole ).value<FieldConfig>();`
`413`	`415`	`if ( cfg.mButton == pb )`
`@@ -486,6 +488,7 @@ bool QgsFieldsProperties::addAttribute( const QgsField &field )`
`486`	`488`	`else`
`487`	`489`	`{`
`488`	`490`	`mLayer->destroyEditCommand();`
	`491`	`+ QMessageBox::critical( this, tr( "Failed to add field" ), tr( "Failed to add field '%1' of type '%2'. Is the field name unique?" ).arg( field.name() ).arg( field.typeName() ) );`
`489`	`492`	`return false;`
`490`	`493`	`}`
`491`	`494`	`}`
`@@ -536,34 +539,38 @@ void QgsFieldsProperties::on_mAddAttributeButton_clicked()`
`536`	`539`	`}`
`537`	`540`	`else`
`538`	`541`	`{`
`539`		`- mLayer->beginEditCommand( "Attribute added" );`
`540`		`- if ( !addAttribute( dialog.field() ) )`
`541`		`- {`
`542`		`- mLayer->destroyEditCommand();`
`543`		`- QMessageBox::information( this, tr( "Name conflict" ), tr( "The attribute could not be inserted. The name already exists in the table." ) );`
`544`		`- }`
`545`		`- else`
`546`		`- {`
`547`		`- mLayer->endEditCommand();`
`548`		`- }`
	`542`	`+ addAttribute( dialog.field() );`
`549`	`543`	`}`
`550`	`544`	`}`
`551`	`545`	`}`
`552`	`546`
`553`	`547`	`void QgsFieldsProperties::on_mDeleteAttributeButton_clicked()`
`554`	`548`	`{`
`555`		`- QSet<int> attrs;`
`556`		`- foreach ( QTableWidgetItem* item, mFieldsList->selectedItems() )`
	`549`	`+ QSet<int> providerFields;`
	`550`	`+ QSet<int> expressionFields;`
	`551`	`+ Q_FOREACH( QTableWidgetItem* item, mFieldsList->selectedItems() )`
`557`	`552`	`{`
`558`	`553`	`if ( item->column() == 0 )`
`559`	`554`	`{`
`560`		`- attrs << mIndexedWidgets.indexOf( item );`
	`555`	`+ int idx = mIndexedWidgets.indexOf( item );`
	`556`	`+ if ( mLayer->pendingFields().fieldOrigin( idx ) == QgsFields::OriginExpression )`
	`557`	`+ expressionFields << idx;`
	`558`	`+ else`
	`559`	`+ providerFields << idx;`
`561`	`560`	`}`
`562`	`561`	`}`
`563`	`562`
`564`		`- mLayer->beginEditCommand( tr( "Deleted attribute" ) );`
`565`		`- mLayer->deleteAttributes( attrs.toList() );`
`566`		`- mLayer->endEditCommand();`
	`563`	`+ if ( expressionFields.count() )`
	`564`	`+ mLayer->deleteAttributes( expressionFields.toList() );`
	`565`	`+`
	`566`	`+ if ( providerFields.count() )`
	`567`	`+ {`
	`568`	`+ mLayer->beginEditCommand( tr( "Deleted attributes" ) );`
	`569`	`+ if ( mLayer->deleteAttributes( providerFields.toList() ) )`
	`570`	`+ mLayer->endEditCommand();`
	`571`	`+ else`
	`572`	`+ mLayer->destroyEditCommand();`
	`573`	`+ }`
`567`	`574`	`}`
`568`	`575`
`569`	`576`	`void QgsFieldsProperties::updateButtons()`
`@@ -574,17 +581,31 @@ void QgsFieldsProperties::updateButtons()`
`574`	`581`
`575`	`582`	`if ( mLayer->isEditable() )`
`576`	`583`	`{`
`577`		`- mAddAttributeButton->setEnabled( cap & QgsVectorDataProvider::AddAttributes );`
`578`	`584`	`mDeleteAttributeButton->setEnabled( cap & QgsVectorDataProvider::DeleteAttributes );`
`579`	`585`	`mCalculateFieldButton->setEnabled( cap & ( QgsVectorDataProvider::ChangeAttributeValues \| QgsVectorDataProvider::AddAttributes ) );`
`580`	`586`	`mToggleEditingButton->setChecked( true );`
`581`	`587`	`}`
`582`	`588`	`else`
`583`	`589`	`{`
`584`		`- mAddAttributeButton->setEnabled( false );`
`585`		`- mDeleteAttributeButton->setEnabled( false );`
`586`	`590`	`mToggleEditingButton->setChecked( false );`
`587`	`591`	`mCalculateFieldButton->setEnabled( false );`
	`592`	`+`
	`593`	`+ // Enable delete button if items are selected`
	`594`	`+ mDeleteAttributeButton->setEnabled( mFieldsList->selectedItems().count() > 0 );`
	`595`	`+`
	`596`	`+ // and only if all selected items have their origin in an expression`
	`597`	`+ Q_FOREACH( QTableWidgetItem* item, mFieldsList->selectedItems() )`
	`598`	`+ {`
	`599`	`+ if ( item->column() == 0 )`
	`600`	`+ {`
	`601`	`+ int idx = mIndexedWidgets.indexOf( item );`
	`602`	`+ if ( mLayer->pendingFields().fieldOrigin( idx ) != QgsFields::OriginExpression )`
	`603`	`+ {`
	`604`	`+ mDeleteAttributeButton->setEnabled( false );`
	`605`	`+ break;`
	`606`	`+ }`
	`607`	`+ }`
	`608`	`+ }`
`588`	`609`	`}`
`589`	`610`	`}`
`590`	`611`
`@@ -826,7 +847,7 @@ QMimeData* QgsFieldsProperties::DragList::mimeData( const QList<QTableWidgetItem`
`826`	`847`	`QByteArray encoded;`
`827`	`848`	`QDataStream stream( &encoded, QIODevice::WriteOnly );`
`828`	`849`
`829`		`- Q_FOREACH ( const QTableWidgetItem* item, items )`
	`850`	`+ Q_FOREACH( const QTableWidgetItem* item, items )`
`830`	`851`	`{`
`831`	`852`	`// Relevant information is always in the UserRole of the first column`
`832`	`853`	`if ( item && item->column() == 0 )`
`@@ -996,7 +1017,7 @@ QMimeData* QgsFieldsProperties::DesignerTree::mimeData( const QList<QTreeWidgetI`
`996`	`1017`	`QByteArray encoded;`
`997`	`1018`	`QDataStream stream( &encoded, QIODevice::WriteOnly );`
`998`	`1019`
`999`		`- Q_FOREACH ( const QTreeWidgetItem* item, items )`
	`1020`	`+ Q_FOREACH( const QTreeWidgetItem* item, items )`
`1000`	`1021`	`{`
`1001`	`1022`	`if ( item )`
`1002`	`1023`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2119,6 +2119,12 @@ QString QgsVectorLayer::attributeDisplayName( int attributeIndex ) const`
`2119`	`2119`
`2120`	`2120`	`bool QgsVectorLayer::deleteAttribute( int index )`
`2121`	`2121`	`{`
	`2122`	`+ if ( mUpdatedFields.fieldOrigin( index ) == QgsFields::OriginExpression )`
	`2123`	`+ {`
	`2124`	`+ removeExpressionField( index );`
	`2125`	`+ return true;`
	`2126`	`+ }`
	`2127`	`+`
`2122`	`2128`	`if ( !mEditBuffer \|\| !mDataProvider )`
`2123`	`2129`	`return false;`
`2124`	`2130`
`@@ -2134,7 +2140,7 @@ bool QgsVectorLayer::deleteAttributes( QList<int> attrs )`
`2134`	`2140`
`2135`	`2141`	`qSort( attrs.begin(), attrs.end(), qGreater<int>() );`
`2136`	`2142`
`2137`		`- foreach ( int attr, attrs )`
	`2143`	`+ Q_FOREACH( int attr, attrs )`
`2138`	`2144`	`{`
`2139`	`2145`	`if ( deleteAttribute( attr ) )`
`2140`	`2146`	`{`