remove the "instr" from the instrument picture names since it is no longer needed because all pictures are now in a separate instrument directory
56
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 \
|
||||
|
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 931 B After Width: | Height: | Size: 931 B |
Before Width: | Height: | Size: 929 B After Width: | Height: | Size: 929 B |
Before Width: | Height: | Size: 587 B After Width: | Height: | Size: 587 B |
Before Width: | Height: | Size: 1,016 B After Width: | Height: | Size: 1,016 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 936 B After Width: | Height: | Size: 936 B |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 955 B After Width: | Height: | Size: 955 B |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 900 B After Width: | Height: | Size: 900 B |
Before Width: | Height: | Size: 917 B After Width: | Height: | Size: 917 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
@ -36,34 +36,34 @@
|
|||
<file>res/mixerboardbackground.png</file>
|
||||
</qresource>
|
||||
<qresource prefix="/png/instr">
|
||||
<file>res/instruments/instrnone.png</file>
|
||||
<file>res/instruments/instrbassguitar.png</file>
|
||||
<file>res/instruments/instrclarinet.png</file>
|
||||
<file>res/instruments/instrdrumset.png</file>
|
||||
<file>res/instruments/instreguitar.png</file>
|
||||
<file>res/instruments/instrsaxophone.png</file>
|
||||
<file>res/instruments/instrtrumpet.png</file>
|
||||
<file>res/instruments/instrmicrophone.png</file>
|
||||
<file>res/instruments/instrkeyboard.png</file>
|
||||
<file>res/instruments/instrviolin.png</file>
|
||||
<file>res/instruments/instraguitar.png</file>
|
||||
<file>res/instruments/instrflute.png</file>
|
||||
<file>res/instruments/instraccordeon.png</file>
|
||||
<file>res/instruments/instrcello.png</file>
|
||||
<file>res/instruments/instrtrombone.png</file>
|
||||
<file>res/instruments/instrfrenchhorn.png</file>
|
||||
<file>res/instruments/instrtuba.png</file>
|
||||
<file>res/instruments/instrdoublebass.png</file>
|
||||
<file>res/instruments/instrgrandpiano.png</file>
|
||||
<file>res/instruments/instrsynthesizer.png</file>
|
||||
<file>res/instruments/instrvocal.png</file>
|
||||
<file>res/instruments/instrdjembe.png</file>
|
||||
<file>res/instruments/instrharmonica.png</file>
|
||||
<file>res/instruments/instrrecorder.png</file>
|
||||
<file>res/instruments/instrlistener.png</file>
|
||||
<file>res/instruments/instrstreamer.png</file>
|
||||
<file>res/instruments/instrguitarvocal.png</file>
|
||||
<file>res/instruments/instrkeyboardvocal.png</file>
|
||||
<file>res/instruments/none.png</file>
|
||||
<file>res/instruments/bassguitar.png</file>
|
||||
<file>res/instruments/clarinet.png</file>
|
||||
<file>res/instruments/drumset.png</file>
|
||||
<file>res/instruments/eguitar.png</file>
|
||||
<file>res/instruments/saxophone.png</file>
|
||||
<file>res/instruments/trumpet.png</file>
|
||||
<file>res/instruments/microphone.png</file>
|
||||
<file>res/instruments/keyboard.png</file>
|
||||
<file>res/instruments/violin.png</file>
|
||||
<file>res/instruments/aguitar.png</file>
|
||||
<file>res/instruments/flute.png</file>
|
||||
<file>res/instruments/accordeon.png</file>
|
||||
<file>res/instruments/cello.png</file>
|
||||
<file>res/instruments/trombone.png</file>
|
||||
<file>res/instruments/frenchhorn.png</file>
|
||||
<file>res/instruments/tuba.png</file>
|
||||
<file>res/instruments/doublebass.png</file>
|
||||
<file>res/instruments/grandpiano.png</file>
|
||||
<file>res/instruments/synthesizer.png</file>
|
||||
<file>res/instruments/vocal.png</file>
|
||||
<file>res/instruments/djembe.png</file>
|
||||
<file>res/instruments/harmonica.png</file>
|
||||
<file>res/instruments/recorder.png</file>
|
||||
<file>res/instruments/listener.png</file>
|
||||
<file>res/instruments/streamer.png</file>
|
||||
<file>res/instruments/guitarvocal.png</file>
|
||||
<file>res/instruments/keyboardvocal.png</file>
|
||||
<file>res/instruments/bodhran.png</file>
|
||||
<file>res/instruments/bassoon.png</file>
|
||||
<file>res/instruments/oboe.png</file>
|
||||
|
|
56
src/util.cpp
|
@ -972,34 +972,34 @@ CVector<CInstPictures::CInstPictProps>& 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 ) );
|
||||
|
|