Reflect changes in QgsExpressionFieldWidget when source fields change

qgis · Feb 1, 2016 · 4ddd1cc · 4ddd1cc
1 parent e453c15
commit 4ddd1cc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/gui/qgsfieldexpressionwidget.cpp b/src/gui/qgsfieldexpressionwidget.cpp
@@ -148,13 +148,17 @@ void QgsFieldExpressionWidget::setLayer( QgsMapLayer *layer )
 
 void QgsFieldExpressionWidget::setLayer( QgsVectorLayer *layer )
 {
+  disconnect( mFieldProxyModel->sourceFieldModel()->layer(), SIGNAL( updatedFields() ), this, SLOT( reloadLayer() ) );
+
   mExpressionContext.reset( new QgsExpressionContext() );
   mExpressionContext->appendScope( QgsExpressionContextUtils::globalScope() );
   mExpressionContext->appendScope( QgsExpressionContextUtils::projectScope() );
   if ( layer )
     mExpressionContext->appendScope( QgsExpressionContextUtils::layerScope( layer ) );
 
   mFieldProxyModel->sourceFieldModel()->setLayer( layer );
+
+  connect( mFieldProxyModel->sourceFieldModel()->layer(), SIGNAL( updatedFields() ), this, SLOT( reloadLayer() ) );
 }
 
 void QgsFieldExpressionWidget::setField( const QString &fieldName )
@@ -231,6 +235,11 @@ void QgsFieldExpressionWidget::changeEvent( QEvent* event )
   }
 }
 
+void QgsFieldExpressionWidget::reloadLayer()
+{
+  setLayer( mFieldProxyModel->sourceFieldModel()->layer() );
+}
+
 void QgsFieldExpressionWidget::currentFieldChanged()
 {
   updateLineEditStyle();

diff --git a/src/gui/qgsfieldexpressionwidget.h b/src/gui/qgsfieldexpressionwidget.h
@@ -147,6 +147,9 @@ class GUI_EXPORT QgsFieldExpressionWidget : public QWidget
   protected:
     void changeEvent( QEvent* event ) override;
 
+  private slots:
+    void reloadLayer();
+
   private:
     QComboBox* mCombo;
     QToolButton* mButton;