Merge branch 'stable-1.2'

# Conflicts:
#	cmake/nsis/CMakeLists.txt
#	src/core/ProjectRenderer.cpp
#	src/tracks/Pattern.cpp

cmake/apple/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(MACOSX_BUNDLE_ICON_FILE             "lmms.icns")
+SET(MACOSX_BUNDLE_ICON_FILE             "icon.icns")
 SET(MACOSX_BUNDLE_GUI_IDENTIFIER        "${PROJECT_NAME_UCASE}")
 SET(MACOSX_BUNDLE_LONG_VERSION_STRING   "${VERSION}")
 SET(MACOSX_BUNDLE_BUNDLE_NAME           "${PROJECT_NAME_UCASE}")

cmake/linux/CMakeLists.txt

@@ -1,5 +1,4 @@
-INSTALL(FILES lmms.svg                  DESTINATION "${DATA_DIR}/icons/hicolor/scalable/apps")
-INSTALL(FILES project.svg               DESTINATION "${DATA_DIR}/icons/hicolor/scalable/mimetypes/" RENAME "application-x-lmms-project.svg")
+INSTALL(DIRECTORY icons/                DESTINATION "${DATA_DIR}/icons/hicolor")
 INSTALL(FILES lmms.desktop              DESTINATION "${DATA_DIR}/applications")
 INSTALL(FILES lmms.xml                  DESTINATION "${DATA_DIR}/mime/packages")
 

cmake/linux/icons/scalable/apps/lmms.svg

@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   id="svg4034"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   inkscape:export-filename="64x64@2.png"
+   inkscape:export-xdpi="192"
+   inkscape:export-ydpi="192"
+   sodipodi:docname="lmms.svg">
+  <defs
+     id="defs4036">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4173"
+       x="-0.011714286"
+       width="1.0234286"
+       y="-0.0123"
+       height="1.0246">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.205"
+         id="feGaussianBlur4175" />
+    </filter>
+    <linearGradient
+       gradientTransform="translate(0,32)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient4244-6"
+       id="linearGradient866"
+       x1="35"
+       y1="-14"
+       x2="35"
+       y2="27"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4244-6"
+       inkscape:collect="always">
+      <stop
+         id="stop4428"
+         offset="0"
+         style="stop-color:#27ab5f;stop-opacity:1" />
+      <stop
+         id="stop4430"
+         offset="1"
+         style="stop-color:#249a56;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4142135"
+     inkscape:cx="210.86487"
+     inkscape:cy="3.375495"
+     inkscape:current-layer="svg4034"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="253"
+     inkscape:window-y="1072"
+     inkscape:window-maximized="1"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4042" />
+    <sodipodi:guide
+       position="37,4"
+       orientation="0,1"
+       id="guide4951"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="38,60"
+       orientation="0,1"
+       id="guide4955"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="-19,32"
+       orientation="0,1"
+       id="guide4957"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4039">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     rx="4"
+     y="4"
+     x="4"
+     height="56"
+     width="56"
+     id="rect5093"
+     style="display:inline;opacity:0.98999999;fill:#34d07b;fill-opacity:1;stroke:none;stroke-opacity:1" />
+  <rect
+     rx="3"
+     y="5"
+     x="5"
+     height="54"
+     width="54"
+     id="rect5095"
+     style="display:inline;opacity:1;fill:url(#linearGradient866);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     sodipodi:nodetypes="ccccccccccccccccc"
+     inkscape:connector-curvature="0"
+     id="path5085-3-6"
+     d="M 32,13 11,25 v 24 l 7,4 7,-4 v -8 l -7,-4 v -8 l 14,-8 14,8 v 8 l -7,4 v 8 l 7,4 7,-4 V 25 Z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.97797471;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4173);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     sodipodi:nodetypes="ccccccccccccccccc"
+     inkscape:connector-curvature="0"
+     id="path5085-3"
+     d="M 32,11 11,23 v 24 l 7,4 7,-4 v -8 l -7,-4 v -8 l 14,-8 14,8 v 8 l -7,4 v 8 l 7,4 7,-4 V 23 Z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.97797471;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5497);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+</svg>

cmake/linux/icons/scalable/mimetypes/application-x-lmms-project.svg

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   id="svg4034"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   inkscape:export-filename="/home/umcaruje/d/Dropbox/lmms icons/project-256x256.png"
+   inkscape:export-xdpi="360"
+   inkscape:export-ydpi="360"
+   sodipodi:docname="application-x-lmms-project.svg"
+   enable-background="new">
+  <defs
+     id="defs4036">
+    <linearGradient
+       id="linearGradient4244-6"
+       inkscape:collect="always">
+      <stop
+         id="stop4428"
+         offset="0"
+         style="stop-color:#27ab5f;stop-opacity:1" />
+      <stop
+         id="stop4430"
+         offset="1"
+         style="stop-color:#249a56;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4400"
+       x="-0.024"
+       width="1.048"
+       y="-0.024"
+       height="1.048">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.14999999"
+         id="feGaussianBlur4402" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4244-6"
+       id="linearGradient4432"
+       gradientUnits="userSpaceOnUse"
+       x1="9.8838835"
+       y1="-9.8994951"
+       x2="10.275496"
+       y2="27.930717" />
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4442"
+       x="-0.0116"
+       width="1.0232"
+       y="-0.012428571"
+       height="1.0248571">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.145"
+         id="feGaussianBlur4444" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="4.2102935"
+     inkscape:cy="18.651114"
+     inkscape:current-layer="g4263"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="740"
+     inkscape:window-x="339"
+     inkscape:window-y="1080"
+     inkscape:window-maximized="1"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4042" />
+    <sodipodi:guide
+       position="37,4"
+       orientation="0,1"
+       id="guide4951" />
+    <sodipodi:guide
+       position="38,60"
+       orientation="0,1"
+       id="guide4955" />
+    <sodipodi:guide
+       position="-19,32"
+       orientation="0,1"
+       id="guide4957" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4039">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="g4263"
+     inkscape:label="mimetype"
+     style="display:inline">
+    <g
+       id="g4189">
+      <path
+         sodipodi:nodetypes="ssssssccccs"
+         inkscape:connector-curvature="0"
+         id="path4273"
+         d="m 10,-30 c -1.108,0 -2,0.892 -2,2 l 0,56 c 0,1.108 0.892,2 2,2 l 44,0 c 1.108,0 2,-0.892 2,-2 l 0,-43 c 0,-1 -1,-2 -1,-2 L 43,-29 c 0,0 -1,-1 -2,-1 z"
+         style="display:inline;opacity:1;fill:#34d07b;fill-opacity:1;stroke:none;stroke-opacity:1"
+         transform="translate(0,32)" />
+      <path
+         sodipodi:nodetypes="sssssscccs"
+         inkscape:connector-curvature="0"
+         id="path4275"
+         d="m 10,-29 c -0.554,0 -1,0.446 -1,1 l 0,56 c 0,0.554 0.446,1 1,1 l 44,0 c 0.554,0 1,-0.446 1,-1 l 0,-43 -13,-1 -1,-13 z"
+         style="display:inline;opacity:1;fill:url(#linearGradient4432);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="translate(0,32)" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path4339-5"
+         d="m 40,-29 0,11.999999 c 0,2 1,3 3,3 l 11.999999,0 0,-1 L 41,-29 Z"
+         style="display:inline;opacity:0.12999998;fill:#222222;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4400)"
+         transform="translate(0,32)" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path4339"
+         d="m 41,-29 0,12 c 0,1.03125 0.9375,2 2,2 l 12,0 0,-1 -13,-13 z"
+         style="display:inline;fill:#34d07b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         transform="translate(0,32)" />
+      <path
+         sodipodi:nodetypes="ccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4436"
+         d="m 32,22 -15,8 0,17.5 5,2.5 4.999999,-2.5 0,-6 L 22,39 l 0,-6 10,-5.5 10,5.5 0,6 -4.999999,2.5 0,6 L 42,50 47,47.5 47,30 Z"
+         style="display:inline;color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.97797471;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4442);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.97797471;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5497);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 32,20 -15,8 0,17.5 5,2.5 4.999999,-2.5 0,-6 L 22,37 l 0,-6 10,-5.5 10,5.5 0,6 -4.999999,2.5 0,6 L 42,48 47,45.5 47,28 Z"
+         id="path4265"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccccccccccc" />
+    </g>
+  </g>
+</svg>

cmake/linux/package_linux.sh.in

@@ -102,7 +102,7 @@ cat >"${APPDIR}usr/bin/lmms" <<EOL
 #!/usr/bin/env bash
 DIR="\$( cd "\$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
 if which carla > /dev/null 2>&1; then
-   CARLAPATH="$(which carla)"
+   CARLAPATH="\$(which carla)"
    CARLAPREFIX="\${CARLAPATH%/bin*}"
    echo "Carla appears to be installed on this system at \$CARLAPREFIX/lib[64]/carla so we'll use it."
    export LD_LIBRARY_PATH=\$CARLAPREFIX/lib/carla:\$CARLAPREFIX/lib64/carla:\$LD_LIBRARY_PATH

cmake/modules/BashCompletion.cmake

@@ -0,0 +1,92 @@
+# A wrapper around pkg-config-provided and cmake-provided bash completion that
+# will have dynamic behavior at INSTALL() time to allow both root-level
+# INSTALL() as well as user-level INSTALL().
+#
+# See also https://github.com/scop/bash-completion
+#
+# Copyright (c) 2018, Tres Finocchiaro, <tres.finocchiaro@gmail.com>
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+# Usage:
+#    INCLUDE(BashCompletion)
+#    BASHCOMP_INSTALL(foo)
+#    ... where "foo" is a shell script adjacent to the CMakeLists.txt
+#
+# How it determines BASHCOMP_PKG_PATH, in order:
+#    1. Uses BASHCOMP_PKG_PATH if already set (e.g. -DBASHCOMP_PKG_PATH=...)
+#       a. If not, uses pkg-config's PKG_CHECK_MODULES to determine path
+#       b. Fallback to cmake's FIND_PACKAGE(bash-completion) path
+#       c. Fallback to hard-coded /usr/share/bash-completion/completions
+#    2. Final fallback to ${CMAKE_INSTALL_PREFIX}/share/bash-completion/completions if
+#       detected path is unwritable.
+
+# - Windows does not support bash completion
+# - macOS support should eventually be added for Homebrew (TODO)
+IF(WIN32)
+	MESSAGE(STATUS "Bash competion is not supported on this platform.")
+ELSEIF(APPLE)
+	MESSAGE(STATUS "Bash completion is not yet implemented for this platform.")
+ELSE()
+	INCLUDE(FindUnixCommands)
+	# Honor manual override if provided
+	IF(NOT BASHCOMP_PKG_PATH)
+		# First, use pkg-config, which is the most reliable
+		FIND_PACKAGE(PkgConfig QUIET)
+		IF(PKGCONFIG_FOUND)
+			PKG_CHECK_MODULES(BASH_COMPLETION bash-completion)
+			PKG_GET_VARIABLE(BASHCOMP_PKG_PATH bash-completion completionsdir)
+		ELSE()
+			# Second, use cmake (preferred but less common)
+			FIND_PACKAGE(bash-completion QUIET)
+			IF(BASH_COMPLETION_FOUND)
+				SET(BASHCOMP_PKG_PATH "${BASH_COMPLETION_COMPLETIONSDIR}")
+			ENDIF()
+		ENDIF()
+
+		# Third, use a hard-coded fallback value
+		IF("${BASHCOMP_PKG_PATH}" STREQUAL "")
+			SET(BASHCOMP_PKG_PATH "/usr/share/bash-completion/completions")
+		ENDIF()
+	ENDIF()
+
+	# Always provide a fallback for non-root INSTALL()
+	SET(BASHCOMP_USER_PATH "${CMAKE_INSTALL_PREFIX}/share/bash-completion/completions")
+
+	# Cmake doesn't allow easy use of conditional logic at INSTALL() time
+	# this is a problem because ${BASHCOMP_PKG_PATH} may not be writable and we
+	# need sane fallback behavior for bundled INSTALL() (e.g. .AppImage, etc).
+	#
+	# The reason this can't be detected by cmake is that it's fairly common to
+	# run "cmake" as a one user (i.e. non-root) and "make install" as another user
+	# (i.e. root).
+	#
+	# - Creates a script called "install_${SCRIPT_NAME}_completion.sh" into the
+	#   working binary directory and invokes this script at install.
+	# - Script handles INSTALL()-time conditional logic for sane ballback behavior
+	#   when ${BASHCOMP_PKG_PATH} is unwritable (i.e. non-root); Something cmake
+	#   can't handle on its own at INSTALL() time)
+	MACRO(BASHCOMP_INSTALL SCRIPT_NAME)
+		# A shell script for wrapping conditionl logic
+		SET(BASHCOMP_SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install_${SCRIPT_NAME}_completion.sh")
+
+		FILE(WRITE ${BASHCOMP_SCRIPT} "\
+#!${BASH}\n\
+set -e\n\
+BASHCOMP_PKG_PATH=\"${BASHCOMP_USER_PATH}\"\n\
+if [ -w \"${BASHCOMP_PKG_PATH}\" ]; then\n\
+  BASHCOMP_PKG_PATH=\"${BASHCOMP_PKG_PATH}\"\n\
+fi\n\
+echo -e \"\\nInstalling bash completion...\\n\"\n\
+mkdir -p \"\$BASHCOMP_PKG_PATH\"\n\
+cp \"${CMAKE_CURRENT_SOURCE_DIR}/${SCRIPT_NAME}\" \"\$BASHCOMP_PKG_PATH\"\n\
+chmod a+r \"\$BASHCOMP_PKG_PATH/${SCRIPT_NAME}\"\n\
+echo -e \"Bash completion for ${SCRIPT_NAME} has been installed to \$BASHCOMP_PKG_PATH/${SCRIPT_NAME}\"\n\
+")
+		INSTALL(CODE "EXECUTE_PROCESS(COMMAND chmod u+x \"install_${SCRIPT_NAME}_completion.sh\" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )")
+		INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"./install_${SCRIPT_NAME}_completion.sh\" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )")
+
+		MESSAGE(STATUS "Bash completion script for ${SCRIPT_NAME} will be installed to ${BASHCOMP_PKG_PATH} or fallback to ${BASHCOMP_USER_PATH} if unwritable.")
+	ENDMACRO()
+ENDIF()
+

cmake/nsis/CMakeLists.txt

@@ -2,7 +2,7 @@ SET(CPACK_PACKAGE_ICON                  "${CMAKE_SOURCE_DIR}/cmake/nsis/nsis_bra
 IF(MSVC)
 	STRING(REPLACE "/" "\\\\" CPACK_PACKAGE_ICON ${CPACK_PACKAGE_ICON})
 ENDIF(MSVC)
-SET(CPACK_NSIS_MUI_ICON                 "${CMAKE_SOURCE_DIR}/cmake/nsis/lmms.ico")
+SET(CPACK_NSIS_MUI_ICON                 "${CMAKE_SOURCE_DIR}/cmake/nsis/icon.ico")
 SET(CPACK_NSIS_INSTALLED_ICON_NAME      "${CMAKE_PROJECT_NAME}.exe" PARENT_SCOPE)
 SET(CPACK_NSIS_DISPLAY_NAME             "${PROJECT_NAME_UCASE} ${VERSION}" PARENT_SCOPE)
 SET(CPACK_NSIS_HELP_LINK                "${PROJECT_URL}" PARENT_SCOPE)
@@ -75,3 +75,5 @@ IF(LMMS_HAVE_STK)
 ENDIF()
 
 INSTALL(FILES "lmms.exe.manifest" DESTINATION .)
+INSTALL(FILES "lmms.VisualElementsManifest.xml" DESTINATION .)
+INSTALL(DIRECTORY "assets" DESTINATION .)

cmake/nsis/FileAssociation.nsh

@@ -129,6 +129,7 @@ NoBackup:
     WriteRegStr HKCR "$R0" "" "$R0"
     WriteRegStr HKCR "$R0\shell" "" "open"
 Skip:
+  WriteRegStr HKCR "$R0\DefaultIcon" "" "$R2,1"
   WriteRegStr HKCR "$R0\shell\open\command" "" '"$R2" "%1"'
   WriteRegStr HKCR "$R0\shell\edit" "" "Edit $R0"
   WriteRegStr HKCR "$R0\shell\edit\command" "" '"$R2" "%1"'

cmake/nsis/lmms.VisualElementsManifest.xml

@@ -0,0 +1,9 @@
+<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+  <VisualElements
+      ShowNameOnSquare150x150Logo='on'
+      Square150x150Logo='assets\Logo.png'
+      Square70x70Logo='assets\SmallLogo.png'
+      Square44x44Logo='assets\SmallLogo.png'
+      ForegroundText='light'
+      BackgroundColor='#249A57'/>
+</Application>

cmake/nsis/lmms.rc.in

@@ -1,4 +1,5 @@
-lmmsicon ICON cmake/nsis/lmms.ico
+lmmsicon ICON cmake/nsis/icon.ico
+lmmsprojecticon ICON cmake/nsis/project.ico
 #include <windows.h>
 
 VS_VERSION_INFO VERSIONINFO