Add icons for data defined colors

qgis · Jan 11, 2019 · 56b363e · 56b363e
1 parent fd9bd0a
commit 56b363e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -742,6 +742,8 @@
         <file>themes/default/mIconFolder24.svg</file>
         <file>themes/default/mActionNewFolder.svg</file>
         <file>themes/default/mIconFieldBool.svg</file>
+        <file>themes/default/mIconDataDefineColor.svg</file>
+        <file>themes/default/mIconDataDefineColorOn.svg</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

diff --git a/images/themes/default/mIconDataDefineColor.svg b/images/themes/default/mIconDataDefineColor.svg
diff --git a/images/themes/default/mIconDataDefineColorOn.svg b/images/themes/default/mIconDataDefineColorOn.svg
diff --git a/src/gui/qgspropertyoverridebutton.cpp b/src/gui/qgspropertyoverridebutton.cpp
@@ -753,6 +753,12 @@ void QgsPropertyOverrideButton::updateGui()
   {
     icon = mProperty.isActive() ? QgsApplication::getThemeIcon( QStringLiteral( "/mIconDataDefineExpressionOn.svg" ) ) : QgsApplication::getThemeIcon( QStringLiteral( "/mIconDataDefineExpression.svg" ) );
 
+    QRegularExpression rx( QStringLiteral( "^project_color\\('.*'\\)$" ) );
+    if ( rx.match( mExpressionString ).hasMatch() )
+    {
+      icon = mProperty.isActive() ? QgsApplication::getThemeIcon( QStringLiteral( "/mIconDataDefineColorOn.svg" ) ) : QgsApplication::getThemeIcon( QStringLiteral( "/mIconDataDefineColor.svg" ) );
+    }
+
     QgsExpression exp( mExpressionString );
     if ( exp.hasParserError() )
     {