From 7c7c0ad930f346e55f01124ee660b91e42ca7ec4 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Fri, 5 Jun 2020 11:19:04 +0200
Subject: [PATCH] merge fixes

---
 ChangeLog                                           |   2 ++
 Jamulus.pro                                         |   4 ++++
 .../instruments/{bassuke.png => bassukulele.png}    | Bin
 .../instruments/{bassuke.svg => bassukulele.svg}    |   0
 src/resources.qrc                                   |   2 +-
 src/util.cpp                                        |   2 +-
 6 files changed, 8 insertions(+), 2 deletions(-)
 rename src/res/instruments/{bassuke.png => bassukulele.png} (100%)
 rename src/res/instruments/{bassuke.svg => bassukulele.svg} (100%)

diff --git a/ChangeLog b/ChangeLog
index a8a167b8..8009c402 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
 
 - 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)
 
 - bug fix: on MacOS declare an activity to ensure the process doesn't get throttled
diff --git a/Jamulus.pro b/Jamulus.pro
index 97f5b6f2..d626af4e 100755
--- a/Jamulus.pro
+++ b/Jamulus.pro
@@ -714,6 +714,10 @@ DISTFILES += ChangeLog \
     src/res/instruments/congas.png \
     src/res/instruments/bongo.svg \
     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/vocaltenor.png \
     src/res/instruments/vocalalto.png \
diff --git a/src/res/instruments/bassuke.png b/src/res/instruments/bassukulele.png
similarity index 100%
rename from src/res/instruments/bassuke.png
rename to src/res/instruments/bassukulele.png
diff --git a/src/res/instruments/bassuke.svg b/src/res/instruments/bassukulele.svg
similarity index 100%
rename from src/res/instruments/bassuke.svg
rename to src/res/instruments/bassukulele.svg
diff --git a/src/resources.qrc b/src/resources.qrc
index 32a52995..15370a8a 100755
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -81,7 +81,7 @@
         <file>res/instruments/banjo.png</file>
         <file>res/instruments/mandolin.png</file>
         <file>res/instruments/ukulele.png</file>
-        <file>res/instruments/bassuke.png</file>
+        <file>res/instruments/bassukulele.png</file>
     </qresource>
     <qresource prefix="/png/main">
         <file>res/fronticon.png</file>
diff --git a/src/util.cpp b/src/util.cpp
index 4ede90d0..d506394f 100755
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -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", "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", "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
         TableIsInitialized = true;