# HG changeset patch
# User Chris Cannam
# Date 1435324085 -3600
# Node ID ee0aff1d0743680befe36e5627d31c019778d0b0
# Parent  a27b1ce86e4f2083904b5dc113adf5d9f7b40c1b# Parent  a54016762f77582f95bb6fedb1f302cb32906612
Merge from branch normalize_hybrid_option

diff -r a27b1ce86e4f -r ee0aff1d0743 base/PropertyContainer.cpp
--- a/base/PropertyContainer.cpp	Fri Jun 26 14:07:25 2015 +0100
+++ b/base/PropertyContainer.cpp	Fri Jun 26 14:08:05 2015 +0100
@@ -59,6 +59,12 @@
     return QString();
 }
 
+QString
+PropertyContainer::getPropertyValueIconName(const PropertyName &, int) const
+{
+    return QString();
+}
+
 RangeMapper *
 PropertyContainer::getNewPropertyRangeMapper(const PropertyName &) const
 {
diff -r a27b1ce86e4f -r ee0aff1d0743 base/PropertyContainer.h
--- a/base/PropertyContainer.h	Fri Jun 26 14:07:25 2015 +0100
+++ b/base/PropertyContainer.h	Fri Jun 26 14:08:05 2015 +0100
@@ -91,6 +91,13 @@
 					  int value) const;
 
     /**
+     * If the given property is a ValueProperty, return the icon to be
+     * used for the given value for that property, if any.
+     */
+    virtual QString getPropertyValueIconName(const PropertyName &,
+                                             int value) const;
+
+    /**
      * If the given property is a RangeProperty, return a new
      * RangeMapper object mapping its integer range onto an underlying
      * floating point value range for human-intelligible display, if