Merge pull request #283 from atsampson/banjolin

Add banjo and mandolin as instruments
This commit is contained in:
Volker Fischer 2020-05-25 17:29:41 +02:00 committed by GitHub
commit 980dda7a96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 66 additions and 0 deletions

View file

@ -703,6 +703,8 @@ DISTFILES += ChangeLog \
src/res/instruments/vocaltenor.png \ src/res/instruments/vocaltenor.png \
src/res/instruments/vocalalto.png \ src/res/instruments/vocalalto.png \
src/res/instruments/vocalsoprano.png \ src/res/instruments/vocalsoprano.png \
src/res/instruments/banjo.png \
src/res/instruments/mandolin.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 \

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View file

@ -2025,6 +2025,16 @@
<source>Vocal Soprano</source> <source>Vocal Soprano</source>
<translation>Gesang Sopran</translation> <translation>Gesang Sopran</translation>
</message> </message>
<message>
<location filename="../../util.cpp" line="1018"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1019"/>
<source>Mandolin</source>
<translation>Mandoline</translation>
</message>
</context> </context>
<context> <context>
<name>CServerDlg</name> <name>CServerDlg</name>

View file

@ -2033,6 +2033,16 @@
<source>Vocal Soprano</source> <source>Vocal Soprano</source>
<translation>Voz Soprano</translation> <translation>Voz Soprano</translation>
</message> </message>
<message>
<location filename="../../util.cpp" line="1018"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1019"/>
<source>Mandolin</source>
<translation>Mandolina</translation>
</message>
</context> </context>
<context> <context>
<name>CServerDlg</name> <name>CServerDlg</name>

View file

@ -2045,6 +2045,16 @@
<source>Vocal Soprano</source> <source>Vocal Soprano</source>
<translation>Voix soprano</translation> <translation>Voix soprano</translation>
</message> </message>
<message>
<location filename="../../util.cpp" line="1018"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1019"/>
<source>Mandolin</source>
<translation>Mandoline</translation>
</message>
</context> </context>
<context> <context>
<name>CServerDlg</name> <name>CServerDlg</name>

View file

@ -2013,6 +2013,16 @@
<source>Vocal Soprano</source> <source>Vocal Soprano</source>
<translation>Voce Soprano</translation> <translation>Voce Soprano</translation>
</message> </message>
<message>
<location filename="../../util.cpp" line="1018"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1019"/>
<source>Mandolin</source>
<translation>Mandolino</translation>
</message>
</context> </context>
<context> <context>
<name>CServerDlg</name> <name>CServerDlg</name>

View file

@ -2017,6 +2017,16 @@
<source>Vocal Soprano</source> <source>Vocal Soprano</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="../../util.cpp" line="1018"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1019"/>
<source>Mandolin</source>
<translation>Mandoline</translation>
</message>
</context> </context>
<context> <context>
<name>CServerDlg</name> <name>CServerDlg</name>

View file

@ -2033,6 +2033,16 @@
<source>Vocal Soprano</source> <source>Vocal Soprano</source>
<translation>Voz Soprano</translation> <translation>Voz Soprano</translation>
</message> </message>
<message>
<location filename="../../util.cpp" line="1018"/>
<source>Banjo</source>
<translation>Banjo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1019"/>
<source>Mandolin</source>
<translation>Bandolim</translation>
</message>
</context> </context>
<context> <context>
<name>CServerDlg</name> <name>CServerDlg</name>

View file

@ -78,6 +78,8 @@
<file>res/instruments/vocaltenor.png</file> <file>res/instruments/vocaltenor.png</file>
<file>res/instruments/vocalalto.png</file> <file>res/instruments/vocalalto.png</file>
<file>res/instruments/vocalsoprano.png</file> <file>res/instruments/vocalsoprano.png</file>
<file>res/instruments/banjo.png</file>
<file>res/instruments/mandolin.png</file>
</qresource> </qresource>
<qresource prefix="/png/main"> <qresource prefix="/png/main">
<file>res/fronticon.png</file> <file>res/fronticon.png</file>

View file

@ -1015,6 +1015,8 @@ CVector<CInstPictures::CInstPictProps>& CInstPictures::GetTable()
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Tenor" ), ":/png/instr/res/instruments/vocaltenor.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 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 ) ); vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Soprano" ), ":/png/instr/res/instruments/vocalsoprano.png", IC_OTHER_INSTRUMENT ) );
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Banjo" ), ":/png/instr/res/instruments/banjo.png", IC_PLUCKING_INSTRUMENT ) );
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Mandolin" ), ":/png/instr/res/instruments/mandolin.png", IC_PLUCKING_INSTRUMENT ) );
// now the table is initialized // now the table is initialized
TableIsInitialized = true; TableIsInitialized = true;