changeset 1106:ee0aff1d0743 3.0-integration

Merge from branch normalize_hybrid_option
author Chris Cannam
date Fri, 26 Jun 2015 14:08:05 +0100
parents a27b1ce86e4f (current diff) a54016762f77 (diff)
children a65328f0c450
files
diffstat 2 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
 {
--- 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