comparison base/PropertyContainer.cpp @ 277:3b8008d09541

* Add a colour database, and Add New Colour function to the colour combo
  in property box.  The colour property is only correctly handled in the
  waveform layer so far.

* Add en_GB translation, to translate those annoying Color texts in the
  Qt colour picker dialog.

 
 #include "PropertyContainer.h"
 #include "CommandHistory.h"
 #include "RangeMapper.h"
 #include "UnitDatabase.h"
+#include "ColourDatabase.h"
 
 #include <QColor>
 
 #include <iostream>
 

     if (deflt) *deflt = 0;
     return 0;
 }
 
 QString
-PropertyContainer::getPropertyValueLabel(const PropertyName &, int) const
-{
+PropertyContainer::getPropertyValueLabel(const PropertyName &name, int value) const
+{
+    if (getPropertyType(name) == ColourProperty) {
+        ColourDatabase *db = ColourDatabase::getInstance();
+        if (value >= 0 && size_t(value) < db->getColourCount()) {
+            return db->getColourName(value);
+        }
+    }
+
     return QString();
 }
 
 RangeMapper *
 PropertyContainer::getNewPropertyRangeMapper(const PropertyName &) const

         }
         break;
     }
 
     case ColourProperty:
-    {
-        QColor c(valueString);
-        if (c.isValid()) {
-            value = c.rgb();
-            success = true;
-        }
-        break;
-    }
+        value = ColourDatabase::getInstance()->getColourIndex(valueString);
+        if (value >= 0) success = true;
+        else value = 0;
+        break;
         
     case UnitsProperty:
         value = UnitDatabase::getInstance()->getUnitId(valueString, false);
         if (value >= 0) success = true;
         else value = 0;