Mercurial > hg > svgui
comparison widgets/PropertyBox.cpp @ 862:1986c9b0d9c3 normalize_hybrid_option
Experimentally add the hybrid normalisation as an option (not working well either in UI or implementation)
author | Chris Cannam |
---|---|
date | Fri, 12 Sep 2014 11:38:55 +0100 |
parents | 57d943a61943 |
children | 98827470ada2 |
comparison
equal
deleted
inserted
replaced
861:59a22f3bf86d | 862:1986c9b0d9c3 |
---|---|
441 cb->setEditable(false); | 441 cb->setEditable(false); |
442 | 442 |
443 if (type == PropertyContainer::ValueProperty) { | 443 if (type == PropertyContainer::ValueProperty) { |
444 | 444 |
445 for (int i = min; i <= max; ++i) { | 445 for (int i = min; i <= max; ++i) { |
446 cb->addItem(m_container->getPropertyValueLabel(name, i)); | 446 |
447 QString label = m_container->getPropertyValueLabel(name, i); | |
448 QString iname = m_container->getPropertyValueIconName(name, i); | |
449 | |
450 if (iname != "") { | |
451 QIcon icon(IconLoader().load(iname)); | |
452 cb->addItem(icon, label); | |
453 } else { | |
454 cb->addItem(label); | |
455 } | |
447 } | 456 } |
448 | 457 |
449 } else if (type == PropertyContainer::UnitsProperty) { | 458 } else if (type == PropertyContainer::UnitsProperty) { |
450 | 459 |
451 QStringList units = UnitDatabase::getInstance()->getKnownUnits(); | 460 QStringList units = UnitDatabase::getInstance()->getKnownUnits(); |