Skip to content
Permalink
Browse files

Extends color expression help to mention HEX color notation

and color name Which seems to be possible to use as well
  • Loading branch information
SrNetoChan committed Feb 1, 2017
1 parent b3e8d82 commit c1eedc79b97f0bcea58be54c17478de98db5e666
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 c1eedc7

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