[popfile-commit] windows installer.nsi,1.82,1.83

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv27939

Modified Files:
	installer.nsi 
Log Message:
Message boxes now use icons. Uninstall 'not found' message box now defaults to 'No' button.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** installer.nsi	3 Jul 2003 12:05:15 -0000	1.82
--- installer.nsi	8 Jul 2003 08:16:22 -0000	1.83
***************
*** 10,14 ****
  #--------------------------------------------------------------------------

! ; Modified to work with NSIS 2.0b4 (CVS) or later

  #--------------------------------------------------------------------------
--- 10,14 ----
  #--------------------------------------------------------------------------

! ; Modified to work with NSIS 2.0b4 (CVS) [ MAKENSIS.EXE dated 28 June 2003 @ 06:44 or later ]

  #--------------------------------------------------------------------------
***************
*** 24,53 ****
  # LANGUAGE SUPPORT:
  #
! # The installer defaults to supporting a number of languages (the default is 'English').
  #
  # If required, a command-line switch can be used to build an English-only version.
  #
! # Normal multi-language build command:  makensis installer.nsi
  #
! # To build an English-only installer:   makensis /DENGLISH_ONLY installer.nsi
  #
  # To remove any of the additional languages, only TWO lines need to be commented-out:
- #
  # (a) comment-out the relevant '!insertmacro PFI_LANG_LOAD' line in the list of languages
  #     in the 'Language Support for the installer and uninstaller' block of code
- #
  # (b) comment-out the relevant '!insertmacro UI_LANG_CONFIG' line in the list of languages
  #     in the code which handles the 'UI Languages' component
  #
  # For example, to remove support for the 'Dutch' language, comment-out the line
- #
  #     !insertmacro PFI_LANG_LOAD "Dutch"
- #
  # in the list of languages supported by the installer, and comment-out the line
- #
  #     !insertmacro UI_LANG_CONFIG "DUTCH" "Nederlands"
- #
  # in the code which handles the 'UI Languages' component (Section "Languages").
  #
  # The number of languages which can be supported depends upon the availability of:
  #
--- 24,52 ----
  # LANGUAGE SUPPORT:
  #
! # The installer defaults to multi-language mode ('English' plus a number of other languages).
  #
  # If required, a command-line switch can be used to build an English-only version.
  #
! # Normal multi-language build command:  makensis.exe installer.nsi
! # To build an English-only installer:   makensis.exe  /DENGLISH_ONLY installer.nsi
  #
! #--------------------------------------------------------------------------
! # Removing support for a particular language:
  #
  # To remove any of the additional languages, only TWO lines need to be commented-out:
  # (a) comment-out the relevant '!insertmacro PFI_LANG_LOAD' line in the list of languages
  #     in the 'Language Support for the installer and uninstaller' block of code
  # (b) comment-out the relevant '!insertmacro UI_LANG_CONFIG' line in the list of languages
  #     in the code which handles the 'UI Languages' component
  #
  # For example, to remove support for the 'Dutch' language, comment-out the line
  #     !insertmacro PFI_LANG_LOAD "Dutch"
  # in the list of languages supported by the installer, and comment-out the line
  #     !insertmacro UI_LANG_CONFIG "DUTCH" "Nederlands"
  # in the code which handles the 'UI Languages' component (Section "Languages").
  #
+ #--------------------------------------------------------------------------
+ # Adding support for a particular language (it must be supported by NSIS):
+ #
  # The number of languages which can be supported depends upon the availability of:
  #
***************
*** 56,65 ****
  #     (2) an up-to-date NSIS MUI Language file ({NSIS}\Contrib\Modern UI\Language files\*.nsh)
  #
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- # At present (02 July 2003) support for 'Bulgarian' and 'Danish' has been disabled (as described
- # above) because in these two cases the corresponding NLF file is out-of-step and this could
- # result in the wrong messages being displayed during the installation.
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- #
  # To add support for a language which is already supported by the NSIS MUI package, two files
  # are required:
--- 55,58 ----
***************
*** 76,79 ****
--- 69,78 ----
  # 'Languages' component to allow the installer to select the appropriate UI language.
  #--------------------------------------------------------------------------
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ # At present (02 July 2003) support for 'Bulgarian' and 'Danish' has been disabled (as described
+ # above) because in these two cases the corresponding NLF file is out-of-step and this could
+ # result in wrong/missing messages during the installation.
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ #--------------------------------------------------------------------------

    ; POPFile constants have been given names beginning with 'C_' (eg C_README)
***************
*** 173,180 ****
    ;-----------------------------------------

!   ; Select either "accept/do not accept" radio buttons or "accept" checkbox for the license page

- #  !define MUI_LICENSEPAGE_RADIOBUTTONS
    !define MUI_LICENSEPAGE_CHECKBOX

    ;-----------------------------------------
--- 172,183 ----
    ;-----------------------------------------

!   ; Three styles of 'License Agreement' page are available:
!   ; (1) New style with an 'I accept' checkbox below the license window
!   ; (2) New style with 'I accept/I do not accept' radio buttons below the license window
!   ; (3) Classic style with the 'Next' button replaced by an 'Agree' button
!   ;     (to get the 'Classic' style,  comment-out the CHECKBOX and the RADIOBUTTONS 'defines')

    !define MUI_LICENSEPAGE_CHECKBOX
+ #  !define MUI_LICENSEPAGE_RADIOBUTTONS

    ;-----------------------------------------
***************
*** 341,354 ****

  # [02 July 03] "Bulgarian" disabled because the main NSIS NLF language file is out of date
! #        !insertmacro PFI_LANG_LOAD "Bulgarian"    ; NSIS MUI file out-of-date as of 27-Jun-03
! 
          !insertmacro PFI_LANG_LOAD "SimpChinese"
          !insertmacro PFI_LANG_LOAD "TradChinese"
- 
  # [02 July 03]  "Danish" disabled because the main NSIS NLF language file is out of date
! #        !insertmacro PFI_LANG_LOAD "Danish"       ; NSIS MUI file out-of-date as of 27-Jun-03
! 
          !insertmacro PFI_LANG_LOAD "Dutch"
!         !insertmacro PFI_LANG_LOAD "Finnish"      ; NSIS MUI file out-of-date as of 27-Jun-03
          !insertmacro PFI_LANG_LOAD "French"
          !insertmacro PFI_LANG_LOAD "German"
--- 344,354 ----

  # [02 July 03] "Bulgarian" disabled because the main NSIS NLF language file is out of date
! #        !insertmacro PFI_LANG_LOAD "Bulgarian"    ; 'New style' license msgs missing (27-Jun-03)
          !insertmacro PFI_LANG_LOAD "SimpChinese"
          !insertmacro PFI_LANG_LOAD "TradChinese"
  # [02 July 03]  "Danish" disabled because the main NSIS NLF language file is out of date
! #        !insertmacro PFI_LANG_LOAD "Danish"       ; 'New style' license msgs missing (27-Jun-03)
          !insertmacro PFI_LANG_LOAD "Dutch"
!         !insertmacro PFI_LANG_LOAD "Finnish"      ; 'New style' license msgs missing (27-Jun-03)
          !insertmacro PFI_LANG_LOAD "French"
          !insertmacro PFI_LANG_LOAD "German"
***************
*** 441,445 ****
    StrCpy ${L_TXT} "$(PFI_LANG_MBRELNOTES_2)"
    StrCpy ${L_MSG} "${L_MSG}$\r$\n$\r$\n${L_TXT}"
!   MessageBox MB_YESNO ${L_MSG} IDNO exit
    StrCmp ${G_NOTEPAD} "" use_file_association
    ExecWait 'notepad.exe "$PLUGINSDIR\release.txt"'
--- 441,445 ----
    StrCpy ${L_TXT} "$(PFI_LANG_MBRELNOTES_2)"
    StrCpy ${L_MSG} "${L_MSG}$\r$\n$\r$\n${L_TXT}"
!   MessageBox MB_YESNO|MB_ICONQUESTION ${L_MSG} IDNO exit
    StrCmp ${G_NOTEPAD} "" use_file_association
    ExecWait 'notepad.exe "$PLUGINSDIR\release.txt"'
***************
*** 532,536 ****
    StrCpy ${L_TXT} "$(PFI_LANG_MBSTPWDS_4)"
    StrCpy ${L_MSG} "${L_MSG}${L_TXT} 'stopwords.default')"
!   MessageBox MB_YESNO ${L_MSG} IDNO copy_default_stopwords
    IfFileExists "$INSTDIR\stopwords.bak" 0 make_backup
    SetFileAttributes "$INSTDIR\stopwords.bak" NORMAL
--- 532,536 ----
    StrCpy ${L_TXT} "$(PFI_LANG_MBSTPWDS_4)"
    StrCpy ${L_MSG} "${L_MSG}${L_TXT} 'stopwords.default')"
!   MessageBox MB_YESNO|MB_ICONQUESTION ${L_MSG} IDNO copy_default_stopwords
    IfFileExists "$INSTDIR\stopwords.bak" 0 make_backup
    SetFileAttributes "$INSTDIR\stopwords.bak" NORMAL
***************
*** 559,563 ****
    StrCpy ${L_TXT} "$(PFI_LANG_MBCFGBK_4)"
    StrCpy ${L_MSG} "${L_MSG}${L_TXT}"
!   MessageBox MB_YESNO "${L_MSG}" IDNO update_config
    SetFileAttributes "$INSTDIR\popfile.cfg.bak" NORMAL

--- 559,563 ----
    StrCpy ${L_TXT} "$(PFI_LANG_MBCFGBK_4)"
    StrCpy ${L_MSG} "${L_MSG}${L_TXT}"
!   MessageBox MB_YESNO|MB_ICONQUESTION "${L_MSG}" IDNO update_config
    SetFileAttributes "$INSTDIR\popfile.cfg.bak" NORMAL

***************
*** 822,835 ****

          !insertmacro UI_LANG_CONFIG "ENGLISH" "English"
- 
  # [02 July 03] "Bulgarian" disabled because the main NSIS NLF language file is out of date
  #        !insertmacro UI_LANG_CONFIG "BULGARIAN" "Bulgarian"
- 
          !insertmacro UI_LANG_CONFIG "SIMPCHINESE" "Chinese-Simplified"
          !insertmacro UI_LANG_CONFIG "TRADCHINESE" "Chinese-Traditional"
- 
  # [02 July 03]  "Danish" disabled because the main NSIS NLF language file is out of date
  #        !insertmacro UI_LANG_CONFIG "DANISH" "Dansk"
- 
          !insertmacro UI_LANG_CONFIG "DUTCH" "Nederlands"
          !insertmacro UI_LANG_CONFIG "FINNISH" "Suomi"
--- 822,831 ----
***************
*** 1280,1284 ****
    StrCpy ${L_TXT} "$(PFI_LANG_OPTIONS_MBPOP3_3)"
    StrCpy ${L_MSG} "${L_MSG}${L_TXT}"
!   MessageBox MB_OK ${L_MSG}
    Goto bad_exit

--- 1276,1280 ----
    StrCpy ${L_TXT} "$(PFI_LANG_OPTIONS_MBPOP3_3)"
    StrCpy ${L_MSG} "${L_MSG}${L_TXT}"
!   MessageBox MB_OK|MB_ICONEXCLAMATION ${L_MSG}
    Goto bad_exit

***************
*** 1297,1301 ****
    StrCpy ${L_TXT} "$(PFI_LANG_OPTIONS_MBGUI_3)"
    StrCpy ${L_MSG} "${L_MSG}${L_TXT}"
!   MessageBox MB_OK ${L_MSG}
    Goto bad_exit

--- 1293,1297 ----
    StrCpy ${L_TXT} "$(PFI_LANG_OPTIONS_MBGUI_3)"
    StrCpy ${L_MSG} "${L_MSG}${L_TXT}"
!   MessageBox MB_OK|MB_ICONEXCLAMATION ${L_MSG}
    Goto bad_exit

***************
*** 1304,1308 ****
    StrCpy ${L_TXT} "$(PFI_LANG_OPTIONS_MBDIFF_2)"
    StrCpy ${L_MSG} "${L_MSG}$\n$\n${L_TXT}"
!   MessageBox MB_OK ${L_MSG}

  bad_exit:
--- 1300,1304 ----
    StrCpy ${L_TXT} "$(PFI_LANG_OPTIONS_MBDIFF_2)"
    StrCpy ${L_MSG} "${L_MSG}$\n$\n${L_TXT}"
!   MessageBox MB_OK|MB_ICONEXCLAMATION ${L_MSG}

  bad_exit:
***************
*** 2103,2107 ****
      StrCpy ${L_TEMP} "$(un.PFI_LANG_MBNOTFOUND_2)"
      StrCpy ${L_MSG} "${L_MSG} '$INSTDIR'.$\r$\n$\r$\n${L_TEMP}"
!     MessageBox MB_YESNO "${L_MSG}" IDYES skip_confirmation
      Abort "$(un.PFI_LANG_ABORT_1)"

--- 2099,2103 ----
      StrCpy ${L_TEMP} "$(un.PFI_LANG_MBNOTFOUND_2)"
      StrCpy ${L_MSG} "${L_MSG} '$INSTDIR'.$\r$\n$\r$\n${L_TEMP}"
!     MessageBox MB_YESNO|MB_ICONSTOP|MB_DEFBUTTON2 "${L_MSG}" IDYES skip_confirmation
      Abort "$(un.PFI_LANG_ABORT_1)"