From d908bf13633a57c0a1981849ae300657c86aa2e6 Mon Sep 17 00:00:00 2001 From: Adam Sampson Date: Mon, 25 May 2020 01:44:14 +0100 Subject: [PATCH] Add banjo and mandolin as instruments. The icons banjo.png and mandolin.png are based on photos I took myself, and are available under CC0 as well as Jamulus's normal license. --- Jamulus.pro | 2 ++ src/res/instruments/banjo.png | Bin 0 -> 11193 bytes src/res/instruments/mandolin.png | Bin 0 -> 11750 bytes src/res/translation/translation_de_DE.ts | 10 ++++++++++ src/res/translation/translation_es_ES.ts | 10 ++++++++++ src/res/translation/translation_fr_FR.ts | 10 ++++++++++ src/res/translation/translation_it_IT.ts | 10 ++++++++++ src/res/translation/translation_nl_NL.ts | 10 ++++++++++ src/res/translation/translation_pt_PT.ts | 10 ++++++++++ src/resources.qrc | 2 ++ src/util.cpp | 2 ++ 11 files changed, 66 insertions(+) create mode 100644 src/res/instruments/banjo.png create mode 100644 src/res/instruments/mandolin.png diff --git a/Jamulus.pro b/Jamulus.pro index 70aaa9ac..bbd4292a 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -703,6 +703,8 @@ DISTFILES += ChangeLog \ src/res/instruments/vocaltenor.png \ src/res/instruments/vocalalto.png \ src/res/instruments/vocalsoprano.png \ + src/res/instruments/banjo.png \ + src/res/instruments/mandolin.png \ src/res/flags/flagnone.png \ src/res/flags/ad.png \ src/res/flags/ae.png \ diff --git a/src/res/instruments/banjo.png b/src/res/instruments/banjo.png new file mode 100644 index 0000000000000000000000000000000000000000..570ba9f18073bd974ff0883eb1bf2dec0eb9fc24 GIT binary patch literal 11193 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 Soprano Gesang Sopran + + + Banjo + Banjo + + + + Mandolin + Mandoline + CServerDlg diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts index 702ab554..f2abeebb 100644 --- a/src/res/translation/translation_es_ES.ts +++ b/src/res/translation/translation_es_ES.ts @@ -2033,6 +2033,16 @@ Vocal Soprano Voz Soprano + + + Banjo + Banjo + + + + Mandolin + Mandolina + CServerDlg diff --git a/src/res/translation/translation_fr_FR.ts b/src/res/translation/translation_fr_FR.ts index dbdababb..37f1c531 100644 --- a/src/res/translation/translation_fr_FR.ts +++ b/src/res/translation/translation_fr_FR.ts @@ -2045,6 +2045,16 @@ Vocal Soprano Voix soprano + + + Banjo + Banjo + + + + Mandolin + Mandoline + CServerDlg diff --git a/src/res/translation/translation_it_IT.ts b/src/res/translation/translation_it_IT.ts index e96939ef..c8c28aa8 100644 --- a/src/res/translation/translation_it_IT.ts +++ b/src/res/translation/translation_it_IT.ts @@ -2013,6 +2013,16 @@ Vocal Soprano Voce Soprano + + + Banjo + Banjo + + + + Mandolin + Mandolino + CServerDlg diff --git a/src/res/translation/translation_nl_NL.ts b/src/res/translation/translation_nl_NL.ts index e5a670a2..a12404bc 100644 --- a/src/res/translation/translation_nl_NL.ts +++ b/src/res/translation/translation_nl_NL.ts @@ -2017,6 +2017,16 @@ Vocal Soprano + + + Banjo + Banjo + + + + Mandolin + Mandoline + CServerDlg diff --git a/src/res/translation/translation_pt_PT.ts b/src/res/translation/translation_pt_PT.ts index 13c8288a..46b3d490 100644 --- a/src/res/translation/translation_pt_PT.ts +++ b/src/res/translation/translation_pt_PT.ts @@ -2033,6 +2033,16 @@ Vocal Soprano Voz Soprano + + + Banjo + Banjo + + + + Mandolin + Bandolim + CServerDlg diff --git a/src/resources.qrc b/src/resources.qrc index c07bacd4..1e4b78c2 100755 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -78,6 +78,8 @@ res/instruments/vocaltenor.png res/instruments/vocalalto.png res/instruments/vocalsoprano.png + res/instruments/banjo.png + res/instruments/mandolin.png res/fronticon.png diff --git a/src/util.cpp b/src/util.cpp index 68fe8a1c..ce17d6ab 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -1015,6 +1015,8 @@ CVector& 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 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", "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 TableIsInitialized = true;