Skip to content
Permalink
Browse files

Merge pull request #4072 from SrNetoChan/color_expression_help

Extends color expression help to mention HEX color notation
  • Loading branch information
nyalldawson committed Feb 1, 2017
2 parents 11170ab + c1eedc7 commit 3609c862665af432d842e88834492cd5201b441c
Showing with 4 additions and 4 deletions.
  1. +2 −2 src/core/qgsproperty.cpp
  2. +2 −2 src/gui/qgsdatadefinedbutton.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:
@@ -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()

0 comments on commit 3609c86

Please sign in to comment.
You can’t perform that action at this time.