From 6c9498147fb4bd6e1a79eaaa0c93a558a57a0caf Mon Sep 17 00:00:00 2001 From: Jay Weisskopf Date: Mon, 11 Jul 2011 02:09:07 -0500 Subject: [PATCH 1/3] Add logos/branding currently found on bitcoin.org into NSIS installer. --- share/pixmaps/nsis-header.bmp | Bin 0 -> 25818 bytes share/pixmaps/nsis-wizard.bmp | Bin 0 -> 154542 bytes share/setup.nsi | 5 +++++ 3 files changed, 5 insertions(+) create mode 100644 share/pixmaps/nsis-header.bmp create mode 100644 share/pixmaps/nsis-wizard.bmp diff --git a/share/pixmaps/nsis-header.bmp b/share/pixmaps/nsis-header.bmp new file mode 100644 index 0000000000000000000000000000000000000000..9ab0ce2591d21cce2408983986b7c97c2d1c476f GIT binary patch literal 25818 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 literal 0 HcmV?d00001 diff --git a/share/pixmaps/nsis-wizard.bmp b/share/pixmaps/nsis-wizard.bmp new file mode 100644 index 0000000000000000000000000000000000000000..71255c6850b00ef1efea82fefd05ff736c90f816 GIT binary patch literal 154542 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 Date: Mon, 11 Jul 2011 02:11:15 -0500 Subject: [PATCH 2/3] Set default compression for NSIS installer to LZMA. Use of LZMA (versus the current zlib) shaves a few MB off the installer. --- share/setup.nsi | 1 + 1 file changed, 1 insertion(+) diff --git a/share/setup.nsi b/share/setup.nsi index cd39aa39..022eea82 100644 --- a/share/setup.nsi +++ b/share/setup.nsi @@ -1,6 +1,7 @@ Name Bitcoin RequestExecutionLevel highest +SetCompressor /SOLID lzma # General Symbol Definitions !define REGKEY "SOFTWARE\$(^Name)" From aa0bcaaf2be4bbb7729d307fffec13b7ef0cb806 Mon Sep 17 00:00:00 2001 From: Jay Weisskopf Date: Tue, 12 Jul 2011 01:18:57 -0500 Subject: [PATCH 3/3] Remove NSIS branding from bottom divider. --- share/setup.nsi | 1 + 1 file changed, 1 insertion(+) diff --git a/share/setup.nsi b/share/setup.nsi index 022eea82..888c8ea5 100644 --- a/share/setup.nsi +++ b/share/setup.nsi @@ -49,6 +49,7 @@ OutFile bitcoin-0.3.24-win32-setup.exe InstallDir $PROGRAMFILES\Bitcoin CRCCheck on XPStyle on +BrandingText " " ShowInstDetails show VIProductVersion 0.3.24.0 VIAddVersionKey ProductName Bitcoin