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

added vocal bass/tenor/alto/soprano instrument icons created by Alberstein8 (Ticket #131)

Browse source
This commit is contained in:
Volker Fischer 2020-05-17 18:12:03 +02:00
parent 1cfcbe09fc
commit 641eaec426
13 changed files with 114 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -10,6 +10,8 @@
- duplicate Central Server type dropdown to Connection Setup (#157)
- added vocal bass/tenor/alto/soprano instrument icons created by Alberstein8 (Ticket #131)
TODO implement panning for channels (Ticket #52, #145)

4
Jamulus.pro
View file

@ -719,6 +719,10 @@ DISTFILES += ChangeLog \
src/res/instruments/congas.png \
src/res/instruments/bongo.svg \
src/res/instruments/bongo.png \
src/res/instruments/vocalbass.png \
src/res/instruments/vocaltenor.png \
src/res/instruments/vocalalto.png \
src/res/instruments/vocalsoprano.png \
src/res/flags/flagnone.png \
src/res/flags/ad.png \
src/res/flags/ae.png \

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

20
src/res/translation/translation_de_DE.ts
View file

@ -1920,6 +1920,26 @@
<source>Bongo</source>
<translation>Bongos</translation>
</message>
<message>
<location filename="../../util.cpp" line="1010"/>
<source>Vocal Bass</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1011"/>
<source>Vocal Tenor</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1012"/>
<source>Vocal Alto</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1013"/>
<source>Vocal Soprano</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CServerDlg</name>

20
src/res/translation/translation_es_ES.ts
View file

@ -1928,6 +1928,26 @@
<source>Bongo</source>
<translation>Bongo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1010"/>
<source>Vocal Bass</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1011"/>
<source>Vocal Tenor</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1012"/>
<source>Vocal Alto</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1013"/>
<source>Vocal Soprano</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CServerDlg</name>

20
src/res/translation/translation_fr_FR.ts
View file

@ -1932,6 +1932,26 @@
<source>Bongo</source>
<translation>Bongo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1010"/>
<source>Vocal Bass</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1011"/>
<source>Vocal Tenor</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1012"/>
<source>Vocal Alto</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1013"/>
<source>Vocal Soprano</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CServerDlg</name>

20
src/res/translation/translation_nl_NL.ts
View file

@ -1920,6 +1920,26 @@
<source>Bongo</source>
<translation>Bongo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1010"/>
<source>Vocal Bass</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1011"/>
<source>Vocal Tenor</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1012"/>
<source>Vocal Alto</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1013"/>
<source>Vocal Soprano</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CServerDlg</name>

20
src/res/translation/translation_pt_PT.ts
View file

@ -1932,6 +1932,26 @@
<source>Bongo</source>
<translation>Bongo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1010"/>
<source>Vocal Bass</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1011"/>
<source>Vocal Tenor</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1012"/>
<source>Vocal Alto</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../util.cpp" line="1013"/>
<source>Vocal Soprano</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CServerDlg</name>

4
src/resources.qrc
View file

@ -71,6 +71,10 @@
<file>res/instruments/viola.png</file>
<file>res/instruments/congas.png</file>
<file>res/instruments/bongo.png</file>
<file>res/instruments/vocalbass.png</file>
<file>res/instruments/vocaltenor.png</file>
<file>res/instruments/vocalalto.png</file>
<file>res/instruments/vocalsoprano.png</file>
</qresource>
<qresource prefix="/png/main">
<file>res/fronticon.png</file>

4
src/util.cpp
View file

@ -1007,6 +1007,10 @@ CVector<CInstPictures::CInstPictProps>& CInstPictures::GetTable()
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 ) );
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Bongo" ), ":/png/instr/res/instruments/bongo.png", IC_PERCUSSION_INSTRUMENT ) );
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Bass" ), ":/png/instr/res/instruments/vocalbass.png", IC_OTHER_INSTRUMENT ) );
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Tenor" ), ":/png/instr/res/instruments/vocaltenor.png", IC_OTHER_INSTRUMENT ) );
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Alto" ), ":/png/instr/res/instruments/vocalalto.png", IC_OTHER_INSTRUMENT ) );
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Soprano" ), ":/png/instr/res/instruments/vocalsoprano.png", IC_OTHER_INSTRUMENT ) );
// now the table is initialized
TableIsInitialized = true;