From c1eedc79b97f0bcea58be54c17478de98db5e666 Mon Sep 17 00:00:00 2001 From: Alexandre Neto Date: Fri, 27 Jan 2017 18:08:01 +0000 Subject: [PATCH] Extends color expression help to mention HEX color notation and color name Which seems to be possible to use as well --- src/core/qgsproperty.cpp | 4 ++-- src/gui/qgsdatadefinedbutton.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/qgsproperty.cpp b/src/core/qgsproperty.cpp index a3eeea3b770c..1c78d0773577 100644 --- 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 [r,g,b,a] as int 0-255" ); + mHelpText = QObject::tr( "string [r,g,b,a] as int 0-255 or #RRGGBBAA as hex or color as color's name" ); break; case ColorNoAlpha: mTypes = DataTypeString; - mHelpText = QObject::tr( "string [r,g,b] as int 0-255" ); + mHelpText = QObject::tr( "string [r,g,b] as int 0-255 or #RRGGBB as hex or color as color's name" ); break; case PenJoinStyle: diff --git a/src/gui/qgsdatadefinedbutton.cpp b/src/gui/qgsdatadefinedbutton.cpp index c7c214d2dbd1..273bceb40578 100644 --- a/src/gui/qgsdatadefinedbutton.cpp +++ b/src/gui/qgsdatadefinedbutton.cpp @@ -809,12 +809,12 @@ QString QgsDataDefinedButton::unitsMmMuPercentDesc() QString QgsDataDefinedButton::colorNoAlphaDesc() { - return tr( "string [r,g,b] as int 0-255" ); + return tr( "string [r,g,b] as int 0-255 or #RRGGBB as hex or color as color's name" ); } QString QgsDataDefinedButton::colorAlphaDesc() { - return tr( "string [r,g,b,a] as int 0-255" ); + return tr( "string [r,g,b,a] as int 0-255 or #RRGGBBAA as hex or color as color's name" ); } QString QgsDataDefinedButton::textHorzAlignDesc()