diff --git a/resources/function_help/text/* b/resources/function_help/text/* new file mode 100644 index 00000000000..2ab40e4a9c4 --- /dev/null +++ b/resources/function_help/text/* @@ -0,0 +1,13 @@ +

* multiplication operator

+

Multiplication of two values

+

If one of the values is NULL the result will be NULL.

+ +

Syntax

+
 value1 * value2 
+ +

Arguments

+None + +

Examples

+
 5 * 4 → 20 
+
 5 * NULL → NULL 
diff --git a/resources/function_help/text/+ b/resources/function_help/text/+ new file mode 100644 index 00000000000..ab0511b2dbf --- /dev/null +++ b/resources/function_help/text/+ @@ -0,0 +1,13 @@ +

+ addition operator

+

Addition of two values

+

If one of the values is NULL the result will be NULL.

+ +

Syntax

+
 value1 + value2 
+ +

Arguments

+None + +

Examples

+
 5 + 4 → 9 
+
 5 + NULL → NULL 
diff --git a/resources/function_help/text/- b/resources/function_help/text/- new file mode 100644 index 00000000000..c6d0ba2d393 --- /dev/null +++ b/resources/function_help/text/- @@ -0,0 +1,13 @@ +

- subtract operator

+

Subtraction of two values

+

If one of the values is NULL the result will be NULL.

+ +

Syntax

+
 value1 - value2 
+ +

Arguments

+None + +

Examples

+
 5 - 4 → 1 
+
 5 - NULL → NULL 
diff --git a/resources/function_help/text/< b/resources/function_help/text/< new file mode 100644 index 00000000000..a85a3221f30 --- /dev/null +++ b/resources/function_help/text/< @@ -0,0 +1,13 @@ +

< Less than operator

+

Compares two values and evaluates to 1 if the left value is less than the right value

+ +

Syntax

+
 value1 < value2 
+ +

Arguments

+None + +

Examples

+
 5 < 4 → 0 
+
 5 < 5 → 0 
+
 4 < 5 → 1 
diff --git a/resources/function_help/text/<= b/resources/function_help/text/<= new file mode 100644 index 00000000000..f9ddb0cf329 --- /dev/null +++ b/resources/function_help/text/<= @@ -0,0 +1,13 @@ +

<= Less than or equal operator

+

Compares two values and evaluates to 1 if the left value is less than or equal to the right value

+ +

Syntax

+
 value1 <= value2 
+ +

Arguments

+None + +

Examples

+
 5 <= 4 → 0 
+
 5 <= 5 → 1 
+
 4 <= 5 → 1 
diff --git a/resources/function_help/text/<> b/resources/function_help/text/<> new file mode 100644 index 00000000000..24f6f3d8fc9 --- /dev/null +++ b/resources/function_help/text/<> @@ -0,0 +1,14 @@ +

<> Unequal operator

+

Compares two values and evaluates to 1 if they are not equal.

+ +

Syntax

+
 value1 <> value2 
+ +

Arguments

+None + +

Examples

+
 5 <> 4 → 1 
+
 4 <> 4 → 0 
+
 5 <> NULL → NULL 
+
 NULL <> NULL → NULL 
diff --git a/resources/function_help/text/> b/resources/function_help/text/> new file mode 100644 index 00000000000..d76fc0bbe0e --- /dev/null +++ b/resources/function_help/text/> @@ -0,0 +1,13 @@ +

> Greater than operator

+

Compares two values and evaluates to 1 if the left value is greater than the right value

+ +

Syntax

+
 value1 > value2 
+ +

Arguments

+None + +

Examples

+
 5 > 4 → 1 
+
 5 > 5 → 0 
+
 4 > 5 → 0 
diff --git a/resources/function_help/text/>= b/resources/function_help/text/>= new file mode 100644 index 00000000000..29e83a7578d --- /dev/null +++ b/resources/function_help/text/>= @@ -0,0 +1,13 @@ +

>= Greater or equal operator

+

Compares two values and evaluates to 1 if the left value is greater than or equal to the right value

+ +

Syntax

+
 value1 >= value2 
+ +

Arguments

+None + +

Examples

+
 5 >= 4 → 1 
+
 5 >= 5 → 1 
+
 4 >= 5 → 0 
diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp index 1f3d5a8689c..70d36315c11 100644 --- a/src/gui/qgsexpressionbuilderwidget.cpp +++ b/src/gui/qgsexpressionbuilderwidget.cpp @@ -428,18 +428,18 @@ void QgsExpressionBuilderWidget::updateFunctionTree() mModel->clear(); mExpressionGroups.clear(); // TODO Can we move this stuff to QgsExpression, like the functions? - registerItem( "Operators", "+", " + ", tr( "Addition operator" ) ); - registerItem( "Operators", "-", " - ", tr( "Subtraction operator" ) ); - registerItem( "Operators", "*", " * ", tr( "Multiplication operator" ) ); + registerItem( "Operators", "+", " + " ); + registerItem( "Operators", "-", " - " ); + registerItem( "Operators", "*", " * " ); registerItem( "Operators", "/", " / ", tr( "Division operator" ) ); registerItem( "Operators", "%", " % ", tr( "Modulo operator" ) ); registerItem( "Operators", "^", " ^ ", tr( "Power operator" ) ); registerItem( "Operators", "=", " = ", tr( "Equal operator" ) ); - registerItem( "Operators", ">", " > ", tr( "Greater as operator" ) ); - registerItem( "Operators", "<", " < ", tr( "Less than operator" ) ); + registerItem( "Operators", ">", " > " ); + registerItem( "Operators", "<", " < " ); registerItem( "Operators", "<>", " <> ", tr( "Unequal operator" ) ); - registerItem( "Operators", "<=", " <= ", tr( "Less or equal operator" ) ); - registerItem( "Operators", ">=", " >= ", tr( "Greater or equal operator" ) ); + registerItem( "Operators", "<=", " <= " ); + registerItem( "Operators", ">=", " >= " ); registerItem( "Operators", "||", " || " ); registerItem( "Operators", "IN", " IN " ); registerItem( "Operators", "LIKE", " LIKE " );