Render NSIS wizard sidebar image

This commit is contained in:
Luke Dashjr 2016-02-05 18:53:43 +00:00
parent 52122c588a
commit ca5fc30a48
3 changed files with 11 additions and 7 deletions

View File

@ -60,7 +60,7 @@ BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
WINDOWS_PACKAGING = src/qt/res/rendered_icons/bitcoin.ico \ WINDOWS_PACKAGING = src/qt/res/rendered_icons/bitcoin.ico \
$(top_srcdir)/share/pixmaps/nsis-header.bmp \ $(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 $(top_srcdir)/doc/README_windows.txt
OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_INSTALLER_ICONS) \ 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 \ 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 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/%,%,$@) $(MAKE) -C src $(patsubst src/%,%,$@)
dist-hook: dist-hook:
-$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf - -$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf -
if TARGET_WINDOWS if TARGET_WINDOWS
$(BITCOIN_WIN_INSTALLER): all-recursive $(BITCOIN_WIN_INSTALLER): all-recursive $(WINDOWS_PACKAGING)
$(MKDIR_P) $(top_builddir)/release $(MKDIR_P) $(top_builddir)/release
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release

View File

@ -16,7 +16,7 @@ Unicode true
# MUI Symbol Definitions # MUI Symbol Definitions
!define MUI_ICON "@abs_top_srcdir@/src/qt/res/rendered_icons/bitcoin.ico" !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
!define MUI_HEADERIMAGE_RIGHT !define MUI_HEADERIMAGE_RIGHT
!define MUI_HEADERIMAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-header.bmp" !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 "$WINDIR\explorer.exe"
!define MUI_FINISHPAGE_RUN_PARAMETERS $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@ !define MUI_FINISHPAGE_RUN_PARAMETERS $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" !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 !define MUI_UNFINISHPAGE_NOAUTOCLOSE
# Included files # Included files

View File

@ -179,8 +179,9 @@ RES_RENDERED_ICONS = \
qt/res/rendered_icons/bitcoin1024.png qt/res/rendered_icons/bitcoin1024.png
RES_ALL_RENDERED_ICONS = $(RES_RENDERED_ICONS) \ RES_ALL_RENDERED_ICONS = $(RES_RENDERED_ICONS) \
$(patsubst %,qt/res/rendered_icons/bitcoin%.png,16 32 48 256 512 1024) \ $(patsubst %,qt/res/rendered_icons/bitcoin%.png,16 32 48 256 290 512 1024) \
qt/res/rendered_icons/bitcoin.icns qt/res/rendered_icons/bitcoin.icns \
qt/res/rendered_icons/nsis-wizard.bmp
QT_RES_ICONS = $(RES_RENDERED_ICONS) \ QT_RES_ICONS = $(RES_RENDERED_ICONS) \
qt/res/icons/add.png \ 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) 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) $^ $@ $(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 else
qt/res/rendered_icons/%: qt/res/icons/% qt/res/rendered_icons/%: qt/res/icons/%