From a95038bf13f14694db9ff4af27b93c95c865743c Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sat, 2 May 2020 08:45:29 +0200 Subject: [PATCH] added instrument icon, created by dszgit (Ticket #131) --- ChangeLog | 2 +- Jamulus.pro | 2 + src/res/instruments/oboe.png | Bin 0 -> 840 bytes src/res/instruments/oboe.svg | 282 +++++++++++++++++++++++++++++++++++ src/resources.qrc | 1 + src/util.cpp | 1 + 6 files changed, 287 insertions(+), 1 deletion(-) create mode 100644 src/res/instruments/oboe.png create mode 100644 src/res/instruments/oboe.svg diff --git a/ChangeLog b/ChangeLog index 5787f76a..ef0ace8e 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 instrument icon, created by dszgit (Ticket #131) + * added bassoon/oboe 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 7f8ba2cf..bb9b5920 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -565,6 +565,8 @@ DISTFILES += ChangeLog \ src/res/instruments/bodhran.png \ src/res/instruments/bassoon.svg \ src/res/instruments/bassoon.png \ + src/res/instruments/oboe.svg \ + src/res/instruments/oboe.png \ src/res/flags/flagnone.png \ src/res/flags/ad.png \ src/res/flags/ae.png \ diff --git a/src/res/instruments/oboe.png b/src/res/instruments/oboe.png new file mode 100644 index 0000000000000000000000000000000000000000..ab6e075a6957c0937df16397e06b525b1378fd27 GIT binary patch literal 840 zcmV-O1GoH%P)P000{Z1^@s6i6JCt00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliruvKasX02y>e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00OW{L_t(Y$F-JQNK0j){yvxwFwUCtQkE4P`tnt!6Z4+0KHen&@Nv;)uPD)}qY3(+ zLR~lF_Ph)7E&+hg3(nCaWx3@PqBoV9XD3#C)BZiT@NSpiLnEDedDOC6?ii}n-8#&B zBmm%Yfz?D4FSJFv_I;{I2gNkM@otWJ_dF-N(QzzCE66a8)3QS(lHPu&+L}MoeOl|` zC6b-`tb{iW3gILz;x5Z+uO-6h!&Bo=-}5Q~0LPDY-^qrqM8s{c7bRWh?1XE`;ol1J zDgl70x5Lu~TE#j^vKP{G&F2o1fNkE-FuY0tV9x2W7i(2CohE5a#8F#G=)q4L8^3v# z0Kk_e_v;#Skx`>J*ZE>UYYYn57QNy4p5|mXD%u`BPKcy4QnB=eRG!`6QVjaPTKHdF zEK$qS3>9MnN?66L`E2=PGp%<4mX~zxq|ML7^Mso(RXTGMP1vJL@~Fb$3BBS~0sspE zhEa09QIS~M77eW*H!5WrtwCmZ9N>790Khjt6VOYdE*4w^2rPcJ%u=M>S literal 0 HcmV?d00001 diff --git a/src/res/instruments/oboe.svg b/src/res/instruments/oboe.svg new file mode 100644 index 00000000..e00f40d5 --- /dev/null +++ b/src/res/instruments/oboe.svg @@ -0,0 +1,282 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/resources.qrc b/src/resources.qrc index 9601cbd1..a39279c1 100755 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -51,6 +51,7 @@ res/instruments/instrkeyboardvocal.png res/instruments/bodhran.png res/instruments/bassoon.png + res/instruments/oboe.png res/fronticon.png diff --git a/src/util.cpp b/src/util.cpp index d99c8387..201a124e 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -969,6 +969,7 @@ CVector& CInstPictures::GetTable() 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 ) ); // now the table is initialized TableIsInitialized = true;