hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

InstrumentFunctions/ChordCreator: fixed localization support for chords

Browse Source 
Recent commits broke localization support for chord names. Static strings
to be used with tr() have to be marked as QT_TRANSLATE_NOOP.
This commit is contained in:
Tobias Doerffel
2012-02-01 17:21:05 +01:00
parent 59242adadc
commit 39010a12a3
1 changed files with 92 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

186
src/core/InstrumentFunctions.cpp
View File

@@ -35,108 +35,108 @@
ChordCreator::ChordTable::Init ChordCreator::ChordTable::s_initTable[] =
{
{ "octave", { 0, -1 } },
{ "Major" , { 0, 4, 7, -1 } },
{ "Majb5" , { 0, 4, 6, -1 } },
{ "minor" , { 0, 3, 7, -1 } },
{ "minb5" , { 0, 3, 6, -1 } },
{ "sus2" , { 0, 2, 7, -1 } },
{ "sus4" , { 0, 5, 7, -1 } },
{ "aug" , { 0, 4, 8, -1 } },
{ "augsus4" , { 0, 5, 8, -1 } },
{ "tri" , { 0, 3, 6, 9, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "octave" ), { 0, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Major" ), { 0, 4, 7, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Majb5" ), { 0, 4, 6, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "minor" ), { 0, 3, 7, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "minb5" ), { 0, 3, 6, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "sus2" ), { 0, 2, 7, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "sus4" ), { 0, 5, 7, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "aug" ), { 0, 4, 8, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "augsus4" ), { 0, 5, 8, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "tri" ), { 0, 3, 6, 9, -1 } },
{ "6" , { 0, 4, 7, 9, -1 } },
{ "6sus4" , { 0, 5, 7, 9, -1 } },
{ "6add9" , { 0, 4, 7, 12, -1 } },
{ "m6" , { 0, 3, 7, 9, -1 } },
{ "m6add9" , { 0, 3, 7, 9, 14, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "6" ), { 0, 4, 7, 9, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "6sus4" ), { 0, 5, 7, 9, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "6add9" ), { 0, 4, 7, 12, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "m6" ), { 0, 3, 7, 9, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "m6add9" ), { 0, 3, 7, 9, 14, -1 } },
{ "7" , { 0, 4, 7, 10, -1 } },
{ "7sus4" , { 0, 5, 7, 10, -1 } },
{ "7#5" , { 0, 4, 8, 10, -1 } },
{ "7b5" , { 0, 4, 6, 10, -1 } },
{ "7#9" , { 0, 4, 7, 10, 13, 18, -1 } },
{ "7b9" , { 0, 4, 7, 10, 13, 16, -1 } },
{ "7#5#9" , { 0, 4, 8, 12, 14, 19, -1 } },
{ "7#5b9" , { 0, 4, 8, 12, 14, 17, -1 } },
{ "7b5b9" , { 0, 4, 6, 10, 12, 15, -1 } },
{ "7add11" , { 0, 4, 7, 10, 17, -1 } },
{ "7add13" , { 0, 4, 7, 10, 21, -1 } },
{ "7#11" , { 0, 4, 7, 10, 18, -1 } },
{ "Maj7" , { 0, 4, 7, 11, -1 } },
{ "Maj7b5" , { 0, 4, 6, 11, -1 } },
{ "Maj7#5" , { 0, 4, 8, 11, -1 } },
{ "Maj7#11" , { 0, 4, 7, 11, 18, -1 } },
{ "Maj7add13" , { 0, 4, 7, 11, 21, -1 } },
{ "m7" , { 0, 3, 7, 10, -1 } },
{ "m7b5" , { 0, 3, 6, 10, -1 } },
{ "m7b9" , { 0, 3, 7, 10, 13, -1 } },
{ "m7add11" , { 0, 3, 7, 10, 17, -1 } },
{ "m7add13" , { 0, 3, 7, 10, 21, -1 } },
{ "m-Maj7" , { 0, 3, 7, 11, -1 } },
{ "m-Maj7add11" , { 0, 3, 7, 11, 17, -1 } },
{ "m-Maj7add13" , { 0, 3, 7, 11, 21, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "7" ), { 0, 4, 7, 10, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "7sus4" ), { 0, 5, 7, 10, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "7#5" ), { 0, 4, 8, 10, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "7b5" ), { 0, 4, 6, 10, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "7#9" ), { 0, 4, 7, 10, 13, 18, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "7b9" ), { 0, 4, 7, 10, 13, 16, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "7#5#9" ), { 0, 4, 8, 12, 14, 19, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "7#5b9" ), { 0, 4, 8, 12, 14, 17, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "7b5b9" ), { 0, 4, 6, 10, 12, 15, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "7add11" ), { 0, 4, 7, 10, 17, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "7add13" ), { 0, 4, 7, 10, 21, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "7#11" ), { 0, 4, 7, 10, 18, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Maj7" ), { 0, 4, 7, 11, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Maj7b5" ), { 0, 4, 6, 11, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Maj7#5" ), { 0, 4, 8, 11, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Maj7#11" ), { 0, 4, 7, 11, 18, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Maj7add13" ), { 0, 4, 7, 11, 21, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "m7" ), { 0, 3, 7, 10, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "m7b5" ), { 0, 3, 6, 10, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "m7b9" ), { 0, 3, 7, 10, 13, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "m7add11" ), { 0, 3, 7, 10, 17, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "m7add13" ), { 0, 3, 7, 10, 21, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "m-Maj7" ), { 0, 3, 7, 11, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "m-Maj7add11" ), { 0, 3, 7, 11, 17, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "m-Maj7add13" ), { 0, 3, 7, 11, 21, -1 } },
{ "9" , { 0, 4, 7, 10, 14, -1 } },
{ "9sus4" , { 0, 5, 7, 10, 14, -1 } },
{ "add9" , { 0, 4, 7, 14, -1 } },
{ "9#5" , { 0, 4, 8, 10, 14, -1 } },
{ "9b5" , { 0, 4, 6, 10, 14, -1 } },
{ "9#11" , { 0, 4, 7, 10, 14, 18, -1 } },
{ "9b13" , { 0, 4, 7, 10, 14, 20, -1 } },
{ "Maj9" , { 0, 4, 7, 11, 14, -1 } },
{ "Maj9sus4" , { 0, 5, 7, 11, 15, -1 } },
{ "Maj9#5" , { 0, 4, 8, 11, 14, -1 } },
{ "Maj9#11" , { 0, 4, 7, 11, 14, 18, -1 } },
{ "m9" , { 0, 3, 7, 10, 14, -1 } },
{ "madd9" , { 0, 3, 7, 14, -1 } },
{ "m9b5" , { 0, 3, 6, 10, 14, -1 } },
{ "m9-Maj7" , { 0, 3, 7, 11, 14, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "9" ), { 0, 4, 7, 10, 14, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "9sus4" ), { 0, 5, 7, 10, 14, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "add9" ), { 0, 4, 7, 14, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "9#5" ), { 0, 4, 8, 10, 14, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "9b5" ), { 0, 4, 6, 10, 14, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "9#11" ), { 0, 4, 7, 10, 14, 18, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "9b13" ), { 0, 4, 7, 10, 14, 20, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Maj9" ), { 0, 4, 7, 11, 14, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Maj9sus4" ), { 0, 5, 7, 11, 15, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Maj9#5" ), { 0, 4, 8, 11, 14, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Maj9#11" ), { 0, 4, 7, 11, 14, 18, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "m9" ), { 0, 3, 7, 10, 14, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "madd9" ), { 0, 3, 7, 14, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "m9b5" ), { 0, 3, 6, 10, 14, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "m9-Maj7" ), { 0, 3, 7, 11, 14, -1 } },
{ "11" , { 0, 4, 7, 10, 14, 17, -1 } },
{ "11b9" , { 0, 4, 7, 10, 13, 17, -1 } },
{ "Maj11" , { 0, 4, 7, 11, 14, 17, -1 } },
{ "m11" , { 0, 3, 7, 10, 14, 17, -1 } },
{ "m-Maj11" , { 0, 3, 7, 11, 14, 17, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "11" ), { 0, 4, 7, 10, 14, 17, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "11b9" ), { 0, 4, 7, 10, 13, 17, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Maj11" ), { 0, 4, 7, 11, 14, 17, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "m11" ), { 0, 3, 7, 10, 14, 17, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "m-Maj11" ), { 0, 3, 7, 11, 14, 17, -1 } },
{ "13" , { 0, 4, 7, 10, 14, 21, -1 } },
{ "13#9" , { 0, 4, 7, 10, 15, 21, -1 } },
{ "13b9" , { 0, 4, 7, 10, 13, 21, -1 } },
{ "13b5b9" , { 0, 4, 6, 10, 13, 21, -1 } },
{ "Maj13" , { 0, 4, 7, 11, 14, 21, -1 } },
{ "m13" , { 0, 3, 7, 10, 14, 21, -1 } },
{ "m-Maj13" , { 0, 3, 7, 11, 14, 21, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "13" ), { 0, 4, 7, 10, 14, 21, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "13#9" ), { 0, 4, 7, 10, 15, 21, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "13b9" ), { 0, 4, 7, 10, 13, 21, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "13b5b9" ), { 0, 4, 6, 10, 13, 21, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Maj13" ), { 0, 4, 7, 11, 14, 21, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "m13" ), { 0, 3, 7, 10, 14, 21, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "m-Maj13" ), { 0, 3, 7, 11, 14, 21, -1 } },
{ "Major" , { 0, 2, 4, 5, 7, 9, 11, -1 } },
{ "Harmonic minor" , { 0, 2, 3, 5, 7, 8, 11, -1 } },
{ "Melodic minor" , { 0, 2, 3, 5, 7, 9, 11, -1 } },
{ "Whole tone" , { 0, 2, 4, 6, 8, 10, -1 } },
{ "Diminished" , { 0, 2, 3, 5, 6, 8, 9, 11, -1 } },
{ "Major pentatonic" , { 0, 2, 4, 7, 10, -1 } },
{ "Minor pentatonic" , { 0, 3, 5, 7, 10, -1 } },
{ "Jap in sen" , { 0, 1, 5, 7, 10, -1 } },
{ "Major bebop" , { 0, 2, 4, 5, 7, 8, 9, 11, -1 } },
{ "Dominant bebop" , { 0, 2, 4, 5, 7, 9, 10, 11, -1 } },
{ "Blues" , { 0, 3, 5, 6, 7, 10, -1 } },
{ "Arabic" , { 0, 1, 4, 5, 7, 8, 11, -1 } },
{ "Enigmatic" , { 0, 1, 4, 6, 8, 10, 11, -1 } },
{ "Neopolitan" , { 0, 1, 3, 5, 7, 9, 11, -1 } },
{ "Neopolitan minor" , { 0, 1, 3, 5, 7, 8, 11, -1 } },
{ "Hungarian minor" , { 0, 2, 3, 6, 7, 8, 11, -1 } },
{ "Dorian" , { 0, 2, 3, 5, 7, 9, 10, -1 } },
{ "Phrygolydian" , { 0, 1, 3, 5, 7, 8, 10, -1 } },
{ "Lydian" , { 0, 2, 4, 6, 7, 9, 11, -1 } },
{ "Mixolydian" , { 0, 2, 4, 5, 7, 9, 10, -1 } },
{ "Aeolian" , { 0, 2, 3, 5, 7, 8, 10, -1 } },
{ "Locrian" , { 0, 1, 3, 5, 6, 8, 10, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Major" ), { 0, 2, 4, 5, 7, 9, 11, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Harmonic minor" ), { 0, 2, 3, 5, 7, 8, 11, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Melodic minor" ), { 0, 2, 3, 5, 7, 9, 11, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Whole tone" ), { 0, 2, 4, 6, 8, 10, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Diminished" ), { 0, 2, 3, 5, 6, 8, 9, 11, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Major pentatonic" ), { 0, 2, 4, 7, 10, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Minor pentatonic" ), { 0, 3, 5, 7, 10, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Jap in sen" ), { 0, 1, 5, 7, 10, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Major bebop" ), { 0, 2, 4, 5, 7, 8, 9, 11, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Dominant bebop" ), { 0, 2, 4, 5, 7, 9, 10, 11, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Blues" ), { 0, 3, 5, 6, 7, 10, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Arabic" ), { 0, 1, 4, 5, 7, 8, 11, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Enigmatic" ), { 0, 1, 4, 6, 8, 10, 11, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Neopolitan" ), { 0, 1, 3, 5, 7, 9, 11, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Neopolitan minor" ), { 0, 1, 3, 5, 7, 8, 11, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Hungarian minor" ), { 0, 2, 3, 6, 7, 8, 11, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Dorian" ), { 0, 2, 3, 5, 7, 9, 10, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Phrygolydian" ), { 0, 1, 3, 5, 7, 8, 10, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Lydian" ), { 0, 2, 4, 6, 7, 9, 11, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Mixolydian" ), { 0, 2, 4, 5, 7, 9, 10, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Aeolian" ), { 0, 2, 3, 5, 7, 8, 10, -1 } },
{ QT_TRANSLATE_NOOP( "ChordCreator", "Locrian" ), { 0, 1, 3, 5, 6, 8, 10, -1 } },
} ;
ChordCreator::Chord::Chord( const char * n, const ChordSemiTones & semi_tones ) :
m_name( tr( n ) )
m_name( ChordCreator::tr( n ) )
{
for( m_size = 0; m_size < MAX_CHORD_POLYPHONY; m_size++ )
{
@@ -203,8 +203,7 @@ ChordCreator::ChordCreator( Model * _parent ) :
const ChordTable & chord_table = ChordTable::getInstance();
for( int i = 0; i < chord_table.size(); ++i )
{
m_chordsModel.addItem( tr( chord_table[i].getName().toUtf8().
constData() ) );
m_chordsModel.addItem( chord_table[i].getName() );
}
}
@@ -318,8 +317,7 @@ Arpeggiator::Arpeggiator( Model * _parent ) :
const ChordCreator::ChordTable & chord_table = ChordCreator::ChordTable::getInstance();
for( int i = 0; i < chord_table[i].size(); ++i )
{
m_arpModel.addItem( ChordCreator::tr(
chord_table[i].getName().toUtf8().constData() ) );
m_arpModel.addItem( chord_table[i].getName() );
}
m_arpDirectionModel.addItem( tr( "Up" ), new PixmapLoader( "arp_up" ) );