From 1c4e3edda6ce68c1d42ab72404db328f02b658e8 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Fri, 8 May 2020 17:51:44 +0200 Subject: [PATCH] added congas instrument icon created by bspeer (Ticket #131) --- ChangeLog | 2 +- Jamulus.pro | 2 + src/res/instruments/congas.png | Bin 0 -> 2029 bytes src/res/instruments/congas.svg | 139 +++++++++++++++++++++++++++++++++ src/resources.qrc | 1 + src/util.cpp | 1 + 6 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 src/res/instruments/congas.png create mode 100644 src/res/instruments/congas.svg 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 0000000000000000000000000000000000000000..48f696efe15906d8eaa2aabf83acebdcf5560a10 GIT binary patch literal 2029 zcmVhGm=qN35gRighWHevkp7NDCIqQrdJ$nx+X!$kt}Lxi>fW+;iT?4|hodMG9x; znfu|q^WNY4d;jlpgirZw|LYUys*#%&E<|WVDF*sLUkKUoJzrRJ%Lt$0aXwAsSN`^! z+b}!}ECcF+BESVILC)*#YQ3!W;Bf!3_*mPg1#wTbVe^6oUp=({z5AL^Ut$oM_0CUE zF*?x2&NttS1&*!*S^&0fTkp!~+)ItsMG6&)q(tn11ZMXDRc&k5tO@dc$npMk+qU(t zGg4oR2DOSwl|-cPy0s6in^PKHyXyS;H47UXoM<#k#`EYK80N^qKHA0WvNo!75kzU-nui(_g&W^BU>8~u>`;Hs-`9V~$S`?;s;!hY~=MK4ELmeZbpGVknZ z-}%a)o?G6hYDQIO^>}7D%u)=^X^%|C-*`j+``^0xs+Aqrf8*LlV?JT_t&XJPBUd=8 zDqmhw_akGq1-Kk&1VSIqQvIB&Qztq*6tWFPQTbkJ2{l20W_;8S zytiwrHm4HFU(SuDO-X4fp=dE8$CZzY6z$%%^9tweSn{Vu6;%)Xzq|x~hJnt#v>s|B zrX^IWQW1@?@T7W9tE`fWM1mmW6J&fe2%;N$-~aiIXE`@*d}FwBZ1@OMV?!8k65pG| zn@ZxRQ=}4OBt{14Y2U-n-G{~9^5W~~UUOxXvZ^|aGtH9mQcO*ZksLe9_;43{4(y|C z$P%lrrC~fy@8l$%{rysL@;o+oc5-`NeQwlJwXv$I{F)1n>4+QVzul8;-`7f6aVzuY zguGap8_swRskCJx8PInu&75M{i=+K}sp5M!`@2GrNMHy{VQkMUN! z&(&un*n0ICzuS8Tnp0AOa#nU89_Yp>bhz6JE5Ri_bht`%s9E z-tgpT(u9*qLo($OEv@6;69>naV}!+_31Rk@(L8rN};#UkOFbjC+S5QK#des$NoA^y1CqkW%c>!Vpf z1qTHbn(EU8j>m1Al!sR0y2ZuCZfQEwv7|D&v~iAsGUc+B35F({IQR6p#pyRVU|k4Y zAr?!5DyX8WEUT@aNGB(25Xojlptvkk(cDnU{{8!S{5u9j^E*})6+BP4|I?X!T%mUSUg5)g8IR28*0w*pNLLO`S^ z9I@r66pe7#>S3Da<+jbNkx~@GF8u07L*L*SXVd`7xH)!oaHu^Uv&IJ}qhR6XH{hyU zM|tWW-BCI|SE58p1Grw%KWrFiP0b_n6s4RJIf{5`Zi4{O=(ao6bn!3f6^C z#J;FGBS2YUT0|1nJ*VteLu^G0y8Fje&v zn^5&NyLwzPSsRncu1k5vcQU-KW*PzkRgyEOB?n;*JTu$KgX|NZ7mTl22%9a1@w}1z z%BikTz4gyj>R?Me&P$_XY#SeE!{`{Brjp$N@-PExI6Nz;%mA?SM>fp%vfH>m!e93xWAs-io4?VrJ%qZdpSBt%reCAAik|*ATriyO}8hf#z)FKw6{g z`A@#R`N-YT(;s8;^Hv1HvoaErt`oUhiWBUZxoRw!nMNEdk4Qd+#{((9n>O+JLm?+Q z(}j#U961q?>f1P&4&-QI)d((DKm{AfaJ)2lW@dYHyiP)?;9e}rLQaGU92ktdY}#I4 zbV5c1{l#CZ`ww(S@?kAP;b3=!yPmG;oPQHjpLmO}y`2v>+*P{eOBW?>2$v|sBTnYc zcZ&G?zsl{k7f(ESqBsBEvB*~*+g#Z)y1`i#SSii;;zeCMm`JkrBj6v`$&!Wh?kFkN zpSU5)Lm|BRC#TyN&rkpChY!b}|12L+%?-^pUf4@?b#+Z0@BRM(`eJbTjBsg200000 LNkvXXu0mjfpkCcs literal 0 HcmV?d00001 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;