diff --git a/ChangeLog b/ChangeLog index 6f5be6db..cfacfab6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,7 @@ - for CoreAudio and 4 channel input, support mixing channels 1&2 with 3&4 -- added bassoon/oboe/harp instrument icons, created by dszgit (Ticket #131) +- added bassoon/oboe/harp instrument icons created by dszgit; congas created by bspeer (Ticket #131) - link to docs from application Help menu (Ticket #90) diff --git a/Jamulus.pro b/Jamulus.pro index 739fb72b..90a2a3d6 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -578,6 +578,8 @@ DISTFILES += ChangeLog \ src/res/instruments/harp.svg \ src/res/instruments/harp.png \ src/res/instruments/viola.png \ + src/res/instruments/congas.svg \ + src/res/instruments/congas.png \ src/res/flags/flagnone.png \ src/res/flags/ad.png \ src/res/flags/ae.png \ diff --git a/src/res/instruments/congas.png b/src/res/instruments/congas.png new file mode 100644 index 00000000..48f696ef Binary files /dev/null and b/src/res/instruments/congas.png differ diff --git a/src/res/instruments/congas.svg b/src/res/instruments/congas.svg new file mode 100644 index 00000000..db68fdf0 --- /dev/null +++ b/src/res/instruments/congas.svg @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/resources.qrc b/src/resources.qrc index ab3535f1..2c9c8476 100755 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -66,6 +66,7 @@ res/instruments/oboe.png res/instruments/harp.png res/instruments/viola.png + res/instruments/congas.png res/fronticon.png diff --git a/src/util.cpp b/src/util.cpp index ec2a90ff..16270982 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -989,6 +989,7 @@ CVector& CInstPictures::GetTable() 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 ) ); vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Viola" ), ":/png/instr/res/instruments/viola.png", IC_STRING_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Congas" ), ":/png/instr/res/instruments/congas.png", IC_PERCUSSION_INSTRUMENT ) ); // now the table is initialized TableIsInitialized = true;