From 72302ae6a0dc820334bd1a965276dae03d631599 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sun, 3 May 2020 19:59:59 +0200 Subject: [PATCH] added instrument viola (Ticket #131) --- Jamulus.pro | 1 + src/res/instruments/viola.png | Bin 0 -> 8776 bytes src/resources.qrc | 1 + src/util.cpp | 1 + 4 files changed, 3 insertions(+) create mode 100644 src/res/instruments/viola.png diff --git a/Jamulus.pro b/Jamulus.pro index a83033ee..2745893d 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -575,6 +575,7 @@ DISTFILES += ChangeLog \ src/res/instruments/oboe.png \ src/res/instruments/harp.svg \ src/res/instruments/harp.png \ + src/res/instruments/viola.png \ src/res/flags/flagnone.png \ src/res/flags/ad.png \ src/res/flags/ae.png \ diff --git a/src/res/instruments/viola.png b/src/res/instruments/viola.png new file mode 100644 index 0000000000000000000000000000000000000000..388c55583bef4dfe79fd36e8cec8df9b24926690 GIT binary patch literal 8776 zcmV-OBDdX%P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3;ua%;DCh5us|83OudIA}JiGJ_01-vX&?``Y#L zQi_3?|b2| zue-3mZ$w^7Jf_dDy?$ReUXOoVpzrT>Ca;%2U1-?%jrG?z=J!Iee{b-8{pUt0d~V>s z7k2Y|p%lM&&Y$1cXIj3F-u^s={r&v?zW>6&Kc^o#wOC6HE%P%+-&!3!@6qQ*+>Qpi z&i4BD>~nJK7Qi*ufP7) z$lcG-zbXGqO6UCNRR4PRr%byS(4RNbZyBn;9{=(6Q2uz`{W+yCZ-2UTt-tR4m)FPq z3C16pb3f_3_w;-1GrO59Q?B1h{Y>RO<8w>VdVf{@ zLL`kh^R0zI*;zU_6uBc996v|u(&Idk5M#B9DwY&iT zeE=)?yLkDmq(?R+mlh!{a(Fd>lvUqdRP2H#?I zEd&DDNzi2IG3B^OODH8C1{rfomE_O`+?&5?;e9lg_<0#1BoQT5mm0aD5lL3gh5Bi^ zQ$w?)l1nMIw9?Bcv!<#JtF=`j>TIdyR$6VX^)}jcJ@wp6uf6r&N1r2(1mc!KKaM`e zn3J1Mt~~kc$p_|Kaix`4S#`D5*I08$x6{tM?7G|Td+d4QNryf@^|aH^IMaerN|voy zwPxLh%}c4>bn`8@-gf&P?#^FX3*WZ={ri8BweZbae3{Y*+pnzgYHL522!fNMoRP7Z z0|{@+Ku9h|<;?exb5!P(Ge06-Q6hsZO3n$&7#YkKV!7d0?*7PJajE|Q)hD{|j%$6!KE;&(^3nb64cl|CYv9niT*}sndW?Zc zS@e1ilx96n%js(3el<5*oRj2OtdxY%)mon*ZQO%Cvk^1V-8IGCQl5-EuF`fI_r`En zeHR8ns3YsKPO?G(>pgq=n{CFG z^0iAS$2}KdXlK@T@30daujIP=4Sq3+v_My0Xa#K0zh9-Ii93!nRBx(GtsM8t5ZxYFKEq zly+Cy!#Wo!skd#d-n?%Zvr(As8c!$;y1e#v_Ms~K-H{Zn;;5N3D%97^D3~}$v*Rhl zRR+N!MnH6KD-8JB%sn~kaVx|V=7<}jfol9l z4kR1dP7b5o64yjf@i!->0VQn;lPdP5&)mYuxmFj9#z1j~m1bS@B`X`q#bk>F8nBk) z1Qmd%lv}5ww;f<&jk7wBZBi6y$l6Flp|=_WxuD+w7=(tM2?bU^Xx0=8oZVs@bKHFd z9w*M7m(P2Jv{Ei;NCYvBIfn_U+Us->&swJR2!DwK@B(#L8fSaZlFTxoG{PbI%byMQ z-{fAHTQB8wTJeN>EEeY29|w4Zjkg3QCc5R5>~x7BEw}?=FN+{{3)TI5u=O56*6ce~ z48X3|4M=a9HfEN{8h`g}t4J`OK>sJ|Qw7X$`&qj4EEl+i=#W64vLDSfwH>oa= zHVh%y>eN=;T+}E@-_E=9p(H3bhNj}W9#j^(FO++R8e_yC&$G?=eY4NNQ1)hlls9smKo%_^>>+Xsy1p`ESc z)m*;*9IHKmmz#F0b_XS{;vZpc=0tEH(QF=4rie4qiNhYyay_Q0)KrH#;vleMuCS8F65j603N!T7HL-cA|28A>93>K6Q@uzFFdN?4Dw_ux(2wrGDIE+z1aufGgl`mcn| zeW;mRsg4@peh^|O#Zz2+AZ{0_Z_E_A0Qjj1>W(qOBuKpw!X32J5(M@da7VkYwE%>G zf?`-@(iUr`O|Ve`CtHo17a3@}d)YXK07F7rr(BHUrQ@ZmPDbo7c&KXAp_Cozu$Y9| z06F6a9tNW%GWP=ehv)POv3tN5;Yc*5G?@^NfU7l;7OGF4pg3JS%ne>fRKm-%#zgz< zitIi_B0-%V83CuBl?RvEub1*7z-X2N-Xjfa^v?XM9!OdI-Dt&bXbWARs0ZYN=dRv9 zqe^hQn67k6m>>oUf%+>@f}hpdS*kq{gnC5(Len532eqHF&0}RnbP3mk_33eeJV=9oqZ$c+Z830Af;9Sg=QeKWskrDoQVbXgE zy+|y+Y7JBnLs%$AO8jOIx2Reteuw~6D&SN@#dL_uQN+xrVG@8BaKR(0AVs>4`lM#5 z#I|8J1YLAu__@F|`J0OpatZE8i zr%Q2e5B97n4^7RX%ivWsljwQI+Ytf{ilmnegknS+RdQV4AX#k(b$6f+Y}=*RktNM% z!-3=DumoY7GpJ7>~PAU+b3c@F&0sEc@aMopZmL;p3gPQ~25 z_b|KoO;15!D8X|o8#+1ojJ9H=iw}x|*;l;E(%%evbVJ#|)r5AIYJcKIBOju&h7?za zpNY#3m7p1_%Wx->@EGZGR}}3&@deXTDs3Xjf^5S;=}-D`g;OwqW(90bJwnGt9V7P_ zAl8OXJWw#ygEM{Q>bME5NTil1AR2{ALJ&!jU^1%#aWANbq75WT+>OSiSCJ9{kU(0T zg5Gq0(|0E)^9*={62O=&2+cI`GgzLDP9`b`MSAsFta8*k6~?b&K7I)C1e_#L{tHdKTL{0dpmAM0|SIRQOHw?%?*fhwYd2y zH@5|kD4O0WWZs=zbn(X{AQ%xAx$y-i)X@xz##B`;iBX5}0|G#vIxYYib}Fb^ydxde zs(6j$l2<&g94x>bkgeD^sJnEGCLKL$EC3|4Kri$hW@oD5LXb=m!_#qf7rsJYmnIMU zeGbo)H2LqU{IBwf4JN{%4U|5#NLtX@fSgq z2#JzyQ7h$I!jQ}OSmd$Wv$nAI`K;Jz(e}Px3q>u)kRT%&CVIIXgzIRb(N7>FllhOsge7$VW@tMAJ1DlqkQ z*@zHi7V;CxWmpZ|I9&mALA5lY;|h{E7$jyD(c|8TB16&s>dklw9K<+uI5zB~u;B-i zI*%^^*SkA#>@3Tzrct8cLm-bxY$_GH9QXOr`?Tyn)#C^O6M1W`LLM#p=6tlva;a=v z!B?%YANdrh7@h$fK;zqAWFWD+nEvkcogedhVogq`zE&dBwi})5Qj^2&{B~5yOB%dV?8WkB0>Bn$Q zHj4(Mh5Dw6V$s&&j2}^_{mZmJ;swkw^!R-B7)0&CeEClw{nN@8_CMq(3z}*eg7U%}tC6?r* zNKe4QwEmH5rWFd&gdkDZT#^(su%msuO9JU9(xMGfEs{|^2=|f>$)vQhTycOTJc7ey zdtnhnGJIFhJj0kFWA%%c?7;;s1zh>07-?5Jj>17o4K2morZrR)u-0M%7lN51{Y&N3 zEg6twgs8p42*@}n0pf2kVGZ0PZJL@7i@9`!3YQn6a>eC}mP%fJ0yu8nKWHCGCJ^gh zYz7MfBd3k6J5ix{%EP4Vj^Yr0;EhXlz1DoTr#DK>xDFZvAEbiD4Qr+B;qnMox*Vx} z(&v>}AR+)YQ#L4^>Td89RRoCV#nYUvoAN@ya3-yGpdtorR-2zFSamnXf`X3Vm8`+i zn$5m0BH{5LVe=;bFLm_nA@fsBKWf3oLad17s@15t))yXos1IT$)b(jvE!k79L?j9z z{9CJz1x!E=XeB_~7A1~`$E_0OTV;Sx;bPie>u-%JIn+jsgw78y4PmfZ_L{w+h^Z+; zll@Rbz}V@jv(F9{wLK@@gbgjD57*B-3?aw@gY4xGCp7Dj^oL%NIZ`lDHN2|?4R*&0 z29gh$khlb$t%2v^cj3!PhPHUCv{SH(@5Of@7(o(@SWE|!8PJC0;0j@lkNzKX&`M5= zR9Bk9v=IjC5gYCU-cfHWr8u>|K3vI}rLlk*v)SAm-B5hDQc zDFqNX@&*Q!P;0G%qP1iSfbxbei!}220tiy^Wz7(?R5p<2-;NrE4N3sJv^||73DT%A z3>w~sS!Yym#noP|QTB*QflsL(M^*7h^=U|K9Wescp1Gp7y{Tf7eRmu|@xjBGXpRh# z%8t-Ok4v4FpJ3UOk|JdoLP`#SfFk1;FsF-jVOoqZ${uhfYQ*yta160p)2#HK7Fk+D zNYi}uI$DVA7@~e44^b~0F?Ln6O~~`wxhFZ!hnnZJ2EMf%h(5xXeD@WWmPB!c_~m=F z8jjedMvHK8?28cqasZ~45l|A&Ku>S5Fvuu^ly^e821Mot=8p~#<=j_93-c8}2WF(L z-mZp<&1BlOUke(dw3__dj-QocrVa`1{3KRnVjt1Tjgq7uy4o6_nTQsw48{^B0Kmsv z;2RJm(+G0rO(Q}8sIc$^Y14ESz=fr#zYH-pozb8(!e`qC`Gk)uOaNUR9PR93eGrMl zJkKlD5mG{%uNc6oiQU0eX2G}!C4dTWRV$1RH{5BG;s6|g0igx%bRQvq<_~{o zK^u6=pHd!g@q&QsqQkT*PZr-S2Z3FoW`}@e8gyAol88us02ZOh*sIp?CV$c>oUJ{? zrXA-QpZe?EI7>7>gNt9&`Y9TIf)-o!iWZ;*_FHW&Nm~y;@+N=ejr0NZcXcSCXlX9P zuK0dPaA_M>(Et4a3BTdOPg&V zf_VZuN!FX+7Jc7n@BEfB8S9XHI?Ewf&fq`o@NRrb((WN0n_;X1A_5lL1aB7K$rH$w zp1$d`r|RWZNDZHG>FpGwSfn@8rC_d(Dje~0?X4~1aHF-K>ReG+{fwFo!VTW;^+8QDM z(Ahvd67IKmihlKdI{Mj4@KGdk=j-c~W^AWQlc~yx>we2BQ zDlZmTcNcDQuD1PlTxgRV|r z^+FQ$hyXolJCa1J_2|b4;HHZ%nIv_Ni4pvOsYt@KsqfJLaaA0J{>j_f$Jy}4+ z-il+PuBn54$lg9$wU!uKZi~yd0IOA+;xwHsFaWi{Qoe*51z3oGM9auc%!R@abf=^f zI+6L>EYnGsXk}5G?%JZ<1D?|EGpMd*dFX!zEnj?u8+ag9gof6yCuKZOppTP7h6LyZ zChY+wLEI}N$Q13;YOj`#wKW7MUP&u$y&61SpU9&aul5J&Ux(DKGw<8pF0-6v2*e&_ z%{?$7^RxgZN7HWNkE=)Eea5++IxNJa`^S?sw%&;&W))bma zsnBUztI-71f6j_1Yd8(40cz5P#Ba&zARZhIhovK%i`0(|=NeDM-D6WCEJ6un*c%a} zjokUT6AaX;7#JuXD#y_V$dcFw$%C2ne*{eJwximqEvjS!uw_&XqL#wYW?K9Jc;2zO z<}ukCy$+!C20mRhXw=~y>Tb#ISbcOjq;|Ec@MpC<|EhLP%ZNxnnu|{CU0ZyMp3{?* zs&+Ur?K)+SOSq}i%0MwpS(v_#pX*2o!tc?P&S$@8{?{Xa1j6GJm(P+xjQnVR^$q>{-~Ol7JV@gTy6pA z9Rwzm7(i`|fUD=AUDWb2hVkfl$H~<}MDfLzwm_d5n9@>te`Y~-MH51_O;u$Bnm^-j8D zZf}9`+<6<{T1X~$=HJHmTVXggp?eAqg1rHXXt;xAuAz!#?pygH(KI$`$&?$uP`B| z-|7@94*oC;9RdPim><-FrXC{W2CxC1ExffNe7+f8$V)Bjz$D@b1)8+fs7kd()RN6> zfRT1<=tiSsdro^h`7SfPa4;ia#S<>&EsXTHK5_vM%(7NAvW|$=tRtFQhQTCybaeI| z5rHT|r$diD)lqA@Lbq$-5E{BTOcR=%4H+c@RaIT~3BxL(@PwdxJ^!>EVM4_FDYTT?U}g zT^UV<&d})uc?X!m41F};sCubf*6DDUmhmiaZHn*msOJ_ql}5F+^uLMB@dU(bB3Fs* zt>sk@uWFa5LLJ4?y{ilixK5@B>bp)=!QDDA`Hn8%@;NDr)8AFjk@)@XD3N#HCvREX z{WqjV*dO%iH?{x(00v@9M??Vs0RI60puMM)00009a7bBm000ie000ie0hKEb8vps0}(S0m19!c0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht z7XSbRT1iAfR5;6>RBLP$RTw?@&TD7((cSJ0yDZx+O$`MqNP`FhCMdBOpcSDF!6rsY z@SUQ@h(P=!BF}(P5fs7?G?*B*34bs#KAKQ$&|rW-YpYOc?Q3^C+jh6R^VqrmXtWdx zTJF#9=A4{!&vy^OB+sJ7_oMmjF93iIYt|{+z`5#>*LR(pEKyfyHvk}@6+V~C4lXsi zyN;-mGs5F8j>oH1P{s(&@2_cOwYJCDAqI6|?oq+M2mqFt8Q?{iW(1Z!?OBa0Dx@^ zB5M5{wU}+0D@LQ?MUpH%BT4c}QBqn6A=vxgfzbeNCi(98b}Zkx6I-jxg%XdtjJNFd zoIpcY^z6BYKN2h4{=!nl{QbQ)}9!GhuFB+_-pA*l32f| zcCicqJtOH`i5}ZD`oKkjSVcOXs_JWNM_(p~tAdXZuZCG9&1MM(3KZ97kKNtO~vQU;oy*<5e3}I4Q)+*2(3Ij?~uISpZP>X!Y10eR%W$|I<5fp9omFRq2#1 z@KzoL05ds}T(=ntoGg)ep|_|g^w|pyji-S|9D9BhDi>Bkov~o7S~g7gKI=7&k2%AF zWigg@KysA8%~QA(9{wo-WFVfBdFAE(=UO}e0bX!ZQ>&5?SQ2OPWD{PpT&vGuM8n)BI^Bj>B7jisLE>QuYaN#GjYo0hcsZx&> yPjiJLTBTnN98|+oJ`ab~)i>V%@Ws*FV*dvE9kIKLQXfG80000$7Zres/instruments/bassoon.png res/instruments/oboe.png res/instruments/harp.png + res/instruments/viola.png res/fronticon.png diff --git a/src/util.cpp b/src/util.cpp index 98a19a35..8839c288 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -989,6 +989,7 @@ CVector& CInstPictures::GetTable() 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 ) ); + vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Viola" ), ":/png/instr/res/instruments/viola.png", IC_STRING_INSTRUMENT ) ); // now the table is initialized TableIsInitialized = true;