eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge fixes

Browse source
This commit is contained in:
Volker Fischer 2020-06-05 11:19:04 +02:00
parent b3b52f74e0
commit 7c7c0ad930
6 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -10,6 +10,8 @@
- make level meter LED black when off, by fleutot (#318) - make level meter LED black when off, by fleutot (#318)
- added ukulele/bass ukulele instrument icons created by dos1 (#319)
- added check in acknowledge message, coded by atsampson (#302) - added check in acknowledge message, coded by atsampson (#302)
- bug fix: on MacOS declare an activity to ensure the process doesn't get throttled - bug fix: on MacOS declare an activity to ensure the process doesn't get throttled

4
Jamulus.pro
View file

@ -714,6 +714,10 @@ DISTFILES += ChangeLog \
src/res/instruments/congas.png \ src/res/instruments/congas.png \
src/res/instruments/bongo.svg \ src/res/instruments/bongo.svg \
src/res/instruments/bongo.png \ src/res/instruments/bongo.png \
src/res/instruments/ukulele.svg \
src/res/instruments/ukulele.png \
src/res/instruments/bassukulele.svg \
src/res/instruments/bassukulele.png \
src/res/instruments/vocalbass.png \ src/res/instruments/vocalbass.png \
src/res/instruments/vocaltenor.png \ src/res/instruments/vocaltenor.png \
src/res/instruments/vocalalto.png \ src/res/instruments/vocalalto.png \

0
src/res/instruments/bassuke.png → src/res/instruments/bassukulele.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 981 B

After

Width:  |  Height:  |  Size: 981 B

0
src/res/instruments/bassuke.svg → src/res/instruments/bassukulele.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

2
src/resources.qrc
View file

@ -81,7 +81,7 @@
<file>res/instruments/banjo.png</file> <file>res/instruments/banjo.png</file>
<file>res/instruments/mandolin.png</file> <file>res/instruments/mandolin.png</file>
<file>res/instruments/ukulele.png</file> <file>res/instruments/ukulele.png</file>
<file>res/instruments/bassuke.png</file> <file>res/instruments/bassukulele.png</file>
</qresource> </qresource>
<qresource prefix="/png/main"> <qresource prefix="/png/main">
<file>res/fronticon.png</file> <file>res/fronticon.png</file>

2
src/util.cpp
View file

@ -1021,7 +1021,7 @@ CVector<CInstPictures::CInstPictProps>& CInstPictures::GetTable()
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Banjo" ), ":/png/instr/res/instruments/banjo.png", IC_PLUCKING_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 ) ); vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Mandolin" ), ":/png/instr/res/instruments/mandolin.png", IC_PLUCKING_INSTRUMENT ) );
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Ukulele" ), ":/png/instr/res/instruments/ukulele.png", IC_PLUCKING_INSTRUMENT ) ); vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Ukulele" ), ":/png/instr/res/instruments/ukulele.png", IC_PLUCKING_INSTRUMENT ) );
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Bass Ukulele" ), ":/png/instr/res/instruments/bassuke.png", IC_PLUCKING_INSTRUMENT ) ); vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Bass Ukulele" ), ":/png/instr/res/instruments/bassukulele.png", IC_PLUCKING_INSTRUMENT ) );
// now the table is initialized // now the table is initialized
TableIsInitialized = true; TableIsInitialized = true;