From cd8e1cb6701f990155c011041d9d9f49cf07cec6 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sat, 2 May 2020 13:34:12 +0200 Subject: [PATCH] added harp instrument icon, created by dszgit (Ticket #131) --- ChangeLog | 2 +- Jamulus.pro | 2 + src/res/instruments/harp.png | Bin 0 -> 1169 bytes src/res/instruments/harp.svg | 465 +++++++++++++++++++++++++++++++++++ src/res/translation_de_DE.ts | 280 ++++++++++++++++----- src/res/translation_fr_FR.ts | 280 ++++++++++++++++----- src/resources.qrc | 1 + src/util.cpp | 63 ++--- 8 files changed, 935 insertions(+), 158 deletions(-) create mode 100644 src/res/instruments/harp.png create mode 100644 src/res/instruments/harp.svg diff --git a/ChangeLog b/ChangeLog index af9fb385..e5205f2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,7 +8,7 @@ * for CoreAudio and 4 channel input, support mixing channels 1&2 with 3&4 - * added bassoon/oboe instrument icons, created by dszgit (Ticket #131) + * added bassoon/oboe/harp instrument icons, created by dszgit (Ticket #131) * link to docs from application Help menu (Ticket #90) diff --git a/Jamulus.pro b/Jamulus.pro index bb9b5920..1b73e91e 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -567,6 +567,8 @@ DISTFILES += ChangeLog \ src/res/instruments/bassoon.png \ src/res/instruments/oboe.svg \ src/res/instruments/oboe.png \ + src/res/instruments/harp.svg \ + src/res/instruments/harp.png \ src/res/flags/flagnone.png \ src/res/flags/ad.png \ src/res/flags/ae.png \ diff --git a/src/res/instruments/harp.png b/src/res/instruments/harp.png new file mode 100644 index 0000000000000000000000000000000000000000..6b32f308afaf081f86d28a1820ee572020b521aa GIT binary patch literal 1169 zcmV;C1aA9@P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00a3+L_t(I%Z-#vXkAqlhX1wp zI``aL^J)`8bkO3UA|eKAg`z0<=pcfHqA0as6(cCrX+^ZAU=h@bRtxRGiI0KRNgZ_} zr4|uEL#4hIk!sT_+MClP_uO;#UcZBz2Qi7bM~e;X+iU-8tzQ7(;A40q8Fo3b9)h+y zPUns{_q~Pl_#a0OjN_;S<04C!?yZUv3P{QV%0FNnn>dW0)`BRa&9TZsS1=m9&IpWr zIK_t^_)~Xn@5rVzh>fofJdTOAAmOep8S3f5-6T6f!kkxGKC^Dy-Xwzt=w)wQf122E zN_p|%om;!NocsdsFC?vbm_GWi)0GK1$PtvW~S5N1=$4Xv% zI&$y>GVCERBt%Dh^3s_^02l-i;YI*X(p6PL2#pxybY0hjMRw2OOSbb~mqrf2_aDVR z?JrMs$^l}(Lt*Qegix^{`=eenB6p?Z$o_YyPro_*^?(|Bj00=+>z<|^w*$g3c z&8#URm&>vo05DTkRX=?8)_{tZJ+8NXqv^TJf+l9)pk`?8%TNxK@`O!idjJM>e8?Q$gKWc z1rQYl#1Tyf!kN3xtQL{JEX$@-N&`duY%`Ds6m_-#2wq$UQB5Zp5?Gm`4ulI#{vM4n zW--Rh%-qaia^VF7eu4W4~1U{1wx{?NN9RzMb(ciDQQ>@%~byIafX zM7mBfgIw{{zZcLJlZZqhP$;4VfTo$%A%srWJ@K+}HWT>FGe_{zN-J1^1TVoJ4Iz=y zGO{YFs_GA%-6rS)z{zwJs276Uw_sATWT90;vIq%jzQSQk?7Jh$&~U5O z+A%sh`s?K6 + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/res/translation_de_DE.ts b/src/res/translation_de_DE.ts index 157e0be3..d3763859 100644 --- a/src/res/translation_de_DE.ts +++ b/src/res/translation_de_DE.ts @@ -72,7 +72,7 @@ - + &OK @@ -153,22 +153,22 @@ - + MUTE - + SOLO - + Mute - + Solo @@ -406,32 +406,32 @@ - + C&onnect - + Pan - + Center - + Reverb - + Left - + Right @@ -946,17 +946,23 @@ CHelpMenu - + + + Getting &Started... + + + + + Software &Manual... + + + + What's &This - - &Download Link... - - - - + &About... @@ -1052,41 +1058,201 @@ CMusProfDlg - + <b>Musician Profile:</b> Set your name or an alias here so that the other musicians you want to play with know who you are. Additionally you may set an instrument picture of the instrument you play and a flag of the country you are living. The city you live in and the skill level of playing your instrument may also be added. What you set here will appear at your fader on the mixer board when you are connected to a - + server. This tag will also show up at each client which is connected to the same server as you. If the name is left empty, the IP address is shown instead. - + Alias or name edit box - + Instrument picture button - + Country flag button - + City edit box - + Skill level combo box + + + None + + + + + Drum Set + + + + + Djembe + + + + + Electric Guitar + + + + + Acoustic Guitar + + + + + Bass Guitar + + + + + Keyboard + + + + + Synthesizer + + + + + Grand Piano + + + + + Accordion + + + + + Vocal + + + + + Microphone + + + + + Harmonica + + + + + Trumpet + + + + + Trombone + + + + + French Horn + + + + + Tuba + + + + + Saxophone + + + + + Clarinet + + + + + Flute + + + + + Violin + + + + + Cello + + + + + Double Bass + + + + + Recorder + + + + + Streamer + + + + + Listener + + + + + Guitar+Vocal + + + + + Keyboard+Vocal + + + + + Bodhran + + + + + Bassoon + + + + + Oboe + + + + + Harp + + CServerDlg @@ -1112,7 +1278,7 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>Show Creative Commons Licence Dialog:</b> If enabled, a Creative Commons Licence dialog is shown each time a new user connects the server. + <b>Show Creative Commons Licence Dialog:</b> If enabled, a Creative Commons BY-NC-SA 4.0 Licence dialog is shown each time a new user connects the server. @@ -1234,7 +1400,7 @@ What you set here will appear at your fader on the mixer board when you are conn - Show Creative Commons Licence Dialog + Show Creative Commons BY-NC-SA 4.0 Licence Dialog @@ -1276,85 +1442,73 @@ What you set here will appear at your fader on the mixer board when you are conn CSound - + The Jack server is not running. This software requires a Jack server to run. Normally if the Jack server is not running this software will automatically start the Jack server. It seems that this auto start has not worked. Try to start the Jack server manually. - + The Jack server sample rate is different from the required one. The required sample rate is: <b> - + Hz</b>. You can use a tool like <i><a href=http://qjackctl.sourceforge.net>QJackCtl</a></i> to adjust the Jack server sample rate.<br>Make sure to set the <b>Frames/Period</b> to a low value like <b> - + </b> to achieve a low delay. - - + + The Jack port registering failed. - + Cannot activate the Jack client. - - - Cannot connect the Jack input ports - - - - - - Cannot connect the Jack output ports. - - - - + The Jack server was shut down. This software requires a Jack server to run. Try to restart the software to solve the issue. - + CoreAudio input AudioHardwareGetProperty call failed. It seems that no sound card is available in the system. - + CoreAudio output AudioHardwareGetProperty call failed. It seems that no sound card is available in the system. - + Current system audio input device sample rate of %1 Hz is not supported. Please open the Audio-MIDI-Setup in Applications->Utilities and try to set a sample rate of %2 Hz. - + Current system audio output device sample rate of %1 Hz is not supported. Please open the Audio-MIDI-Setup in Applications->Utilities and try to set a sample rate of %2 Hz. - + The audio input stream format for this audio device is not compatible with this software. - + The audio output stream format for this audio device is not compatible with this software. - + The buffer sizes of the current input and output audio device cannot be set to a common value. Please choose other input/output audio devices in your system settings. @@ -1395,12 +1549,12 @@ What you set here will appear at your fader on the mixer board when you are conn - + <b>No ASIO audio device (driver) found.</b><br><br>The - + software requires the low latency audio interface <b>ASIO</b> to work properly. This is no standard Windows audio interface and therefore a special audio driver is required. Either your sound card has a native ASIO driver (which is recommended) or you might want to use alternative drivers like the ASIO4All driver. @@ -1408,37 +1562,37 @@ What you set here will appear at your fader on the mixer board when you are conn CSoundBase - + Invalid device selection. - + The audio driver properties have changed to a state which is incompatible to this software. The selected audio device could not be used because of the following error: <b> - + </b><br><br>Please restart the software. - + <b>No usable - + audio device (driver) found.</b><br><br>In the following there is a list of all available drivers with the associated error message:<ul> - + <br/>Do you want to open the ASIO driver setups? - + could not be started because of audio interface issues. diff --git a/src/res/translation_fr_FR.ts b/src/res/translation_fr_FR.ts index 96aba445..e70f5247 100644 --- a/src/res/translation_fr_FR.ts +++ b/src/res/translation_fr_FR.ts @@ -72,7 +72,7 @@ - + &OK @@ -153,22 +153,22 @@ - + MUTE - + SOLO - + Mute - + Solo @@ -406,32 +406,32 @@ - + C&onnect - + Pan - + Center - + Reverb - + Left - + Right @@ -946,17 +946,23 @@ CHelpMenu - + + + Getting &Started... + + + + + Software &Manual... + + + + What's &This - - &Download Link... - - - - + &About... @@ -1052,41 +1058,201 @@ CMusProfDlg - + <b>Musician Profile:</b> Set your name or an alias here so that the other musicians you want to play with know who you are. Additionally you may set an instrument picture of the instrument you play and a flag of the country you are living. The city you live in and the skill level of playing your instrument may also be added. What you set here will appear at your fader on the mixer board when you are connected to a - + server. This tag will also show up at each client which is connected to the same server as you. If the name is left empty, the IP address is shown instead. - + Alias or name edit box - + Instrument picture button - + Country flag button - + City edit box - + Skill level combo box + + + None + + + + + Drum Set + + + + + Djembe + + + + + Electric Guitar + + + + + Acoustic Guitar + + + + + Bass Guitar + + + + + Keyboard + + + + + Synthesizer + + + + + Grand Piano + + + + + Accordion + + + + + Vocal + + + + + Microphone + + + + + Harmonica + + + + + Trumpet + + + + + Trombone + + + + + French Horn + + + + + Tuba + + + + + Saxophone + + + + + Clarinet + + + + + Flute + + + + + Violin + + + + + Cello + + + + + Double Bass + + + + + Recorder + + + + + Streamer + + + + + Listener + + + + + Guitar+Vocal + + + + + Keyboard+Vocal + + + + + Bodhran + + + + + Bassoon + + + + + Oboe + + + + + Harp + + CServerDlg @@ -1112,7 +1278,7 @@ What you set here will appear at your fader on the mixer board when you are conn - <b>Show Creative Commons Licence Dialog:</b> If enabled, a Creative Commons Licence dialog is shown each time a new user connects the server. + <b>Show Creative Commons Licence Dialog:</b> If enabled, a Creative Commons BY-NC-SA 4.0 Licence dialog is shown each time a new user connects the server. @@ -1234,7 +1400,7 @@ What you set here will appear at your fader on the mixer board when you are conn - Show Creative Commons Licence Dialog + Show Creative Commons BY-NC-SA 4.0 Licence Dialog @@ -1276,85 +1442,73 @@ What you set here will appear at your fader on the mixer board when you are conn CSound - + The Jack server is not running. This software requires a Jack server to run. Normally if the Jack server is not running this software will automatically start the Jack server. It seems that this auto start has not worked. Try to start the Jack server manually. - + The Jack server sample rate is different from the required one. The required sample rate is: <b> - + Hz</b>. You can use a tool like <i><a href=http://qjackctl.sourceforge.net>QJackCtl</a></i> to adjust the Jack server sample rate.<br>Make sure to set the <b>Frames/Period</b> to a low value like <b> - + </b> to achieve a low delay. - - + + The Jack port registering failed. - + Cannot activate the Jack client. - - - Cannot connect the Jack input ports - - - - - - Cannot connect the Jack output ports. - - - - + The Jack server was shut down. This software requires a Jack server to run. Try to restart the software to solve the issue. - + CoreAudio input AudioHardwareGetProperty call failed. It seems that no sound card is available in the system. - + CoreAudio output AudioHardwareGetProperty call failed. It seems that no sound card is available in the system. - + Current system audio input device sample rate of %1 Hz is not supported. Please open the Audio-MIDI-Setup in Applications->Utilities and try to set a sample rate of %2 Hz. - + Current system audio output device sample rate of %1 Hz is not supported. Please open the Audio-MIDI-Setup in Applications->Utilities and try to set a sample rate of %2 Hz. - + The audio input stream format for this audio device is not compatible with this software. - + The audio output stream format for this audio device is not compatible with this software. - + The buffer sizes of the current input and output audio device cannot be set to a common value. Please choose other input/output audio devices in your system settings. @@ -1395,12 +1549,12 @@ What you set here will appear at your fader on the mixer board when you are conn - + <b>No ASIO audio device (driver) found.</b><br><br>The - + software requires the low latency audio interface <b>ASIO</b> to work properly. This is no standard Windows audio interface and therefore a special audio driver is required. Either your sound card has a native ASIO driver (which is recommended) or you might want to use alternative drivers like the ASIO4All driver. @@ -1408,37 +1562,37 @@ What you set here will appear at your fader on the mixer board when you are conn CSoundBase - + Invalid device selection. - + The audio driver properties have changed to a state which is incompatible to this software. The selected audio device could not be used because of the following error: <b> - + </b><br><br>Please restart the software. - + <b>No usable - + audio device (driver) found.</b><br><br>In the following there is a list of all available drivers with the associated error message:<ul> - + <br/>Do you want to open the ASIO driver setups? - + could not be started because of audio interface issues. diff --git a/src/resources.qrc b/src/resources.qrc index a39279c1..80c33957 100755 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -52,6 +52,7 @@ res/instruments/bodhran.png res/instruments/bassoon.png res/instruments/oboe.png + res/instruments/harp.png res/fronticon.png diff --git a/src/util.cpp b/src/util.cpp index c3b3ec7f..98a19a35 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -957,37 +957,38 @@ 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 ( "None", ":/png/instr/res/instruments/instrnone.png", IC_OTHER_INSTRUMENT ) ); // special first element - vecDataBase.Add ( CInstPictProps ( "Drum Set", ":/png/instr/res/instruments/instrdrumset.png", IC_PERCUSSION_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Djembe", ":/png/instr/res/instruments/instrdjembe.png", IC_PERCUSSION_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Electric Guitar", ":/png/instr/res/instruments/instreguitar.png", IC_PLUCKING_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Acoustic Guitar", ":/png/instr/res/instruments/instraguitar.png", IC_PLUCKING_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Bass Guitar", ":/png/instr/res/instruments/instrbassguitar.png", IC_PLUCKING_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Keyboard", ":/png/instr/res/instruments/instrkeyboard.png", IC_KEYBOARD_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Synthesizer", ":/png/instr/res/instruments/instrsynthesizer.png", IC_KEYBOARD_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Grand Piano", ":/png/instr/res/instruments/instrgrandpiano.png", IC_KEYBOARD_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Accordion", ":/png/instr/res/instruments/instraccordeon.png", IC_KEYBOARD_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Vocal", ":/png/instr/res/instruments/instrvocal.png", IC_OTHER_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Microphone", ":/png/instr/res/instruments/instrmicrophone.png", IC_OTHER_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Harmonica", ":/png/instr/res/instruments/instrharmonica.png", IC_WIND_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Trumpet", ":/png/instr/res/instruments/instrtrumpet.png", IC_WIND_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Trombone", ":/png/instr/res/instruments/instrtrombone.png", IC_WIND_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "French Horn", ":/png/instr/res/instruments/instrfrenchhorn.png", IC_WIND_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Tuba", ":/png/instr/res/instruments/instrtuba.png", IC_WIND_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Saxophone", ":/png/instr/res/instruments/instrsaxophone.png", IC_WIND_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Clarinet", ":/png/instr/res/instruments/instrclarinet.png", IC_WIND_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Flute", ":/png/instr/res/instruments/instrflute.png", IC_WIND_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Violin", ":/png/instr/res/instruments/instrviolin.png", IC_STRING_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Cello", ":/png/instr/res/instruments/instrcello.png", IC_STRING_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Double Bass", ":/png/instr/res/instruments/instrdoublebass.png", IC_STRING_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Recorder", ":/png/instr/res/instruments/instrrecorder.png", IC_OTHER_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Streamer", ":/png/instr/res/instruments/instrstreamer.png", IC_OTHER_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Listener", ":/png/instr/res/instruments/instrlistener.png", IC_OTHER_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Guitar+Vocal", ":/png/instr/res/instruments/instrguitarvocal.png", IC_MULTIPLE_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Keyboard+Vocal", ":/png/instr/res/instruments/instrkeyboardvocal.png", IC_MULTIPLE_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Bodhran", ":/png/instr/res/instruments/bodhran.png", IC_PERCUSSION_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Bassoon", ":/png/instr/res/instruments/bassoon.png", IC_WIND_INSTRUMENT ) ); - vecDataBase.Add ( CInstPictProps ( "Oboe", ":/png/instr/res/instruments/oboe.png", IC_WIND_INSTRUMENT ) ); + 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", "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 ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Harp" ), ":/png/instr/res/instruments/harp.png", IC_STRING_INSTRUMENT ) ); // now the table is initialized TableIsInitialized = true;