eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

added instrument icon, created by dszgit (Ticket #131)

Browse source
This commit is contained in:
Volker Fischer 2020-05-02 08:45:29 +02:00
parent d5892f3748
commit a95038bf13
6 changed files with 287 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -8,7 +8,7 @@
* for CoreAudio and 4 channel input, support mixing channels 1&2 with 3&4 * 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) * link to docs from application Help menu (Ticket #90)

2
Jamulus.pro
View file

@ -565,6 +565,8 @@ DISTFILES += ChangeLog \
src/res/instruments/bodhran.png \ src/res/instruments/bodhran.png \
src/res/instruments/bassoon.svg \ src/res/instruments/bassoon.svg \
src/res/instruments/bassoon.png \ src/res/instruments/bassoon.png \
src/res/instruments/oboe.svg \
src/res/instruments/oboe.png \
src/res/flags/flagnone.png \ src/res/flags/flagnone.png \
src/res/flags/ad.png \ src/res/flags/ad.png \
src/res/flags/ae.png \ src/res/flags/ae.png \

BIN
src/res/instruments/oboe.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 840 B

282
src/res/instruments/oboe.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 24 KiB

1
src/resources.qrc
View file

@ -51,6 +51,7 @@
<file>res/instruments/instrkeyboardvocal.png</file> <file>res/instruments/instrkeyboardvocal.png</file>
<file>res/instruments/bodhran.png</file> <file>res/instruments/bodhran.png</file>
<file>res/instruments/bassoon.png</file> <file>res/instruments/bassoon.png</file>
<file>res/instruments/oboe.png</file>
</qresource> </qresource>
<qresource prefix="/png/main"> <qresource prefix="/png/main">
<file>res/fronticon.png</file> <file>res/fronticon.png</file>

1
src/util.cpp
View file

@ -969,6 +969,7 @@ CVector<CInstPictures::CInstPictProps>& CInstPictures::GetTable()
vecDataBase.Add ( CInstPictProps ( "Keyboard+Vocal", ":/png/instr/res/instruments/instrkeyboardvocal.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 ( "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 ( "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 // now the table is initialized
TableIsInitialized = true; TableIsInitialized = true;