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 00000000..3497f76e Binary files /dev/null and b/src/res/instruments/vocalalto.png differ diff --git a/src/res/instruments/vocalbass.png b/src/res/instruments/vocalbass.png new file mode 100644 index 00000000..3b8a929d Binary files /dev/null and b/src/res/instruments/vocalbass.png differ diff --git a/src/res/instruments/vocalsoprano.png b/src/res/instruments/vocalsoprano.png new file mode 100644 index 00000000..36e6dfe8 Binary files /dev/null and b/src/res/instruments/vocalsoprano.png differ diff --git a/src/res/instruments/vocaltenor.png b/src/res/instruments/vocaltenor.png new file mode 100644 index 00000000..633477bb Binary files /dev/null and b/src/res/instruments/vocaltenor.png differ 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;