[Gpg4win-commits] r1307 - in trunk: . doc/logo src

[scm-commit@wald.intevation.org]

Author: emanuel
Date: 2009-12-18 16:13:10 +0100 (Fri, 18 Dec 2009)
New Revision: 1307

Added:
   trunk/doc/logo/gpg4win-nsis-header-install-150x57.bmp
   trunk/doc/logo/gpg4win-nsis-header-uninstall-150x57.bmp
   trunk/doc/logo/gpg4win-nsis-install.ico
   trunk/doc/logo/gpg4win-nsis-uninstall.ico
   trunk/doc/logo/gpg4win-nsis-wizard-install-164x314.bmp
   trunk/doc/logo/gpg4win-nsis-wizard-uninstall-164x314.bmp
Modified:
   trunk/ChangeLog
   trunk/src/installer.nsi
Log:
Added new bitmap and icons for nsis installer.



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-12-15 15:23:34 UTC (rev 1306)
+++ trunk/ChangeLog	2009-12-18 15:13:10 UTC (rev 1307)
@@ -1,3 +1,14 @@
+2009-12-18  Emanuel Schuetze  <emanuel.schuetze at 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 at intevation.de>
 
 	* packages/packages.current: Update gnupg, kleopatra and kdelibs.

Added: trunk/doc/logo/gpg4win-nsis-header-install-150x57.bmp
===================================================================
(Binary files differ)


Property changes on: trunk/doc/logo/gpg4win-nsis-header-install-150x57.bmp
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/doc/logo/gpg4win-nsis-header-uninstall-150x57.bmp
===================================================================
(Binary files differ)


Property changes on: trunk/doc/logo/gpg4win-nsis-header-uninstall-150x57.bmp
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/doc/logo/gpg4win-nsis-install.ico
===================================================================
(Binary files differ)


Property changes on: trunk/doc/logo/gpg4win-nsis-install.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/doc/logo/gpg4win-nsis-uninstall.ico
===================================================================
(Binary files differ)


Property changes on: trunk/doc/logo/gpg4win-nsis-uninstall.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/doc/logo/gpg4win-nsis-wizard-install-164x314.bmp
===================================================================
(Binary files differ)


Property changes on: trunk/doc/logo/gpg4win-nsis-wizard-install-164x314.bmp
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/doc/logo/gpg4win-nsis-wizard-uninstall-164x314.bmp
===================================================================
(Binary files differ)


Property changes on: trunk/doc/logo/gpg4win-nsis-wizard-uninstall-164x314.bmp
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi	2009-12-15 15:23:34 UTC (rev 1306)
+++ trunk/src/installer.nsi	2009-12-18 15:13:10 UTC (rev 1307)
@@ -61,8 +61,6 @@
 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 @@
 !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,10 +181,11 @@
 
 # Uninstaller pages.
 
+!insertmacro MUI_UNPAGE_WELCOME
 !insertmacro MUI_UNPAGE_CONFIRM
 !insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
 
-
 #Page license
 #Page components
 #Page directory