diff --git a/Jamulus.pro b/Jamulus.pro index 66da708f..164258c3 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -678,34 +678,34 @@ DISTFILES += ChangeLog \ src/res/VRLEDRedSmall.png \ src/res/VRLEDYellow.png \ src/res/VRLEDYellowSmall.png \ - src/res/instruments/instraccordeon.png \ - src/res/instruments/instraguitar.png \ - src/res/instruments/instrbassguitar.png \ - src/res/instruments/instrcello.png \ - src/res/instruments/instrclarinet.png \ - src/res/instruments/instrdjembe.png \ - src/res/instruments/instrdoublebass.png \ - src/res/instruments/instrdrumset.png \ - src/res/instruments/instreguitar.png \ - src/res/instruments/instrflute.png \ - src/res/instruments/instrfrenchhorn.png \ - src/res/instruments/instrgrandpiano.png \ - src/res/instruments/instrharmonica.png \ - src/res/instruments/instrkeyboard.png \ - src/res/instruments/instrlistener.png \ - src/res/instruments/instrmicrophone.png \ - src/res/instruments/instrnone.png \ - src/res/instruments/instrrecorder.png \ - src/res/instruments/instrsaxophone.png \ - src/res/instruments/instrstreamer.png \ - src/res/instruments/instrsynthesizer.png \ - src/res/instruments/instrtrombone.png \ - src/res/instruments/instrtrumpet.png \ - src/res/instruments/instrtuba.png \ - src/res/instruments/instrviolin.png \ - src/res/instruments/instrvocal.png \ - src/res/instruments/instrguitarvocal.png \ - src/res/instruments/instrkeyboardvocal.png \ + src/res/instruments/accordeon.png \ + src/res/instruments/aguitar.png \ + src/res/instruments/bassguitar.png \ + src/res/instruments/cello.png \ + src/res/instruments/clarinet.png \ + src/res/instruments/djembe.png \ + src/res/instruments/doublebass.png \ + src/res/instruments/drumset.png \ + src/res/instruments/eguitar.png \ + src/res/instruments/flute.png \ + src/res/instruments/frenchhorn.png \ + src/res/instruments/grandpiano.png \ + src/res/instruments/harmonica.png \ + src/res/instruments/keyboard.png \ + src/res/instruments/listener.png \ + src/res/instruments/microphone.png \ + src/res/instruments/none.png \ + src/res/instruments/recorder.png \ + src/res/instruments/saxophone.png \ + src/res/instruments/streamer.png \ + src/res/instruments/synthesizer.png \ + src/res/instruments/trombone.png \ + src/res/instruments/trumpet.png \ + src/res/instruments/tuba.png \ + src/res/instruments/violin.png \ + src/res/instruments/vocal.png \ + src/res/instruments/guitarvocal.png \ + src/res/instruments/keyboardvocal.png \ src/res/instruments/bodhran.svg \ src/res/instruments/bodhran.png \ src/res/instruments/bassoon.svg \ diff --git a/src/res/instruments/instraccordeon.png b/src/res/instruments/accordeon.png similarity index 100% rename from src/res/instruments/instraccordeon.png rename to src/res/instruments/accordeon.png diff --git a/src/res/instruments/instraguitar.png b/src/res/instruments/aguitar.png similarity index 100% rename from src/res/instruments/instraguitar.png rename to src/res/instruments/aguitar.png diff --git a/src/res/instruments/instrbassguitar.png b/src/res/instruments/bassguitar.png similarity index 100% rename from src/res/instruments/instrbassguitar.png rename to src/res/instruments/bassguitar.png diff --git a/src/res/instruments/instrcello.png b/src/res/instruments/cello.png similarity index 100% rename from src/res/instruments/instrcello.png rename to src/res/instruments/cello.png diff --git a/src/res/instruments/instrclarinet.png b/src/res/instruments/clarinet.png similarity index 100% rename from src/res/instruments/instrclarinet.png rename to src/res/instruments/clarinet.png diff --git a/src/res/instruments/instrdjembe.png b/src/res/instruments/djembe.png similarity index 100% rename from src/res/instruments/instrdjembe.png rename to src/res/instruments/djembe.png diff --git a/src/res/instruments/instrdoublebass.png b/src/res/instruments/doublebass.png similarity index 100% rename from src/res/instruments/instrdoublebass.png rename to src/res/instruments/doublebass.png diff --git a/src/res/instruments/instrdrumset.png b/src/res/instruments/drumset.png similarity index 100% rename from src/res/instruments/instrdrumset.png rename to src/res/instruments/drumset.png diff --git a/src/res/instruments/instreguitar.png b/src/res/instruments/eguitar.png similarity index 100% rename from src/res/instruments/instreguitar.png rename to src/res/instruments/eguitar.png diff --git a/src/res/instruments/instrflute.png b/src/res/instruments/flute.png similarity index 100% rename from src/res/instruments/instrflute.png rename to src/res/instruments/flute.png diff --git a/src/res/instruments/instrfrenchhorn.png b/src/res/instruments/frenchhorn.png similarity index 100% rename from src/res/instruments/instrfrenchhorn.png rename to src/res/instruments/frenchhorn.png diff --git a/src/res/instruments/instrgrandpiano.png b/src/res/instruments/grandpiano.png similarity index 100% rename from src/res/instruments/instrgrandpiano.png rename to src/res/instruments/grandpiano.png diff --git a/src/res/instruments/instrguitarvocal.png b/src/res/instruments/guitarvocal.png similarity index 100% rename from src/res/instruments/instrguitarvocal.png rename to src/res/instruments/guitarvocal.png diff --git a/src/res/instruments/instrharmonica.png b/src/res/instruments/harmonica.png similarity index 100% rename from src/res/instruments/instrharmonica.png rename to src/res/instruments/harmonica.png diff --git a/src/res/instruments/instrkeyboard.png b/src/res/instruments/keyboard.png similarity index 100% rename from src/res/instruments/instrkeyboard.png rename to src/res/instruments/keyboard.png diff --git a/src/res/instruments/instrkeyboardvocal.png b/src/res/instruments/keyboardvocal.png similarity index 100% rename from src/res/instruments/instrkeyboardvocal.png rename to src/res/instruments/keyboardvocal.png diff --git a/src/res/instruments/instrlistener.png b/src/res/instruments/listener.png similarity index 100% rename from src/res/instruments/instrlistener.png rename to src/res/instruments/listener.png diff --git a/src/res/instruments/instrmicrophone.png b/src/res/instruments/microphone.png similarity index 100% rename from src/res/instruments/instrmicrophone.png rename to src/res/instruments/microphone.png diff --git a/src/res/instruments/instrnone.png b/src/res/instruments/none.png similarity index 100% rename from src/res/instruments/instrnone.png rename to src/res/instruments/none.png diff --git a/src/res/instruments/instrrecorder.png b/src/res/instruments/recorder.png similarity index 100% rename from src/res/instruments/instrrecorder.png rename to src/res/instruments/recorder.png diff --git a/src/res/instruments/instrsaxophone.png b/src/res/instruments/saxophone.png similarity index 100% rename from src/res/instruments/instrsaxophone.png rename to src/res/instruments/saxophone.png diff --git a/src/res/instruments/instrstreamer.png b/src/res/instruments/streamer.png similarity index 100% rename from src/res/instruments/instrstreamer.png rename to src/res/instruments/streamer.png diff --git a/src/res/instruments/instrsynthesizer.png b/src/res/instruments/synthesizer.png similarity index 100% rename from src/res/instruments/instrsynthesizer.png rename to src/res/instruments/synthesizer.png diff --git a/src/res/instruments/instrtrombone.png b/src/res/instruments/trombone.png similarity index 100% rename from src/res/instruments/instrtrombone.png rename to src/res/instruments/trombone.png diff --git a/src/res/instruments/instrtrumpet.png b/src/res/instruments/trumpet.png similarity index 100% rename from src/res/instruments/instrtrumpet.png rename to src/res/instruments/trumpet.png diff --git a/src/res/instruments/instrtuba.png b/src/res/instruments/tuba.png similarity index 100% rename from src/res/instruments/instrtuba.png rename to src/res/instruments/tuba.png diff --git a/src/res/instruments/instrviolin.png b/src/res/instruments/violin.png similarity index 100% rename from src/res/instruments/instrviolin.png rename to src/res/instruments/violin.png diff --git a/src/res/instruments/instrvocal.png b/src/res/instruments/vocal.png similarity index 100% rename from src/res/instruments/instrvocal.png rename to src/res/instruments/vocal.png diff --git a/src/resources.qrc b/src/resources.qrc index c10bebbc..d4fc7491 100755 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -36,34 +36,34 @@ res/mixerboardbackground.png - res/instruments/instrnone.png - res/instruments/instrbassguitar.png - res/instruments/instrclarinet.png - res/instruments/instrdrumset.png - res/instruments/instreguitar.png - res/instruments/instrsaxophone.png - res/instruments/instrtrumpet.png - res/instruments/instrmicrophone.png - res/instruments/instrkeyboard.png - res/instruments/instrviolin.png - res/instruments/instraguitar.png - res/instruments/instrflute.png - res/instruments/instraccordeon.png - res/instruments/instrcello.png - res/instruments/instrtrombone.png - res/instruments/instrfrenchhorn.png - res/instruments/instrtuba.png - res/instruments/instrdoublebass.png - res/instruments/instrgrandpiano.png - res/instruments/instrsynthesizer.png - res/instruments/instrvocal.png - res/instruments/instrdjembe.png - res/instruments/instrharmonica.png - res/instruments/instrrecorder.png - res/instruments/instrlistener.png - res/instruments/instrstreamer.png - res/instruments/instrguitarvocal.png - res/instruments/instrkeyboardvocal.png + res/instruments/none.png + res/instruments/bassguitar.png + res/instruments/clarinet.png + res/instruments/drumset.png + res/instruments/eguitar.png + res/instruments/saxophone.png + res/instruments/trumpet.png + res/instruments/microphone.png + res/instruments/keyboard.png + res/instruments/violin.png + res/instruments/aguitar.png + res/instruments/flute.png + res/instruments/accordeon.png + res/instruments/cello.png + res/instruments/trombone.png + res/instruments/frenchhorn.png + res/instruments/tuba.png + res/instruments/doublebass.png + res/instruments/grandpiano.png + res/instruments/synthesizer.png + res/instruments/vocal.png + res/instruments/djembe.png + res/instruments/harmonica.png + res/instruments/recorder.png + res/instruments/listener.png + res/instruments/streamer.png + res/instruments/guitarvocal.png + res/instruments/keyboardvocal.png res/instruments/bodhran.png res/instruments/bassoon.png res/instruments/oboe.png diff --git a/src/util.cpp b/src/util.cpp index 3dfcfc01..d8ae833c 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -972,34 +972,34 @@ CVector& CInstPictures::GetTable() // instrument picture data base initialization // NOTE: Do not change the order of any instrument in the future! // NOTE: The very first entry is the "not used" element per definition. - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "None" ), ":/png/instr/res/instruments/instrnone.png", IC_OTHER_INSTRUMENT ) ); // special first element - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Drum Set" ), ":/png/instr/res/instruments/instrdrumset.png", IC_PERCUSSION_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Djembe" ), ":/png/instr/res/instruments/instrdjembe.png", IC_PERCUSSION_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Electric Guitar" ), ":/png/instr/res/instruments/instreguitar.png", IC_PLUCKING_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Acoustic Guitar" ), ":/png/instr/res/instruments/instraguitar.png", IC_PLUCKING_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Bass Guitar" ), ":/png/instr/res/instruments/instrbassguitar.png", IC_PLUCKING_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Keyboard" ), ":/png/instr/res/instruments/instrkeyboard.png", IC_KEYBOARD_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Synthesizer" ), ":/png/instr/res/instruments/instrsynthesizer.png", IC_KEYBOARD_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Grand Piano" ), ":/png/instr/res/instruments/instrgrandpiano.png", IC_KEYBOARD_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Accordion" ), ":/png/instr/res/instruments/instraccordeon.png", IC_KEYBOARD_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal" ), ":/png/instr/res/instruments/instrvocal.png", IC_OTHER_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Microphone" ), ":/png/instr/res/instruments/instrmicrophone.png", IC_OTHER_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Harmonica" ), ":/png/instr/res/instruments/instrharmonica.png", IC_WIND_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Trumpet" ), ":/png/instr/res/instruments/instrtrumpet.png", IC_WIND_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Trombone" ), ":/png/instr/res/instruments/instrtrombone.png", IC_WIND_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "French Horn" ), ":/png/instr/res/instruments/instrfrenchhorn.png", IC_WIND_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Tuba" ), ":/png/instr/res/instruments/instrtuba.png", IC_WIND_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Saxophone" ), ":/png/instr/res/instruments/instrsaxophone.png", IC_WIND_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Clarinet" ), ":/png/instr/res/instruments/instrclarinet.png", IC_WIND_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Flute" ), ":/png/instr/res/instruments/instrflute.png", IC_WIND_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Violin" ), ":/png/instr/res/instruments/instrviolin.png", IC_STRING_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Cello" ), ":/png/instr/res/instruments/instrcello.png", IC_STRING_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Double Bass" ), ":/png/instr/res/instruments/instrdoublebass.png", IC_STRING_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Recorder" ), ":/png/instr/res/instruments/instrrecorder.png", IC_OTHER_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Streamer" ), ":/png/instr/res/instruments/instrstreamer.png", IC_OTHER_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Listener" ), ":/png/instr/res/instruments/instrlistener.png", IC_OTHER_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Guitar+Vocal" ), ":/png/instr/res/instruments/instrguitarvocal.png", IC_MULTIPLE_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Keyboard+Vocal" ), ":/png/instr/res/instruments/instrkeyboardvocal.png", IC_MULTIPLE_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "None" ), ":/png/instr/res/instruments/none.png", IC_OTHER_INSTRUMENT ) ); // special first element + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Drum Set" ), ":/png/instr/res/instruments/drumset.png", IC_PERCUSSION_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Djembe" ), ":/png/instr/res/instruments/djembe.png", IC_PERCUSSION_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Electric Guitar" ), ":/png/instr/res/instruments/eguitar.png", IC_PLUCKING_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Acoustic Guitar" ), ":/png/instr/res/instruments/aguitar.png", IC_PLUCKING_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Bass Guitar" ), ":/png/instr/res/instruments/bassguitar.png", IC_PLUCKING_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Keyboard" ), ":/png/instr/res/instruments/keyboard.png", IC_KEYBOARD_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Synthesizer" ), ":/png/instr/res/instruments/synthesizer.png", IC_KEYBOARD_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Grand Piano" ), ":/png/instr/res/instruments/grandpiano.png", IC_KEYBOARD_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Accordion" ), ":/png/instr/res/instruments/accordeon.png", IC_KEYBOARD_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal" ), ":/png/instr/res/instruments/vocal.png", IC_OTHER_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Microphone" ), ":/png/instr/res/instruments/microphone.png", IC_OTHER_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Harmonica" ), ":/png/instr/res/instruments/harmonica.png", IC_WIND_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Trumpet" ), ":/png/instr/res/instruments/trumpet.png", IC_WIND_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Trombone" ), ":/png/instr/res/instruments/trombone.png", IC_WIND_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "French Horn" ), ":/png/instr/res/instruments/frenchhorn.png", IC_WIND_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Tuba" ), ":/png/instr/res/instruments/tuba.png", IC_WIND_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Saxophone" ), ":/png/instr/res/instruments/saxophone.png", IC_WIND_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Clarinet" ), ":/png/instr/res/instruments/clarinet.png", IC_WIND_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Flute" ), ":/png/instr/res/instruments/flute.png", IC_WIND_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Violin" ), ":/png/instr/res/instruments/violin.png", IC_STRING_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Cello" ), ":/png/instr/res/instruments/cello.png", IC_STRING_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Double Bass" ), ":/png/instr/res/instruments/doublebass.png", IC_STRING_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Recorder" ), ":/png/instr/res/instruments/recorder.png", IC_OTHER_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Streamer" ), ":/png/instr/res/instruments/streamer.png", IC_OTHER_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Listener" ), ":/png/instr/res/instruments/listener.png", IC_OTHER_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Guitar+Vocal" ), ":/png/instr/res/instruments/guitarvocal.png", IC_MULTIPLE_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Keyboard+Vocal" ), ":/png/instr/res/instruments/keyboardvocal.png", IC_MULTIPLE_INSTRUMENT ) ); vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Bodhran" ), ":/png/instr/res/instruments/bodhran.png", IC_PERCUSSION_INSTRUMENT ) ); vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Bassoon" ), ":/png/instr/res/instruments/bassoon.png", IC_WIND_INSTRUMENT ) ); vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Oboe" ), ":/png/instr/res/instruments/oboe.png", IC_WIND_INSTRUMENT ) );