From 104ebbfa2d8ca2affad2f527e8631ee07481dcf9 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Thu, 23 Apr 2020 21:16:09 +0200
Subject: [PATCH] added Keyboard+Vocal instrument icon, thanks to jp8

---
 ChangeLog                                  |   2 +-
 Jamulus.pro                                |   1 +
 src/res/instruments/instrkeyboardvocal.png | Bin 0 -> 1970 bytes
 src/resources.qrc                          |   1 +
 src/util.cpp                               |   1 +
 5 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 src/res/instruments/instrkeyboardvocal.png

diff --git a/ChangeLog b/ChangeLog
index 7d2ab394..cdf06edd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,7 +13,7 @@
 
   * added -v/--version command line argument to output version information (Ticket #121)
 
-  * added bodhran instrument icon, created by bomm (Ticket #131)
+  * added bodhran and other instrument icons, bodhran created by bomm (Ticket #131)
 
   * bug fix: if small network buffers are used we get much better audio quality when drop outs occur
 
diff --git a/Jamulus.pro b/Jamulus.pro
index e01b8460..4bc0ceea 100755
--- a/Jamulus.pro
+++ b/Jamulus.pro
@@ -549,6 +549,7 @@ DISTFILES += ChangeLog \
     src/res/instruments/instrviolin.png \
     src/res/instruments/instrvocal.png \
     src/res/instruments/instrguitarvocal.png \
+    src/res/instruments/instrkeyboardvocal.png \
     src/res/instruments/bodhran.svg \
     src/res/instruments/bodhran.png \
     src/res/flags/flagnone.png \
diff --git a/src/res/instruments/instrkeyboardvocal.png b/src/res/instruments/instrkeyboardvocal.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1a7729042ca9fe39635b7960cfb37518abd464b
GIT binary patch
literal 1970
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
Ef<^1MY5)KL

literal 0
HcmV?d00001

diff --git a/src/resources.qrc b/src/resources.qrc
index dac712b4..77f355ec 100755
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -48,6 +48,7 @@
         <file>res/instruments/instrlistener.png</file>
         <file>res/instruments/instrstreamer.png</file>
         <file>res/instruments/instrguitarvocal.png</file>
+        <file>res/instruments/instrkeyboardvocal.png</file>
         <file>res/instruments/bodhran.png</file>
     </qresource>
     <qresource prefix="/png/main">
diff --git a/src/util.cpp b/src/util.cpp
index 225bc594..d7d6bc7e 100755
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -962,6 +962,7 @@ CVector<CInstPictures::CInstPictProps>& CInstPictures::GetTable()
         vecDataBase.Add ( CInstPictProps ( "Streamer", ":/png/instr/res/instruments/instrstreamer.png", IC_OTHER_INSTRUMENT ) );
         vecDataBase.Add ( CInstPictProps ( "Listener", ":/png/instr/res/instruments/instrlistener.png", IC_OTHER_INSTRUMENT ) );
         vecDataBase.Add ( CInstPictProps ( "Guitar+Vocal", ":/png/instr/res/instruments/instrguitarvocal.png", IC_MULTIPLE_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Keyboard+Vocal", ":/png/instr/res/instruments/instrkeyboardvocal.png", IC_MULTIPLE_INSTRUMENT ) );
         vecDataBase.Add ( CInstPictProps ( "Bodhran", ":/png/instr/res/instruments/bodhran.png", IC_PERCUSSION_INSTRUMENT ) );
 
         // now the table is initialized