Update vector layer variable widget on apply

qgis · Sep 14, 2015 · ddb80eb · ddb80eb
1 parent 499d0da
commit ddb80eb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -508,12 +508,8 @@ void QgsVectorLayerProperties::syncToLayer( void )
     }
   }
 
-  mVariableEditor->context()->appendScope( QgsExpressionContextUtils::globalScope() );
-  mVariableEditor->context()->appendScope( QgsExpressionContextUtils::projectScope() );
-  mVariableEditor->context()->appendScope( QgsExpressionContextUtils::layerScope( layer ) );
-  mVariableEditor->reloadContext();
-  mVariableEditor->setEditableScopeIndex( 2 );
-
+  // set initial state for variable editor
+  updateVariableEditor();
 } // syncToLayer()
 
 
@@ -626,6 +622,7 @@ void QgsVectorLayerProperties::apply()
 
   //save variables
   QgsExpressionContextUtils::setLayerVariables( layer, mVariableEditor->variablesInActiveScope() );
+  updateVariableEditor();
 
   // update symbology
   emit refreshLegend( layer->id() );
@@ -1295,3 +1292,14 @@ void QgsVectorLayerProperties::on_mSimplifyDrawingGroupBox_toggled( bool checked
     mSimplifyDrawingAtProvider->setEnabled( checked );
   }
 }
+
+void QgsVectorLayerProperties::updateVariableEditor()
+{
+  QgsExpressionContext context;
+  mVariableEditor->setContext( &context );
+  mVariableEditor->context()->appendScope( QgsExpressionContextUtils::globalScope() );
+  mVariableEditor->context()->appendScope( QgsExpressionContextUtils::projectScope() );
+  mVariableEditor->context()->appendScope( QgsExpressionContextUtils::layerScope( layer ) );
+  mVariableEditor->reloadContext();
+  mVariableEditor->setEditableScopeIndex( 2 );
+}
diff --git a/src/app/qgsvectorlayerproperties.h b/src/app/qgsvectorlayerproperties.h
@@ -140,6 +140,10 @@ class APP_EXPORT QgsVectorLayerProperties : public QgsOptionsDialogBase, private
 
     void aboutToShowStyleMenu();
 
+    /** Updates the variable editor to reflect layer changes
+     */
+    void updateVariableEditor();
+
   protected:
 
     void saveStyleAs( StyleType styleType );