Mercurial > hg > sonic-visualiser
comparison main/MainWindow.cpp @ 1463:f5c828d1f3e2 3.0-integration
Store/recall colours by hex name; simpler and more general (was having trouble with reloading on Mac). Also update subrepos inc PortAudio build
author | Chris Cannam <cannam@all-day-breakfast.com> |
---|---|
date | Tue, 03 Jan 2017 15:15:26 +0000 |
parents | f5180edc5dda |
children | 9401d021b47b |
comparison
equal
deleted
inserted
replaced
1462:f5180edc5dda | 1463:f5c828d1f3e2 |
---|---|
3585 QString defaultColourName(tr("Green")); | 3585 QString defaultColourName(tr("Green")); |
3586 if (m_viewManager && m_viewManager->getGlobalDarkBackground()) { | 3586 if (m_viewManager && m_viewManager->getGlobalDarkBackground()) { |
3587 defaultColourName = tr("Bright Green"); | 3587 defaultColourName = tr("Bright Green"); |
3588 } | 3588 } |
3589 ColourDatabase *cdb = ColourDatabase::getInstance(); | 3589 ColourDatabase *cdb = ColourDatabase::getInstance(); |
3590 QColor colour = | 3590 QColor colour = QColor |
3591 ((settings.value("overview-colour", cdb->getColour(defaultColourName))) | 3591 (settings.value("overview-colour", |
3592 .value<QColor>()); | 3592 cdb->getColour(defaultColourName).name()).toString()); |
3593 settings.endGroup(); | 3593 settings.endGroup(); |
3594 | 3594 |
3595 int index = cdb->getColourIndex(colour); | 3595 int index = cdb->getColourIndex(colour); |
3596 if (index >= 0) { | 3596 if (index >= 0) { |
3597 m_panLayer->setBaseColour(index); | 3597 m_panLayer->setBaseColour(index); |