Skip to content

Commit c1eedc7

Browse files
committedFeb 1, 2017
Extends color expression help to mention HEX color notation
and color name Which seems to be possible to use as well
1 parent b3e8d82 commit c1eedc7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed
 

‎src/core/qgsproperty.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ QgsPropertyDefinition::QgsPropertyDefinition( const QString& name, const QString
8686

8787
case ColorWithAlpha:
8888
mTypes = DataTypeString;
89-
mHelpText = QObject::tr( "string [<b>r,g,b,a</b>] as int 0-255" );
89+
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" );
9090
break;
9191

9292
case ColorNoAlpha:
9393
mTypes = DataTypeString;
94-
mHelpText = QObject::tr( "string [<b>r,g,b</b>] as int 0-255" );
94+
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" );
9595
break;
9696

9797
case PenJoinStyle:

‎src/gui/qgsdatadefinedbutton.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -809,12 +809,12 @@ QString QgsDataDefinedButton::unitsMmMuPercentDesc()
809809

810810
QString QgsDataDefinedButton::colorNoAlphaDesc()
811811
{
812-
return tr( "string [<b>r,g,b</b>] as int 0-255" );
812+
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" );
813813
}
814814

815815
QString QgsDataDefinedButton::colorAlphaDesc()
816816
{
817-
return tr( "string [<b>r,g,b,a</b>] as int 0-255" );
817+
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" );
818818
}
819819

820820
QString QgsDataDefinedButton::textHorzAlignDesc()

0 commit comments

Comments
 (0)
Please sign in to comment.