Added new bitmap and icons for nsis installer.
authorEmanuel Schuetze <emanuel.schuetze@intevation.de>
Fri, 18 Dec 2009 15:13:10 +0000 (15:13 +0000)
committerEmanuel Schuetze <emanuel.schuetze@intevation.de>
Fri, 18 Dec 2009 15:13:10 +0000 (15:13 +0000)
ChangeLog
doc/logo/gpg4win-nsis-header-install-150x57.bmp [new file with mode: 0644]
doc/logo/gpg4win-nsis-header-uninstall-150x57.bmp [new file with mode: 0644]
doc/logo/gpg4win-nsis-install.ico [new file with mode: 0644]
doc/logo/gpg4win-nsis-uninstall.ico [new file with mode: 0644]
doc/logo/gpg4win-nsis-wizard-install-164x314.bmp [new file with mode: 0644]
doc/logo/gpg4win-nsis-wizard-uninstall-164x314.bmp [new file with mode: 0644]
src/installer.nsi

index 5250229..5f862b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-18  Emanuel Schuetze  <emanuel.schuetze@intevation.de>
+
+       * src/installer.nsi,
+         doc/logo/gpg4win-nsis-wizard-install-164x314.bmp,
+         doc/logo/gpg4win-nsis-wizard-uninstall-164x314.bmp,
+         doc/logo/gpg4win-nsis-install.ico,
+         doc/logo/gpg4win-nsis-header-install-150x57.bmp,
+         doc/logo/gpg4win-nsis-uninstall.ico,
+         doc/logo/gpg4win-nsis-header-uninstall-150x57.bmp:
+         Add new bitmaps and icons for nsis installer.
+
 2009-12-15  Emanuel Schuetze  <emanuel.schuetze@intevation.de>
 
        * packages/packages.current: Update gnupg, kleopatra and kdelibs.
diff --git a/doc/logo/gpg4win-nsis-header-install-150x57.bmp b/doc/logo/gpg4win-nsis-header-install-150x57.bmp
new file mode 100644 (file)
index 0000000..82199ee
Binary files /dev/null and b/doc/logo/gpg4win-nsis-header-install-150x57.bmp differ
diff --git a/doc/logo/gpg4win-nsis-header-uninstall-150x57.bmp b/doc/logo/gpg4win-nsis-header-uninstall-150x57.bmp
new file mode 100644 (file)
index 0000000..78c49df
Binary files /dev/null and b/doc/logo/gpg4win-nsis-header-uninstall-150x57.bmp differ
diff --git a/doc/logo/gpg4win-nsis-install.ico b/doc/logo/gpg4win-nsis-install.ico
new file mode 100644 (file)
index 0000000..59007bd
Binary files /dev/null and b/doc/logo/gpg4win-nsis-install.ico differ
diff --git a/doc/logo/gpg4win-nsis-uninstall.ico b/doc/logo/gpg4win-nsis-uninstall.ico
new file mode 100644 (file)
index 0000000..db2297c
Binary files /dev/null and b/doc/logo/gpg4win-nsis-uninstall.ico differ
diff --git a/doc/logo/gpg4win-nsis-wizard-install-164x314.bmp b/doc/logo/gpg4win-nsis-wizard-install-164x314.bmp
new file mode 100644 (file)
index 0000000..23975db
Binary files /dev/null and b/doc/logo/gpg4win-nsis-wizard-install-164x314.bmp differ
diff --git a/doc/logo/gpg4win-nsis-wizard-uninstall-164x314.bmp b/doc/logo/gpg4win-nsis-wizard-uninstall-164x314.bmp
new file mode 100644 (file)
index 0000000..30680a7
Binary files /dev/null and b/doc/logo/gpg4win-nsis-wizard-uninstall-164x314.bmp differ
index b006d20..3822c7d 100644 (file)
@@ -61,8 +61,6 @@ OutFile "${PACKAGE}-light-${VERSION}.exe"
 OutFile "${PACKAGE}-${VERSION}.exe"
 !endif
 
-Icon "${TOP_SRCDIR}/doc/logo/gpg4win-logo-icon.ico"
-UninstallIcon "${TOP_SRCDIR}/doc/logo/gpg4win-logo-icon.ico"
 
 # Set the installation directory.
 !ifndef INSTALL_DIR
@@ -110,11 +108,17 @@ Var OtherGnuPGDetected
 !define MUI_FINISHPAGE_NOAUTOCLOSE
 !define MUI_UNFINISHPAGE_NOAUTOCLOSE
 
-#!define MUI_HEADERIMAGE
-#!define MUI_HEADERIMAGE_BITMAP \
-#               "${TOP_SRCDIR}/doc/logo/gpg4win-logo-150x57.bmp"
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP \
+               "${TOP_SRCDIR}/doc/logo/gpg4win-nsis-header-install-150x57.bmp"
+!define MUI_HEADERIMAGE_UNBITMAP \
+               "${TOP_SRCDIR}/doc/logo/gpg4win-nsis-header-uninstall-150x57.bmp"
 !define MUI_WELCOMEFINISHPAGE_BITMAP \
-               "${TOP_SRCDIR}/doc/logo/gpg4win-logo-164x314.bmp"
+               "${TOP_SRCDIR}/doc/logo/gpg4win-nsis-wizard-install-164x314.bmp"
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP \
+               "${TOP_SRCDIR}/doc/logo/gpg4win-nsis-wizard-uninstall-164x314.bmp"
+!define MUI_ICON "${TOP_SRCDIR}/doc/logo/gpg4win-nsis-install.ico"
+!define MUI_UNICON "${TOP_SRCDIR}/doc/logo/gpg4win-nsis-uninstall.ico"
 
 # Remember the installer language
 
@@ -177,9 +181,10 @@ Var STARTMENU_FOLDER
 
 # Uninstaller pages.
 
+!insertmacro MUI_UNPAGE_WELCOME
 !insertmacro MUI_UNPAGE_CONFIRM
 !insertmacro MUI_UNPAGE_INSTFILES
-
+!insertmacro MUI_UNPAGE_FINISH
 
 #Page license
 #Page components