[popfile-commit] windows installer.nsi,1.242.4.14,1.242.4.15

[Brian S. <xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17420

Modified Files:
      Tag: b0_22_2
	installer.nsi 
Log Message:
The uninstaller now has a FINISH page.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.242.4.14
retrieving revision 1.242.4.15
diff -C2 -d -r1.242.4.14 -r1.242.4.15
*** installer.nsi	14 Oct 2007 17:19:41 -0000	1.242.4.14
--- installer.nsi	18 Oct 2007 01:40:24 -0000	1.242.4.15
***************
*** 531,536 ****
    !define MUI_WELCOMEFINISHPAGE_BITMAP        "special.bmp"
  
    ;----------------------------------------------------------------
!   ;  Interface Settings - Installer FINISH Page Interface Settings
    ;----------------------------------------------------------------
  
--- 531,538 ----
    !define MUI_WELCOMEFINISHPAGE_BITMAP        "special.bmp"
  
+   !define MUI_UNWELCOMEFINISHPAGE_BITMAP      "special.bmp"
+ 
    ;----------------------------------------------------------------
!   ;  Interface Settings - Installer/Uninstaller FINISH Page Interface Settings
    ;----------------------------------------------------------------
  
***************
*** 539,542 ****
--- 541,546 ----
    !define MUI_FINISHPAGE_NOAUTOCLOSE
  
+   !define MUI_UNFINISHPAGE_NOAUTOCLOSE
+ 
    ;----------------------------------------------------------------
    ;  Interface Settings - Abort Warning Settings
***************
*** 777,780 ****
--- 781,802 ----
    !insertmacro MUI_UNPAGE_INSTFILES
  
+   ;---------------------------------------------------
+   ; Uninstaller Page - FINISH
+   ;---------------------------------------------------
+ 
+   ; Override the standard "Uninstall complete" text
+ 
+   !define MUI_FINISHPAGE_TITLE                    "$(PFI_LANG_UN_FINISH_TITLE)"
+   !define MUI_FINISHPAGE_TEXT                     "$(PFI_LANG_UN_FINISH_TEXT)"
+   !define MUI_FINISHPAGE_TITLE_3LINES
+ 
+   ; If we need a reboot then we might have been modifying the installation
+   ; so override the standard "reboot to complete the uninstall" text
+   ; (Quick fix: this is less confusing than having the wrong text on an uninstall)
+ 
+   !define MUI_FINISHPAGE_TEXT_REBOOT              "$(MUI_TEXT_FINISH_INFO_REBOOT)"
+ 
+   !insertmacro MUI_UNPAGE_FINISH
+ 
  #--------------------------------------------------------------------------
  # Language Support for the installer and uninstaller
***************
*** 810,814 ****
    !else
        !include "languages\Japanese-parser.nsh"
- #      !include "languages\English-parser.nsh"
    !endif
  
--- 832,835 ----
***************
*** 867,870 ****
--- 888,892 ----
    ReserveFile "${NSISDIR}\Plugins\NSISdl.dll"
    ReserveFile "${NSISDIR}\Plugins\System.dll"
+   ReserveFile "${NSISDIR}\Plugins\UAC.dll"
    ReserveFile "${NSISDIR}\Plugins\untgz.dll"
    ReserveFile "${NSISDIR}\Plugins\UserInfo.dll"
***************
*** 873,876 ****
--- 895,899 ----
    ReserveFile "ioG.ini"
    ReserveFile "ioP.ini"
+   ReserveFile "ioUM.ini"
    ReserveFile "${C_RELEASE_NOTES}"
    ReserveFile "${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}.pcf"