Merge pull request #2 from corrados/master

update

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

Jamulus.pro

@@ -295,12 +295,24 @@ win32 {
     isEmpty(PREFIX) {
         PREFIX = /usr/local
     }
+
     isEmpty(BINDIR) {
         BINDIR = bin
     }
     BINDIR = $$absolute_path($$BINDIR, $$PREFIX)
-    INSTALLS += target
     target.path = $$BINDIR
+    INSTALLS += target
+
+    isEmpty(APPSDIR) {
+        APPSDIR = share/applications
+    }
+    APPSDIR = $$absolute_path($$APPSDIR, $$PREFIX)
+    desktop.path = $$APPSDIR
+    desktop.files = distributions/jamulus.desktop
+    # the .desktop file assumes the binary is called jamulus
+    contains(CONFIG, "noupcasename") {
+        INSTALLS += desktop
+    }
 }
 
 RCC_DIR = src/res
@@ -702,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 \

src/global.h

@@ -206,7 +206,7 @@ LED bar:      lbr
 #define SERVLIST_REGIST_INTERV_MINUTES   15 // minutes
 
 // defines the minimum time a server must run to be a permanent server
-#define SERVLIST_TIME_PERMSERV_MINUTES   4320 // minutes, 4320 = 60 min * 24 h * 3 d
+#define SERVLIST_TIME_PERMSERV_MINUTES   2880 // minutes, 2880 = 60 min * 24 h * 2 d
 
 // registration response timeout
 #define REGISTER_SERVER_TIME_OUT_MS      500 // ms

src/res/instruments/bassukulele.svg

@@ -0,0 +1,386 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="2.8125362"
+   inkscape:export-xdpi="2.8125362"
+   inkscape:export-filename="/home/dos/git/jamulus/src/res/instruments/bassuku.png"
+   sodipodi:docname="Simple-Ukulele-No-Outline-bass.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   version="1.1"
+   id="svg2"
+   viewBox="0 0 735.99054 846.39916"
+   height="238.87265mm"
+   width="207.71289mm">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3714">
+      <stop
+         id="stop3716"
+         style="stop-color:#ffffff"
+         offset="0" />
+      <stop
+         id="stop3718"
+         style="stop-color:#67674e"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4328-4">
+      <stop
+         id="stop4330-4"
+         style="stop-color:#ffd200"
+         offset="0" />
+      <stop
+         id="stop4342-1"
+         style="stop-color:#a7a70e"
+         offset=".27384" />
+      <stop
+         id="stop4332-9"
+         style="stop-color:#8f7600"
+         offset=".52558" />
+      <stop
+         id="stop4334-5"
+         style="stop-color:#f7f762"
+         offset=".64405" />
+      <stop
+         id="stop4344-57"
+         style="stop-color:#ffffff"
+         offset=".76270" />
+      <stop
+         id="stop4336-47"
+         style="stop-color:#ebeb6e"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     inkscape:window-maximized="1"
+     inkscape:window-y="0"
+     inkscape:window-x="0"
+     inkscape:window-height="1049"
+     inkscape:window-width="1920"
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     showgrid="false"
+     inkscape:current-layer="g4988"
+     inkscape:document-units="px"
+     inkscape:cy="637.60549"
+     inkscape:cx="44.898402"
+     inkscape:zoom="0.60318211"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(174.09971,-97.106047)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <g
+       transform="matrix(-0.95020482,-0.31162605,-0.31162605,0.95020482,543.50583,87.538163)"
+       id="g4988">
+      <g
+         id="g4468"
+         transform="translate(38.90952,16.828174)" />
+      <g
+         id="g4464"
+         transform="translate(38.90952,16.828174)" />
+      <g
+         id="g4460"
+         transform="translate(38.90952,16.828174)" />
+      <g
+         transform="rotate(56.802293,211.56261,525.98082)"
+         id="g4877">
+        <g
+           transform="translate(38.90952,16.828174)"
+           id="g4836"
+           style="fill:#848484;fill-opacity:1">
+          <rect
+             x="90.196999"
+             y="55.462002"
+             width="34.015999"
+             height="8.3194008"
+             style="fill:#848484;fill-opacity:1;stroke:none"
+             id="rect4172-6" />
+          <path
+             d="m 67.969,49.615 c 0.09039,-0.10784 0.35808,-0.22357 0.35808,-0.22357 l 13.238,-2.4177 c 0,0 0.70463,-0.0927 1.0475,-0.009 0.34285,0.0836 0.85154,0.44499 0.85154,0.44499 l 8.9307,6.8624 -0.0074,10.519 -8.9568,7.0592 c 0,0 -0.51562,0.3961 -0.78827,0.45964 -0.27266,0.0635 -1.0096,-0.0858 -1.0096,-0.0858 l -13.429,-2.365 c 0,0 -0.23462,-0.064 -0.34967,-0.20156 -0.11505,-0.13753 -0.0763,-0.3344 -0.0916,-0.50469 -0.56792,-6.3219 -1.2012,-12.811 0.0068,-19.042 0.03389,-0.17481 0.08505,-0.35911 0.19944,-0.49558 z"
+             style="fill:#848484;fill-opacity:1;stroke:none"
+             sodipodi:nodetypes="ccczcccczcczsaa"
+             id="rect4309"
+             inkscape:connector-curvature="0" />
+        </g>
+        <g
+           transform="translate(38.90952,15.620174)"
+           id="g4840"
+           style="fill:#848484;fill-opacity:1">
+          <rect
+             x="200.58"
+             y="56.646999"
+             width="35.641006"
+             height="8.3194008"
+             style="fill:#848484;fill-opacity:1;stroke:none"
+             id="rect4172" />
+          <path
+             d="m 256.76,50.823 c -0.0904,-0.10784 -0.35808,-0.22357 -0.35808,-0.22357 l -13.238,-2.4177 c 0,0 -0.70463,-0.0927 -1.0475,-0.009 -0.34285,0.0836 -0.85153,0.44499 -0.85153,0.44499 l -8.9307,6.8624 0.007,10.519 8.9568,7.0592 c 0,0 0.51562,0.3961 0.78827,0.45964 0.27266,0.0635 1.0096,-0.0858 1.0096,-0.0858 l 13.429,-2.365 c 0,0 0.23462,-0.064 0.34968,-0.20156 0.11505,-0.13753 0.0763,-0.3344 0.0916,-0.50469 0.56792,-6.3219 1.2012,-12.811 -0.007,-19.042 -0.0339,-0.17481 -0.0851,-0.35911 -0.19944,-0.49558 z"
+             style="fill:#848484;fill-opacity:1;stroke:none"
+             sodipodi:nodetypes="ccczcccczcczsaa"
+             id="rect4309-4"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <g
+         id="g4885"
+         transform="rotate(56.802293,210.994,527.03238)">
+        <g
+           transform="translate(38.90952,16.828174)"
+           id="g4848"
+           style="fill:#848484;fill-opacity:1">
+          <rect
+             x="95.765594"
+             y="127.77"
+             width="33.349415"
+             height="8.3194046"
+             style="fill:#848484;fill-opacity:1;stroke:none"
+             id="rect4172-4" />
+          <path
+             d="m 72.812,121.8 c 0.09039,-0.10784 0.35808,-0.22357 0.35808,-0.22357 l 13.238,-2.4177 c 0,0 0.70463,-0.0927 1.0475,-0.009 0.34285,0.0836 0.85154,0.44499 0.85154,0.44499 l 8.9307,6.8624 -0.0074,10.519 -8.9568,7.0592 c 0,0 -0.51562,0.3961 -0.78827,0.45964 -0.27266,0.0635 -1.0096,-0.0858 -1.0096,-0.0858 l -13.429,-2.365 c 0,0 -0.23462,-0.064 -0.34967,-0.20156 -0.11505,-0.13753 -0.0763,-0.3344 -0.0916,-0.50469 -0.56792,-6.3219 -1.2012,-12.811 0.0068,-19.042 0.03389,-0.17481 0.08505,-0.35911 0.19944,-0.49558 z"
+             style="fill:#848484;fill-opacity:1;stroke:none"
+             sodipodi:nodetypes="ccczcccczcczsaa"
+             id="rect4309-7"
+             inkscape:connector-curvature="0" />
+        </g>
+        <g
+           transform="translate(38.90952,16.568174)"
+           id="g4844"
+           style="fill:#848484;fill-opacity:1">
+          <rect
+             x="195.75999"
+             y="127.86"
+             width="35.141006"
+             height="8.319397"
+             style="fill:#848484;fill-opacity:1;stroke:none"
+             id="rect4172-9" />
+          <path
+             d="m 251.9,122.06 c -0.0904,-0.10784 -0.35808,-0.22357 -0.35808,-0.22357 l -13.238,-2.4177 c 0,0 -0.70463,-0.0927 -1.0475,-0.009 -0.34285,0.0836 -0.85153,0.44499 -0.85153,0.44499 l -8.9307,6.8624 0.007,10.519 8.9568,7.0592 c 0,0 0.51562,0.3961 0.78827,0.45964 0.27266,0.0635 1.0096,-0.0858 1.0096,-0.0858 l 13.429,-2.365 c 0,0 0.23462,-0.064 0.34967,-0.20156 0.11506,-0.13753 0.0763,-0.3344 0.0916,-0.50469 0.56792,-6.3219 1.2012,-12.811 -0.007,-19.042 -0.0339,-0.17481 -0.085,-0.35911 -0.19943,-0.49558 z"
+             style="fill:#848484;fill-opacity:1;stroke:none"
+             sodipodi:nodetypes="ccczcccczcczsaa"
+             id="rect4309-78"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         id="path3594"
+         sodipodi:nodetypes="ccccccccccc"
+         style="fill:#885227;fill-opacity:1"
+         d="M 136.83021,507.04543 C 102.5117,455.75682 33.177599,450.27212 -10.536322,519.56661 c -7.045798,10.97507 -12.929056,22.77528 -21.369028,32.57485 -5.563947,5.64437 -10.550461,9.39951 -18.605255,11.32974 -19.538162,3.31259 -30.483534,3.44968 -49.702415,2.67877 -98.94644,-4.25185 -191.99644,93.25531 -100.23879,218.91339 83.40608,139.41756 204.7239276,83.10076 242.309599,-14.11556 4.60741,-9.51611 10.312432,-23.64566 17.33938,-36.59098 2.950183,-5.06881 7.825142,-9.20242 14.189491,-11.58842 14.493461,-6.01441 23.991931,-5.39206 33.76609,-5.9347 79.06705,-5.4477 120.54234,-75.87137 78.99564,-134.72791" />
+      <path
+         id="path3592"
+         sodipodi:nodetypes="ccccc"
+         style="fill:#7c503e;fill-opacity:1"
+         inkscape:connector-curvature="0"
+         d="m 22.994737,582.3912 c -7.171605,31.34037 20.749132,67.36359 46.14718,74.67982 L 477.42041,382.20343 437.92721,322.30366 Z" />
+      <ellipse
+         ry="50.068455"
+         rx="47.487606"
+         cy="309.37598"
+         cx="543.34454"
+         id="path2818"
+         style="fill:#1d1d1d;fill-opacity:1;stroke:#493026;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="rotate(56.602295)" />
+      <g
+         transform="rotate(56.802293,211.56261,525.98082)"
+         id="g4820"
+         style="fill:#848484;fill-opacity:1;stroke:#848484;stroke-opacity:1">
+        <path
+           d="m 162.94952,342.25388 75.065,-0.2594"
+           style="fill:#848484;fill-opacity:1;stroke:#848484;stroke-width:1px;stroke-linecap:round;stroke-opacity:1"
+           sodipodi:nodetypes="cc"
+           id="path3662"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 161.13952,431.91103 78.478,-0.27394"
+           style="fill:#848484;fill-opacity:1;stroke:#848484;stroke-width:1px;stroke-linecap:round;stroke-opacity:1"
+           sodipodi:nodetypes="cc"
+           id="path3676"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 160.31452,477.87817 79.709,-0.28347"
+           style="fill:#848484;fill-opacity:1;stroke:#848484;stroke-width:1px;stroke-linecap:round;stroke-opacity:1"
+           sodipodi:nodetypes="cc"
+           id="path3680"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 159.30952,524.60817 81.244,-0.28926"
+           style="fill:#848484;fill-opacity:1;stroke:#848484;stroke-width:1px;stroke-linecap:round;stroke-opacity:1"
+           sodipodi:nodetypes="cc"
+           id="path3684"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 158.18952,566.94817 82.994,-0.29494"
+           style="fill:#848484;fill-opacity:1;stroke:#848484;stroke-width:1px;stroke-linecap:round;stroke-opacity:1"
+           sodipodi:nodetypes="cc"
+           id="path3688"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4808"
+           sodipodi:nodetypes="cc"
+           style="fill:#848484;fill-opacity:1;stroke:#848484;stroke-width:1px;stroke-linecap:round;stroke-opacity:1"
+           d="m 161.76452,387.98246 76.978,-0.27394" />
+        <path
+           d="m 163.51452,297.98246 74.228,-0.27394"
+           style="fill:#848484;fill-opacity:1;stroke:#848484;stroke-width:1px;stroke-linecap:round;stroke-opacity:1"
+           sodipodi:nodetypes="cc"
+           id="path4812"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4816"
+           sodipodi:nodetypes="cc"
+           style="fill:#848484;fill-opacity:1;stroke:#848484;stroke-width:1px;stroke-linecap:round;stroke-opacity:1"
+           d="m 164.26452,258.69675 72.978,-0.27394" />
+      </g>
+      <g
+         id="g4432"
+         transform="translate(47.33362,14.828174)" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3600"
+         sodipodi:nodetypes="ccccccccc"
+         style="fill:#885227;fill-opacity:1"
+         d="m 443.22653,318.97935 c 12.90049,-10.3484 20.94726,-20.00553 23.01406,-30.73651 l 118.81857,-83.29091 c 13.1456,17.96442 27.18019,26.96293 47.47839,34.49906 -2.2932,17.20103 2.35288,37.16667 13.03803,57.29195 l -125.63724,72.94304 c -11.39681,-2.56387 -24.57593,1.7281 -37.65592,9.17766 L 443.2248,318.97523 Z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3598"
+         sodipodi:nodetypes="cccccc"
+         style="fill:#848484;fill-opacity:1"
+         d="m 437.89972,322.38116 6.04702,-3.95655 39.28335,60.01675 -6.03948,3.96481 -39.29134,-60.02587 -2e-5,-4e-5 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3850"
+         sodipodi:nodetypes="cc"
+         style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:5.625;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 503.07285,291.92798 -55.70499,32.00891" />
+      <rect
+         transform="rotate(56.802293)"
+         style="opacity:1;fill:#7c503e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect4830"
+         width="112.85262"
+         height="24.036032"
+         x="486.85745"
+         y="488.88528"
+         rx="4"
+         ry="4" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect2891"
+         sodipodi:nodetypes="ccccc"
+         style="fill:#848484;fill-opacity:1"
+         d="m -141.23247,687.7936 49.362,75.43963 c -1.116133,2.7895 -3.140754,4.19038 -6.178662,4.04285 l -49.361998,-75.43963 c 1.15018,-3.14329 3.43998,-4.03626 6.17866,-4.04285 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3602"
+         sodipodi:nodetypes="ccc"
+         style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:5.625;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 447.51152,323.84779 -592.82133,374.16284 0.43083,-0.2843" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3852"
+         style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:5.625;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 540.32264,331.1772 -62.0235,43.51651" />
+      <g
+         id="g4832"
+         transform="rotate(56.802293,211.06488,526.9013)">
+        <ellipse
+           style="fill:#848484;fill-opacity:1;stroke:none"
+           id="path4040"
+           cx="177.64957"
+           cy="148.53616"
+           rx="9.7059174"
+           ry="10.139226" />
+        <ellipse
+           style="fill:#848484;fill-opacity:1;stroke:none"
+           id="path4040-1"
+           cx="225.16457"
+           cy="148.67317"
+           rx="9.7059174"
+           ry="10.139226" />
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         id="path3858"
+         sodipodi:nodetypes="cc"
+         style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:5.625;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 573.70147,246.22098 458.4191,340.77896" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3604"
+         sodipodi:nodetypes="cc"
+         style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:5.625;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M -131.10659,719.55294 458.53329,340.6923" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3856"
+         sodipodi:nodetypes="cc"
+         style="fill:none;fill-opacity:1;stroke:#fffdff;stroke-width:5.625;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 468.9748,357.92844 602.47724,291.74053" />
+      <g
+         id="g4804"
+         transform="rotate(56.802293,211.03995,526.94739)">
+        <ellipse
+           style="fill:#848484;fill-opacity:1;stroke:none"
+           id="path4040-14"
+           cx="172.88586"
+           cy="76.581169"
+           rx="9.7059174"
+           ry="10.139226" />
+        <ellipse
+           style="fill:#848484;fill-opacity:1;stroke:none"
+           id="path4040-8"
+           cx="229.82857"
+           cy="77.317169"
+           rx="9.7059174"
+           ry="10.139226" />
+      </g>
+      <g
+         id="g4384"
+         transform="matrix(1.5439892,0,0,1.5454939,184.96621,27.970154)"
+         style="fill:#9e6332;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3606"
+         sodipodi:nodetypes="cc"
+         style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:5.625;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 469.23678,357.78092 -116.74946,741.6246" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3608"
+         sodipodi:nodetypes="ccc"
+         style="fill:none;fill-opacity:1;stroke:#fffffe;stroke-width:5.625;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M -102.3437,763.0425 93.126442,632.29347 479.9823,373.52748" />
+    </g>
+  </g>
+</svg>

src/res/instruments/ukulele.svg

@@ -0,0 +1,402 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="141.41292mm"
+   height="271.14975mm"
+   viewBox="0 0 501.06939 960.76684"
+   id="svg2"
+   version="1.1"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="Simple-Ukulele-No-Outline.svg"
+   inkscape:export-filename="/home/dos/git/jamulus/src/res/instruments/ukulele.png"
+   inkscape:export-xdpi="2.5292296"
+   inkscape:export-ydpi="2.5292296">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3714">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff"
+         id="stop3716" />
+      <stop
+         offset="1"
+         style="stop-color:#67674e"
+         id="stop3718" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4328-4">
+      <stop
+         offset="0"
+         style="stop-color:#ffd200"
+         id="stop4330-4" />
+      <stop
+         offset=".27384"
+         style="stop-color:#a7a70e"
+         id="stop4342-1" />
+      <stop
+         offset=".52558"
+         style="stop-color:#8f7600"
+         id="stop4332-9" />
+      <stop
+         offset=".64405"
+         style="stop-color:#f7f762"
+         id="stop4334-5" />
+      <stop
+         offset=".76270"
+         style="stop-color:#ffffff"
+         id="stop4344-57" />
+      <stop
+         offset="1"
+         style="stop-color:#ebeb6e"
+         id="stop4336-47" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.84326994"
+     inkscape:cx="157.59521"
+     inkscape:cy="504.4065"
+     inkscape:document-units="px"
+     inkscape:current-layer="g4988"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1049"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(79.773826,-40.49093)">
+    <g
+       id="g4988"
+       transform="matrix(-0.95020482,-0.31162605,-0.31162605,0.95020482,543.50583,87.538163)">
+      <g
+         transform="translate(38.90952,16.828174)"
+         id="g4468" />
+      <g
+         transform="translate(38.90952,16.828174)"
+         id="g4464" />
+      <g
+         transform="translate(38.90952,16.828174)"
+         id="g4460" />
+      <g
+         id="g4877">
+        <g
+           style="fill:#848484;fill-opacity:1"
+           id="g4836"
+           transform="translate(38.90952,16.828174)">
+          <rect
+             id="rect4172-6"
+             style="fill:#848484;fill-opacity:1;stroke:none"
+             height="8.3194008"
+             width="34.015999"
+             y="55.462002"
+             x="90.196999" />
+          <path
+             inkscape:connector-curvature="0"
+             id="rect4309"
+             sodipodi:nodetypes="ccczcccczcczsaa"
+             style="fill:#848484;fill-opacity:1;stroke:none"
+             d="m 67.969,49.615 c 0.09039,-0.10784 0.35808,-0.22357 0.35808,-0.22357 l 13.238,-2.4177 c 0,0 0.70463,-0.0927 1.0475,-0.009 0.34285,0.0836 0.85154,0.44499 0.85154,0.44499 l 8.9307,6.8624 -0.0074,10.519 -8.9568,7.0592 c 0,0 -0.51562,0.3961 -0.78827,0.45964 -0.27266,0.0635 -1.0096,-0.0858 -1.0096,-0.0858 l -13.429,-2.365 c 0,0 -0.23462,-0.064 -0.34967,-0.20156 -0.11505,-0.13753 -0.0763,-0.3344 -0.0916,-0.50469 -0.56792,-6.3219 -1.2012,-12.811 0.0068,-19.042 0.03389,-0.17481 0.08505,-0.35911 0.19944,-0.49558 z" />
+        </g>
+        <g
+           style="fill:#848484;fill-opacity:1"
+           id="g4840"
+           transform="translate(38.90952,15.620174)">
+          <rect
+             id="rect4172"
+             style="fill:#848484;fill-opacity:1;stroke:none"
+             height="8.3194008"
+             width="35.641006"
+             y="56.646999"
+             x="200.58" />
+          <path
+             inkscape:connector-curvature="0"
+             id="rect4309-4"
+             sodipodi:nodetypes="ccczcccczcczsaa"
+             style="fill:#848484;fill-opacity:1;stroke:none"
+             d="m 256.76,50.823 c -0.0904,-0.10784 -0.35808,-0.22357 -0.35808,-0.22357 l -13.238,-2.4177 c 0,0 -0.70463,-0.0927 -1.0475,-0.009 -0.34285,0.0836 -0.85153,0.44499 -0.85153,0.44499 l -8.9307,6.8624 0.007,10.519 8.9568,7.0592 c 0,0 0.51562,0.3961 0.78827,0.45964 0.27266,0.0635 1.0096,-0.0858 1.0096,-0.0858 l 13.429,-2.365 c 0,0 0.23462,-0.064 0.34968,-0.20156 0.11505,-0.13753 0.0763,-0.3344 0.0916,-0.50469 0.56792,-6.3219 1.2012,-12.811 -0.007,-19.042 -0.0339,-0.17481 -0.0851,-0.35911 -0.19944,-0.49558 z" />
+        </g>
+      </g>
+      <g
+         transform="translate(1.1372146)"
+         id="g4885">
+        <g
+           style="fill:#848484;fill-opacity:1"
+           id="g4848"
+           transform="translate(38.90952,16.828174)">
+          <rect
+             id="rect4172-4"
+             style="fill:#848484;fill-opacity:1;stroke:none"
+             height="8.3194046"
+             width="33.349415"
+             y="127.77"
+             x="95.765594" />
+          <path
+             inkscape:connector-curvature="0"
+             id="rect4309-7"
+             sodipodi:nodetypes="ccczcccczcczsaa"
+             style="fill:#848484;fill-opacity:1;stroke:none"
+             d="m 72.812,121.8 c 0.09039,-0.10784 0.35808,-0.22357 0.35808,-0.22357 l 13.238,-2.4177 c 0,0 0.70463,-0.0927 1.0475,-0.009 0.34285,0.0836 0.85154,0.44499 0.85154,0.44499 l 8.9307,6.8624 -0.0074,10.519 -8.9568,7.0592 c 0,0 -0.51562,0.3961 -0.78827,0.45964 -0.27266,0.0635 -1.0096,-0.0858 -1.0096,-0.0858 l -13.429,-2.365 c 0,0 -0.23462,-0.064 -0.34967,-0.20156 -0.11505,-0.13753 -0.0763,-0.3344 -0.0916,-0.50469 -0.56792,-6.3219 -1.2012,-12.811 0.0068,-19.042 0.03389,-0.17481 0.08505,-0.35911 0.19944,-0.49558 z" />
+        </g>
+        <g
+           style="fill:#848484;fill-opacity:1"
+           id="g4844"
+           transform="translate(38.90952,16.568174)">
+          <rect
+             id="rect4172-9"
+             style="fill:#848484;fill-opacity:1;stroke:none"
+             height="8.319397"
+             width="35.141006"
+             y="127.86"
+             x="195.75999" />
+          <path
+             inkscape:connector-curvature="0"
+             id="rect4309-78"
+             sodipodi:nodetypes="ccczcccczcczsaa"
+             style="fill:#848484;fill-opacity:1;stroke:none"
+             d="m 251.9,122.06 c -0.0904,-0.10784 -0.35808,-0.22357 -0.35808,-0.22357 l -13.238,-2.4177 c 0,0 -0.70463,-0.0927 -1.0475,-0.009 -0.34285,0.0836 -0.85153,0.44499 -0.85153,0.44499 l -8.9307,6.8624 0.007,10.519 8.9568,7.0592 c 0,0 0.51562,0.3961 0.78827,0.45964 0.27266,0.0635 1.0096,-0.0858 1.0096,-0.0858 l 13.429,-2.365 c 0,0 0.23462,-0.064 0.34967,-0.20156 0.11506,-0.13753 0.0763,-0.3344 0.0916,-0.50469 0.56792,-6.3219 1.2012,-12.811 -0.007,-19.042 -0.0339,-0.17481 -0.085,-0.35911 -0.19943,-0.49558 z" />
+        </g>
+      </g>
+      <path
+         d="m 154.79952,578.14817 c -61.708,0.63521 -104.26,55.65 -70.21,130.17 5.326,11.905 11.979,23.289 15.558,35.717 1.67671,7.7463 2.0887,13.975 -0.70635,21.772 -7.9258,18.163 -13.804,27.397 -24.972,43.057 -57.734,80.469 -27.089,211.72003 128.3,203.74003 162.33,6.5422 181.63,-125.81003 120.86,-210.49003 -5.44026,-9.06577 -14.14,-21.576 -21.125,-34.544 -2.6262,-5.244 -3.41596,-11.58657 -1.92786,-18.21857 2.90282,-15.421 8.62429,-23.02843 13.52186,-31.50443 38.733,-69.145 2.5124,-142.41 -69.486,-139.87"
+         style="fill:#cb8348;fill-opacity:1"
+         sodipodi:nodetypes="ccccccccccc"
+         id="path3594"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 155.51952,714.65817 c 22.29852,23.16088 67.72969,19.52098 87.758,2.2741 l -6.4608,-492.14 -71.747,0.25045 z"
+         inkscape:connector-curvature="0"
+         style="fill:#7c503e;fill-opacity:1"
+         sodipodi:nodetypes="ccccc"
+         id="path3592" />
+      <ellipse
+         transform="rotate(-0.19999763)"
+         style="fill:#1d1d1d;fill-opacity:1;stroke:#493026;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path2818"
+         cx="197.49022"
+         cy="723.19458"
+         rx="47.487606"
+         ry="50.068455" />
+      <g
+         style="fill:#848484;fill-opacity:1;stroke:#848484;stroke-opacity:1"
+         id="g4820">
+        <path
+           inkscape:connector-curvature="0"
+           id="path3662"
+           sodipodi:nodetypes="cc"
+           style="fill:#848484;fill-opacity:1;stroke:#848484;stroke-width:1px;stroke-linecap:round;stroke-opacity:1"
+           d="m 162.94952,342.25388 75.065,-0.2594" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3676"
+           sodipodi:nodetypes="cc"
+           style="fill:#848484;fill-opacity:1;stroke:#848484;stroke-width:1px;stroke-linecap:round;stroke-opacity:1"
+           d="m 161.13952,431.91103 78.478,-0.27394" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3680"
+           sodipodi:nodetypes="cc"
+           style="fill:#848484;fill-opacity:1;stroke:#848484;stroke-width:1px;stroke-linecap:round;stroke-opacity:1"
+           d="m 160.31452,477.87817 79.709,-0.28347" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3684"
+           sodipodi:nodetypes="cc"
+           style="fill:#848484;fill-opacity:1;stroke:#848484;stroke-width:1px;stroke-linecap:round;stroke-opacity:1"
+           d="m 159.30952,524.60817 81.244,-0.28926" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3688"
+           sodipodi:nodetypes="cc"
+           style="fill:#848484;fill-opacity:1;stroke:#848484;stroke-width:1px;stroke-linecap:round;stroke-opacity:1"
+           d="m 158.18952,566.94817 82.994,-0.29494" />
+        <path
+           d="m 161.76452,387.98246 76.978,-0.27394"
+           style="fill:#848484;fill-opacity:1;stroke:#848484;stroke-width:1px;stroke-linecap:round;stroke-opacity:1"
+           sodipodi:nodetypes="cc"
+           id="path4808"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4812"
+           sodipodi:nodetypes="cc"
+           style="fill:#848484;fill-opacity:1;stroke:#848484;stroke-width:1px;stroke-linecap:round;stroke-opacity:1"
+           d="m 163.51452,297.98246 74.228,-0.27394" />
+        <path
+           d="m 164.26452,258.69675 72.978,-0.27394"
+           style="fill:#848484;fill-opacity:1;stroke:#848484;stroke-width:1px;stroke-linecap:round;stroke-opacity:1"
+           sodipodi:nodetypes="cc"
+           id="path4816"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="translate(47.33362,14.828174)"
+         id="g4432" />
+      <path
+         d="m 165.18952,218.78817 c -1.596,-16.461 -5.2711,-28.482 -13.119,-36.087 l -4.64,-145.029996 c 22.23,-1.164 37.44417,-7.981 54.86417,-20.84 13.138,11.337 32.38883,18.381 55.07983,20.459 l -7.7524,145.069996 c -8.3855,8.1329 -12.01,21.511 -12.938,36.535 l -71.499,-0.1078 z"
+         style="fill:#cb8348;fill-opacity:1"
+         sodipodi:nodetypes="ccccccccc"
+         id="path3600"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 165.11952,225.10817 1.3e-4,-7.2264 71.73,-0.0108 0.0109,7.2246 -71.742,0.0125 h -4e-5 z"
+         style="fill:#848484;fill-opacity:1"
+         sodipodi:nodetypes="cccccc"
+         id="path3598"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 175.32095,153.89817 -3.71553,64.139"
+         style="fill:none;fill-opacity:1;stroke:#333333;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         id="path3850"
+         inkscape:connector-curvature="0" />
+      <rect
+         ry="4"
+         rx="4"
+         y="903.90863"
+         x="142.44974"
+         height="24.036032"
+         width="112.85262"
+         id="rect4830"
+         style="opacity:1;fill:#7c503e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         d="m 153.79952,909.79218 h 90.154 c 1.7231,2.4613 1.7868,4.9225 0,7.3838 h -90.154 c -2.0005,-2.6835 -1.494,-5.0885 0,-7.3838 z"
+         style="fill:#848484;fill-opacity:1"
+         sodipodi:nodetypes="ccccc"
+         id="rect2891"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 171.60952,217.86817 -11.493,700.93 -0.002,-0.51617"
+         style="fill:none;fill-opacity:1;stroke:#333333;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="ccc"
+         id="path3602"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 228.55952,144.21817 2.4543,75.727"
+         style="fill:none;fill-opacity:1;stroke:#333333;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3852"
+         inkscape:connector-curvature="0" />
+      <g
+         transform="translate(0.99545365)"
+         id="g4832">
+        <ellipse
+           ry="10.139226"
+           rx="9.7059174"
+           cy="148.53616"
+           cx="177.64957"
+           id="path4040"
+           style="fill:#848484;fill-opacity:1;stroke:none" />
+        <ellipse
+           ry="10.139226"
+           rx="9.7059174"
+           cy="148.67317"
+           cx="225.16457"
+           id="path4040-1"
+           style="fill:#848484;fill-opacity:1;stroke:none" />
+      </g>
+      <path
+         d="M 175.74523,69.771174 191.74952,218.01117"
+         style="fill:none;fill-opacity:1;stroke:#333333;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         id="path3858"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 185.91952,918.70817 5.82,-700.84"
+         style="fill:none;fill-opacity:1;stroke:#333333;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         id="path3604"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 211.87952,218.56817 229.59095,70.615317"
+         style="fill:none;fill-opacity:1;stroke:#333333;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         id="path3856"
+         inkscape:connector-curvature="0" />
+      <g
+         transform="translate(1.0453041)"
+         id="g4804">
+        <ellipse
+           ry="10.139226"
+           rx="9.7059174"
+           cy="76.581169"
+           cx="172.88586"
+           id="path4040-14"
+           style="fill:#848484;fill-opacity:1;stroke:none" />
+        <ellipse
+           ry="10.139226"
+           rx="9.7059174"
+           cy="77.317169"
+           cx="229.82857"
+           id="path4040-8"
+           style="fill:#848484;fill-opacity:1;stroke:none" />
+      </g>
+      <g
+         style="fill:#9e6332;fill-opacity:1;stroke:none"
+         transform="matrix(1.5439892,0,0,1.5454939,184.96621,27.970154)"
+         id="g4384">
+        <path
+           id="path3181"
+           style="fill:#9e6332;fill-opacity:1;stroke:none;stroke-width:0.252178;stroke-opacity:0.15873"
+           sodipodi:type="star"
+           sodipodi:sides="5"
+           inkscape:transform-center-x="0.054854075"
+           sodipodi:r1="23.190037"
+           sodipodi:r2="8.4166965"
+           inkscape:transform-center-y="-1.6456884"
+           sodipodi:arg1="1.2490458"
+           sodipodi:arg2="1.8773643"
+           transform="matrix(0.58302,-0.19098,0.19098,0.58302,-65.804533,-55.201203)"
+           inkscape:randomized="0"
+           sodipodi:cy="157.66667"
+           sodipodi:cx="80.666664"
+           inkscape:rounded="0.01"
+           inkscape:flatsided="false"
+           d="m 87.999997,179.66667 c -0.162334,0.0541 -9.710257,-13.92409 -9.873394,-13.97573 -0.163138,-0.0516 -16.015431,5.88619 -16.117058,5.74852 -0.101628,-0.13767 10.241964,-13.53778 10.240665,-13.7089 -0.0013,-0.17111 -10.547138,-13.41264 -10.447613,-13.55184 0.09953,-0.13919 16.04014,5.55728 16.202474,5.50317 0.162334,-0.0541 9.496941,-14.17566 9.660078,-14.12402 0.163137,0.0516 -0.328613,16.97238 -0.226986,17.11004 0.101627,0.13767 16.416567,4.65161 16.417867,4.82272 0.001,0.17111 -16.243231,4.93222 -16.342756,5.07142 -0.09953,0.13919 0.649057,17.05051 0.486723,17.10462 z" />
+      </g>
+      <path
+         d="m 211.89952,218.26817 0.35021,700.51104"
+         style="fill:none;fill-opacity:1;stroke:#333333;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         id="path3606"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 238.05952,918.4516 235.67625,683.2959 230.95952,217.89817"
+         style="fill:none;fill-opacity:1;stroke:#333333;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="ccc"
+         id="path3608"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>

src/resources.qrc

@@ -80,6 +80,8 @@
         <file>res/instruments/vocalsoprano.png</file>
         <file>res/instruments/banjo.png</file>
         <file>res/instruments/mandolin.png</file>
+        <file>res/instruments/ukulele.png</file>
+        <file>res/instruments/bassukulele.png</file>
     </qresource>
     <qresource prefix="/png/main">
         <file>res/fronticon.png</file>

src/util.cpp

@@ -1017,6 +1017,8 @@ CVector<CInstPictures::CInstPictProps>& CInstPictures::GetTable()
         vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal Soprano" ), ":/png/instr/res/instruments/vocalsoprano.png", IC_OTHER_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", "Ukulele" ), ":/png/instr/res/instruments/ukulele.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;