From 641eaec426c11d725e8b6b4ee06bcf082212bb5a Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sun, 17 May 2020 18:12:03 +0200 Subject: [PATCH] added vocal bass/tenor/alto/soprano instrument icons created by Alberstein8 (Ticket #131) --- ChangeLog | 2 ++ Jamulus.pro | 4 ++++ src/res/instruments/vocalalto.png | Bin 0 -> 2141 bytes src/res/instruments/vocalbass.png | Bin 0 -> 2163 bytes src/res/instruments/vocalsoprano.png | Bin 0 -> 2196 bytes src/res/instruments/vocaltenor.png | Bin 0 -> 2174 bytes src/res/translation/translation_de_DE.ts | 20 ++++++++++++++++++++ src/res/translation/translation_es_ES.ts | 20 ++++++++++++++++++++ src/res/translation/translation_fr_FR.ts | 20 ++++++++++++++++++++ src/res/translation/translation_nl_NL.ts | 20 ++++++++++++++++++++ src/res/translation/translation_pt_PT.ts | 20 ++++++++++++++++++++ src/resources.qrc | 4 ++++ src/util.cpp | 4 ++++ 13 files changed, 114 insertions(+) create mode 100644 src/res/instruments/vocalalto.png create mode 100644 src/res/instruments/vocalbass.png create mode 100644 src/res/instruments/vocalsoprano.png create mode 100644 src/res/instruments/vocaltenor.png diff --git a/ChangeLog b/ChangeLog index d65d8403..c69de128 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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) diff --git a/Jamulus.pro b/Jamulus.pro index 2884dcba..66da708f 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -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 \ diff --git a/src/res/instruments/vocalalto.png b/src/res/instruments/vocalalto.png new file mode 100644 index 0000000000000000000000000000000000000000..3497f76e76d89eeea2476333fc2270f7f75d384b GIT binary patch literal 2141 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 literal 0 HcmV?d00001 diff --git a/src/res/instruments/vocalsoprano.png b/src/res/instruments/vocalsoprano.png new file mode 100644 index 0000000000000000000000000000000000000000..36e6dfe8983b8fe988404b71a05e08b88a2c737d GIT binary patch literal 2196 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 AEC2ui literal 0 HcmV?d00001 diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts index c1327efc..87c5608d 100644 --- a/src/res/translation/translation_de_DE.ts +++ b/src/res/translation/translation_de_DE.ts @@ -1920,6 +1920,26 @@ Bongo Bongos + + + Vocal Bass + + + + + Vocal Tenor + + + + + Vocal Alto + + + + + Vocal Soprano + + CServerDlg diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts index ca6ddcf9..79c75f2c 100644 --- a/src/res/translation/translation_es_ES.ts +++ b/src/res/translation/translation_es_ES.ts @@ -1928,6 +1928,26 @@ Bongo Bongo + + + Vocal Bass + + + + + Vocal Tenor + + + + + Vocal Alto + + + + + Vocal Soprano + + CServerDlg diff --git a/src/res/translation/translation_fr_FR.ts b/src/res/translation/translation_fr_FR.ts index 2b615c79..a2a9fd20 100644 --- a/src/res/translation/translation_fr_FR.ts +++ b/src/res/translation/translation_fr_FR.ts @@ -1932,6 +1932,26 @@ Bongo Bongo + + + Vocal Bass + + + + + Vocal Tenor + + + + + Vocal Alto + + + + + Vocal Soprano + + CServerDlg diff --git a/src/res/translation/translation_nl_NL.ts b/src/res/translation/translation_nl_NL.ts index 1f2be105..af3280b9 100644 --- a/src/res/translation/translation_nl_NL.ts +++ b/src/res/translation/translation_nl_NL.ts @@ -1920,6 +1920,26 @@ Bongo Bongo + + + Vocal Bass + + + + + Vocal Tenor + + + + + Vocal Alto + + + + + Vocal Soprano + + CServerDlg diff --git a/src/res/translation/translation_pt_PT.ts b/src/res/translation/translation_pt_PT.ts index 7e0ad142..5a1fe26d 100644 --- a/src/res/translation/translation_pt_PT.ts +++ b/src/res/translation/translation_pt_PT.ts @@ -1932,6 +1932,26 @@ Bongo Bongo + + + Vocal Bass + + + + + Vocal Tenor + + + + + Vocal Alto + + + + + Vocal Soprano + + CServerDlg diff --git a/src/resources.qrc b/src/resources.qrc index a60fac09..c10bebbc 100755 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -71,6 +71,10 @@ res/instruments/viola.png res/instruments/congas.png res/instruments/bongo.png + res/instruments/vocalbass.png + res/instruments/vocaltenor.png + res/instruments/vocalalto.png + res/instruments/vocalsoprano.png res/fronticon.png diff --git a/src/util.cpp b/src/util.cpp index abccb739..3dfcfc01 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -1007,6 +1007,10 @@ CVector& 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;