Fix - Fix loading expression template for first item and space vs tabs

Fix tab vs spaces in Python editor widget. Use spaces
qgis · Oct 15, 2018 · 8dd0f00 · 8dd0f00
1 parent bd8d61a
commit 8dd0f00
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/python/user.py b/python/user.py
@@ -65,8 +65,7 @@ def load_user_expressions(path):
 if not os.path.exists(initfile):
     open(initfile, "w").close()
 
-template = """\"\"\"
-from qgis.core import *
+template = """from qgis.core import *
 from qgis.gui import *
 
 @qgsfunction(args='auto', group='Custom')
@@ -82,6 +81,8 @@ def my_sum(value1, value2, feature, parent):
     return value1 + value2
 """
 
+default_expression_template = template
+
 
 try:
     import expressions

diff --git a/src/gui/qgscodeeditorpython.cpp b/src/gui/qgscodeeditorpython.cpp
@@ -99,6 +99,7 @@ void QgsCodeEditorPython::setSciLexerPython()
 
   setMarginVisible( true );
   setFoldingVisible( true );
+  setIndentationsUseTabs( false );
 }
 
 

diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -310,7 +310,7 @@ void QgsExpressionBuilderWidget::newFunctionFile( const QString &fileName )
   cmbFileNames->setCurrentRow( 0 );
 
   QString templatetxt;
-  QgsPythonRunner::eval( QStringLiteral( "qgis.user.expressions.template" ), templatetxt );
+  QgsPythonRunner::eval( QStringLiteral( "qgis.user.default_expression_template" ), templatetxt );
   txtPython->setText( templatetxt );
   saveFunctionFile( fileName );
 }