Merge pull request #34997 from suricactus/expression_edit

Add ability to edit, import and export user expressions
qgis · Mar 17, 2020 · d83da3c · d83da3c
2 parents 8b54d2f + 1010280
commit d83da3c
Show file tree

Hide file tree

Showing 6 changed files with 655 additions and 218 deletions.
diff --git a/python/gui/auto_generated/qgsexpressionbuilderwidget.sip.in b/python/gui/auto_generated/qgsexpressionbuilderwidget.sip.in
@@ -379,6 +379,32 @@ Removes the selected expression from the stored user expressions,
 the selected expression must be a user stored expression.
 
 .. versionadded:: 3.12
+%End
+
+    void editSelectedUserExpression();
+%Docstring
+Edits the selected expression from the stored user expressions,
+the selected expression must be a user stored expression.
+
+.. versionadded:: 3.14
+%End
+
+    QJsonDocument exportUserExpressions();
+%Docstring
+Create the expressions JSON document storing all the user expressions to be exported.
+
+:return: the created expressions JSON file
+
+.. versionadded:: 3.14
+%End
+
+    void loadExpressionsFromJson( const QJsonDocument &expressionsDocument );
+%Docstring
+Load and permanently store the expressions from the expressions JSON document.
+
+:param expressionsDocument: the parsed expressions JSON file
+
+.. versionadded:: 3.14
 %End
 
     const QList<QgsExpressionItem *> findExpressions( const QString &label );

diff --git a/python/gui/auto_generated/qgsexpressionstoredialog.sip.in b/python/gui/auto_generated/qgsexpressionstoredialog.sip.in
@@ -26,7 +26,7 @@ A generic dialog for editing expression text, label and help text.
     QgsExpressionStoreDialog( const QString &label,
                               const QString &expression,
                               const QString &helpText,
-                              const QStringList &existingLabels,
+                              const QStringList &existingLabels = QStringList(),
                               QWidget *parent = 0 );
 %Docstring
 Creates a QgsExpressionStoreDialog with given ``label``, ``expression`` and ``helpText``.