Merge pull request #4072 from SrNetoChan/color_expression_help

Extends color expression help to mention HEX color notation
qgis · Feb 1, 2017 · 3609c86 · 3609c86
2 parents 11170ab + c1eedc7
commit 3609c86
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/core/qgsproperty.cpp b/src/core/qgsproperty.cpp
@@ -86,12 +86,12 @@ QgsPropertyDefinition::QgsPropertyDefinition( const QString& name, const QString
 
     case ColorWithAlpha:
       mTypes = DataTypeString;
-      mHelpText = QObject::tr( "string [<b>r,g,b,a</b>] as int 0-255" );
+      mHelpText = QObject::tr( "string [<b>r,g,b,a</b>] as int 0-255 or #<b>RRGGBBAA</b> as hex or <b>color</b> as color's name" );
       break;
 
     case ColorNoAlpha:
       mTypes = DataTypeString;
-      mHelpText = QObject::tr( "string [<b>r,g,b</b>] as int 0-255" );
+      mHelpText = QObject::tr( "string [<b>r,g,b</b>] as int 0-255 or #<b>RRGGBB</b> as hex or <b>color</b> as color's name" );
       break;
 
     case PenJoinStyle:

diff --git a/src/gui/qgsdatadefinedbutton.cpp b/src/gui/qgsdatadefinedbutton.cpp
@@ -809,12 +809,12 @@ QString QgsDataDefinedButton::unitsMmMuPercentDesc()
 
 QString QgsDataDefinedButton::colorNoAlphaDesc()
 {
-  return tr( "string [<b>r,g,b</b>] as int 0-255" );
+  return tr( "string [<b>r,g,b</b>] as int 0-255 or #<b>RRGGBB</b> as hex or <b>color</b> as color's name" );
 }
 
 QString QgsDataDefinedButton::colorAlphaDesc()
 {
-  return tr( "string [<b>r,g,b,a</b>] as int 0-255" );
+  return tr( "string [<b>r,g,b,a</b>] as int 0-255 or #<b>RRGGBBAA</b> as hex or <b>color</b> as color's name" );
 }
 
 QString QgsDataDefinedButton::textHorzAlignDesc()