diff --git a/ChangeLog b/ChangeLog index fdd8fe30..06f7c09b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,7 @@ - for CoreAudio and 4 channel input, support mixing channels 1&2 with 3&4 -- added bassoon/oboe/harp instrument icons created by dszgit; congas created by bspeer (Ticket #131) +- added bassoon/oboe/harp instrument icons created by dszgit; congas/bongo created by bspeer (Ticket #131) - link to docs from application Help menu (Ticket #90) @@ -24,6 +24,8 @@ TODO WIP support internationalization +TODO improve disconnect message behaviour on client + TODO implement panning for channels (Ticket #52, #145) TODO show mute state of others diff --git a/Jamulus.pro b/Jamulus.pro index b517c99b..97dc3c9d 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -581,6 +581,8 @@ DISTFILES += ChangeLog \ src/res/instruments/viola.png \ src/res/instruments/congas.svg \ src/res/instruments/congas.png \ + src/res/instruments/bongo.svg \ + src/res/instruments/bongo.png \ src/res/flags/flagnone.png \ src/res/flags/ad.png \ src/res/flags/ae.png \ diff --git a/src/res/instruments/bongo.png b/src/res/instruments/bongo.png new file mode 100644 index 00000000..3864cc70 Binary files /dev/null and b/src/res/instruments/bongo.png differ diff --git a/src/res/instruments/bongo.svg b/src/res/instruments/bongo.svg new file mode 100644 index 00000000..3a5f42fc --- /dev/null +++ b/src/res/instruments/bongo.svg @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts index e7ef8f4c..b3a8d111 100644 --- a/src/res/translation/translation_de_DE.ts +++ b/src/res/translation/translation_de_DE.ts @@ -1852,6 +1852,11 @@ Congas Congas + + + Bongo + + CServerDlg diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts index 5651cdb5..6537077d 100644 --- a/src/res/translation/translation_es_ES.ts +++ b/src/res/translation/translation_es_ES.ts @@ -1856,6 +1856,11 @@ Congas Congas + + + Bongo + + CServerDlg diff --git a/src/res/translation/translation_fr_FR.ts b/src/res/translation/translation_fr_FR.ts index 5e3d648c..0236ed05 100644 --- a/src/res/translation/translation_fr_FR.ts +++ b/src/res/translation/translation_fr_FR.ts @@ -1864,6 +1864,11 @@ Congas + + + Bongo + + CServerDlg diff --git a/src/res/translation/translation_pt_PT.ts b/src/res/translation/translation_pt_PT.ts index 79e4ccf0..a72621d2 100644 --- a/src/res/translation/translation_pt_PT.ts +++ b/src/res/translation/translation_pt_PT.ts @@ -1864,6 +1864,11 @@ Congas + + + Bongo + + CServerDlg diff --git a/src/resources.qrc b/src/resources.qrc index 2c9c8476..51b5fe74 100755 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -67,6 +67,7 @@ res/instruments/harp.png res/instruments/viola.png res/instruments/congas.png + res/instruments/bongo.png res/fronticon.png diff --git a/src/util.cpp b/src/util.cpp index 117a77a8..fff72c99 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -999,6 +999,7 @@ CVector& CInstPictures::GetTable() vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Harp" ), ":/png/instr/res/instruments/harp.png", IC_STRING_INSTRUMENT ) ); 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 ) ); // now the table is initialized TableIsInitialized = true;