Merge pull request #2462 from jackokring/organifix

Organic: fix tool tips displaying "%1" instead of oscillator number.
This commit is contained in:
Raine M. Ekman
2015-11-25 14:58:27 +02:00

View File

@@ -557,9 +557,9 @@ void organicInstrumentView::updateKnobHint()
const float harm = oi->m_osc[i]->m_harmModel.value();
const float wave = oi->m_osc[i]->m_oscModel.value();
m_oscKnobs[i].m_harmKnob->setHintText( tr( "Osc %1 harmonic:" ), " (" +
m_oscKnobs[i].m_harmKnob->setHintText( tr( "Osc %1 harmonic:" ).arg( i + 1 ), " (" +
HARMONIC_NAMES[ static_cast<int>( harm ) ] + ")" );
m_oscKnobs[i].m_oscKnob->setHintText( tr( "Osc %1 waveform:" ), " (" +
m_oscKnobs[i].m_oscKnob->setHintText( tr( "Osc %1 waveform:" ).arg( i + 1 ), " (" +
WAVEFORM_NAMES[ static_cast<int>( wave ) ] + ")" );
}
}