From ca5fc30a48a358d42a822eb9ccb559deb9aab894 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Fri, 5 Feb 2016 18:53:43 +0000
Subject: [PATCH] Render NSIS wizard sidebar image

---
 Makefile.am             | 6 +++---
 share/setup.nsi.in      | 4 ++--
 src/Makefile.qt.include | 8 ++++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 35a5d42cda..69186cb248 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,7 +60,7 @@ BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
 
 WINDOWS_PACKAGING = src/qt/res/rendered_icons/bitcoin.ico \
   $(top_srcdir)/share/pixmaps/nsis-header.bmp \
-  $(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
+  src/qt/res/rendered_icons/nsis-wizard.bmp \
   $(top_srcdir)/doc/README_windows.txt
 
 OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_INSTALLER_ICONS) \
@@ -71,14 +71,14 @@ COVERAGE_INFO = $(COV_TOOL_WRAPPER) baseline.info \
   baseline_filtered.info functional_test.info functional_test_filtered.info \
   test_bitcoin_coverage.info test_bitcoin.info fuzz.info fuzz_filtered.info fuzz_coverage.info
 
-$(OSX_INSTALLER_ICONS): FORCE
+src/qt/res/rendered_icons/%: FORCE
 	$(MAKE) -C src $(patsubst src/%,%,$@)
 
 dist-hook:
 	-$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf -
 
 if TARGET_WINDOWS
-$(BITCOIN_WIN_INSTALLER): all-recursive
+$(BITCOIN_WIN_INSTALLER): all-recursive $(WINDOWS_PACKAGING)
 	$(MKDIR_P) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release
diff --git a/share/setup.nsi.in b/share/setup.nsi.in
index 58af804d7e..3d54d572f5 100644
--- a/share/setup.nsi.in
+++ b/share/setup.nsi.in
@@ -16,7 +16,7 @@ Unicode true
 
 # MUI Symbol Definitions
 !define MUI_ICON "@abs_top_srcdir@/src/qt/res/rendered_icons/bitcoin.ico"
-!define MUI_WELCOMEFINISHPAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-wizard.bmp"
+!define MUI_WELCOMEFINISHPAGE_BITMAP "@abs_top_builddir@/src/qt/res/rendered_icons/nsis-wizard.bmp"
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_RIGHT
 !define MUI_HEADERIMAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-header.bmp"
@@ -28,7 +28,7 @@ Unicode true
 !define MUI_FINISHPAGE_RUN "$WINDIR\explorer.exe"
 !define MUI_FINISHPAGE_RUN_PARAMETERS $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
 !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-wizard.bmp"
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP "@abs_top_builddir@/src/qt/res/rendered_icons/nsis-wizard.bmp"
 !define MUI_UNFINISHPAGE_NOAUTOCLOSE
 
 # Included files
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index fe22975797..3d8004e7f0 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -179,8 +179,9 @@ RES_RENDERED_ICONS = \
   qt/res/rendered_icons/bitcoin1024.png
 
 RES_ALL_RENDERED_ICONS = $(RES_RENDERED_ICONS) \
-  $(patsubst %,qt/res/rendered_icons/bitcoin%.png,16 32 48 256 512 1024) \
-  qt/res/rendered_icons/bitcoin.icns
+  $(patsubst %,qt/res/rendered_icons/bitcoin%.png,16 32 48 256 290 512 1024) \
+  qt/res/rendered_icons/bitcoin.icns \
+  qt/res/rendered_icons/nsis-wizard.bmp
 
 QT_RES_ICONS = $(RES_RENDERED_ICONS) \
   qt/res/icons/add.png \
@@ -451,6 +452,9 @@ qt/res/rendered_icons/bitcoin.icns: $(patsubst %,qt/res/rendered_icons/bitcoin%.
 qt/res/rendered_icons/bitcoin.ico: qt/res/rendered_icons/bitcoin32d8.gif $(patsubst %,qt/res/rendered_icons/bitcoin%.png,256 64 48 32 20 16)
 	$(IMAGEMAGICK_CONVERT) $^ $@
 
+qt/res/rendered_icons/nsis-wizard.bmp: qt/res/rendered_icons/bitcoin290.png
+	$(IMAGEMAGICK_CONVERT) $^ -crop 164x290+62+0 -border 0x12 -strip BMP3:$@
+
 else
 
 qt/res/rendered_icons/%: qt/res/icons/%