[popfile-commit] windows CBP.nsh,1.18,1.19 installer.nsi,1.93,1.94

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-serv9613

Modified Files:
	CBP.nsh installer.nsi 
Log Message:
Use consistent format for message boxes.

Index: CBP.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/CBP.nsh,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** CBP.nsh	21 Jul 2003 14:20:25 -0000	1.18
--- CBP.nsh	27 Jul 2003 00:19:04 -0000	1.19
***************
*** 1220,1224 ****
  name_exists:
    MessageBox MB_OK|MB_ICONEXCLAMATION \
!       "$(PFI_LANG_CBP_MBDUPERR_1) $\"${CBP_L_CREATE_NAME}$\" $(PFI_LANG_CBP_MBDUPERR_2)$\n$\n\
        $(PFI_LANG_CBP_MBDUPERR_3)"
    goto get_next_bucket_cmd
--- 1220,1225 ----
  name_exists:
    MessageBox MB_OK|MB_ICONEXCLAMATION \
!       "$(PFI_LANG_CBP_MBDUPERR_1) $\"${CBP_L_CREATE_NAME}$\" $(PFI_LANG_CBP_MBDUPERR_2)\
!       $\r$\n$\r$\n\
        $(PFI_LANG_CBP_MBDUPERR_3)"
    goto get_next_bucket_cmd
***************
*** 1226,1230 ****
  too_many:
    MessageBox MB_OK|MB_ICONINFORMATION \
!       "$(PFI_LANG_CBP_MBMAXERR_1) ${CBP_C_MAX_BNCOUNT} $(PFI_LANG_CBP_MBMAXERR_2)$\n$\n\
        $(PFI_LANG_CBP_MBMAXERR_3) ${CBP_C_MAX_BNCOUNT} $(PFI_LANG_CBP_MBMAXERR_2)"
    goto get_next_bucket_cmd
--- 1227,1232 ----
  too_many:
    MessageBox MB_OK|MB_ICONINFORMATION \
!       "$(PFI_LANG_CBP_MBMAXERR_1) ${CBP_C_MAX_BNCOUNT} $(PFI_LANG_CBP_MBMAXERR_2)\
!       $\r$\n$\r$\n\
        $(PFI_LANG_CBP_MBMAXERR_3) ${CBP_C_MAX_BNCOUNT} $(PFI_LANG_CBP_MBMAXERR_2)"
    goto get_next_bucket_cmd
***************
*** 1232,1237 ****
  bad_name:
    MessageBox MB_OK|MB_ICONEXCLAMATION \
!       "$(PFI_LANG_CBP_MBNAMERR_1) $\"${CBP_L_CREATE_NAME}$\" $(PFI_LANG_CBP_MBNAMERR_2)$\n$\n\
!       $(PFI_LANG_CBP_MBNAMERR_3)$\n$\n\
        $(PFI_LANG_CBP_MBNAMERR_4)"
    goto get_next_bucket_cmd
--- 1234,1241 ----
  bad_name:
    MessageBox MB_OK|MB_ICONEXCLAMATION \
!       "$(PFI_LANG_CBP_MBNAMERR_1) $\"${CBP_L_CREATE_NAME}$\" $(PFI_LANG_CBP_MBNAMERR_2)\
!       $\r$\n$\r$\n\
!       $(PFI_LANG_CBP_MBNAMERR_3)\
!       $\r$\n$\r$\n\
        $(PFI_LANG_CBP_MBNAMERR_4)"
    goto get_next_bucket_cmd
***************
*** 1241,1246 ****
    IntCmp ${CBP_L_COUNT} 1 too_few
    MessageBox MB_YESNO|MB_ICONQUESTION \
!       "${CBP_L_COUNT} $(PFI_LANG_CBP_MBDONE_1)$\n$\n\
!       $(PFI_LANG_CBP_MBDONE_2)$\n$\n\
        $(PFI_LANG_CBP_MBDONE_3)" IDYES finished_buckets
    goto get_next_bucket_cmd
--- 1245,1252 ----
    IntCmp ${CBP_L_COUNT} 1 too_few
    MessageBox MB_YESNO|MB_ICONQUESTION \
!       "${CBP_L_COUNT} $(PFI_LANG_CBP_MBDONE_1)\
!       $\r$\n$\r$\n\
!       $(PFI_LANG_CBP_MBDONE_2)\
!       $\r$\n$\r$\n\
        $(PFI_LANG_CBP_MBDONE_3)" IDYES finished_buckets
    goto get_next_bucket_cmd
***************
*** 1248,1252 ****
  need_buckets:
    MessageBox MB_OK|MB_ICONINFORMATION \
!       "$(PFI_LANG_CBP_MBCONTERR_1)$\n$\n\
        $(PFI_LANG_CBP_MBCONTERR_2)"
    goto get_next_bucket_cmd
--- 1254,1259 ----
  need_buckets:
    MessageBox MB_OK|MB_ICONINFORMATION \
!       "$(PFI_LANG_CBP_MBCONTERR_1)\
!       $\r$\n$\r$\n\
        $(PFI_LANG_CBP_MBCONTERR_2)"
    goto get_next_bucket_cmd
***************
*** 1268,1272 ****
    MessageBox MB_OK|MB_ICONEXCLAMATION \
        "$(PFI_LANG_CBP_MBMAKERR_1) ${CBP_L_RESULT} $(PFI_LANG_CBP_MBMAKERR_2) ${CBP_L_COUNT} \
!       $(PFI_LANG_CBP_MBMAKERR_3)$\n$\n$(PFI_LANG_CBP_MBMAKERR_4)"
  
  finished_now:
--- 1275,1281 ----
    MessageBox MB_OK|MB_ICONEXCLAMATION \
        "$(PFI_LANG_CBP_MBMAKERR_1) ${CBP_L_RESULT} $(PFI_LANG_CBP_MBMAKERR_2) ${CBP_L_COUNT} \
!       $(PFI_LANG_CBP_MBMAKERR_3)\
!       $\r$\n$\r$\n\
!       $(PFI_LANG_CBP_MBMAKERR_4)"
  
  finished_now:

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** installer.nsi	23 Jul 2003 18:31:13 -0000	1.93
--- installer.nsi	27 Jul 2003 00:19:04 -0000	1.94
***************
*** 93,105 ****
--- 93,111 ----
    !define C_RELEASE_NOTES "..\engine\${C_README}"
  
+   ;-----------------------------------------
    ; Root directory for the Perl files used to build the installer
+   ;-----------------------------------------
  
    !define C_PERL_DIR      "C:\Perl"
    
+   ;-----------------------------------------
    ; Delay (in milliseconds) used after issuing a POPFile 'shutdown' request
+   ;-----------------------------------------
    
    !define C_SHUTDOWN_DELAY    1500
  
+   ;-----------------------------------------
    ; Define PFI_VERBOSE to get more compiler output
+   ;-----------------------------------------
  
  # !define PFI_VERBOSE
***************
*** 202,206 ****
    ; (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
--- 208,212 ----
    ; (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
***************
*** 424,428 ****
    SearchPath ${G_NOTEPAD} notepad.exe
    MessageBox MB_YESNO|MB_ICONQUESTION \
!       "$(PFI_LANG_MBRELNOTES_1)$\r$\n$\r$\n$(PFI_LANG_MBRELNOTES_2)" IDNO exit
    StrCmp ${G_NOTEPAD} "" use_file_association
    ExecWait 'notepad.exe "$PLUGINSDIR\release.txt"'
--- 430,436 ----
    SearchPath ${G_NOTEPAD} notepad.exe
    MessageBox MB_YESNO|MB_ICONQUESTION \
!       "$(PFI_LANG_MBRELNOTES_1)\
!       $\r$\n$\r$\n\
!       $(PFI_LANG_MBRELNOTES_2)" IDNO exit
    StrCmp ${G_NOTEPAD} "" use_file_association
    ExecWait 'notepad.exe "$PLUGINSDIR\release.txt"'
***************
*** 498,504 ****
    IfFileExists "$INSTDIR\stopwords" 0 copy_stopwords
    MessageBox MB_YESNO|MB_ICONQUESTION \
!       "POPFile 'stopwords' $(PFI_LANG_MBSTPWDS_1)$\r$\n$\r$\n\
!       $(PFI_LANG_MBSTPWDS_2)$\r$\n$\r$\n\
!       $(PFI_LANG_MBSTPWDS_3) 'stopwords.bak')$\r$\n$\r$\n\
        $(PFI_LANG_MBSTPWDS_4) 'stopwords.default')" IDNO copy_default_stopwords
    IfFileExists "$INSTDIR\stopwords.bak" 0 make_backup
--- 506,515 ----
    IfFileExists "$INSTDIR\stopwords" 0 copy_stopwords
    MessageBox MB_YESNO|MB_ICONQUESTION \
!       "POPFile 'stopwords' $(PFI_LANG_MBSTPWDS_1)\
!       $\r$\n$\r$\n\
!       $(PFI_LANG_MBSTPWDS_2)\
!       $\r$\n$\r$\n\
!       $(PFI_LANG_MBSTPWDS_3) 'stopwords.bak')\
!       $\r$\n$\r$\n\
        $(PFI_LANG_MBSTPWDS_4) 'stopwords.default')" IDNO copy_default_stopwords
    IfFileExists "$INSTDIR\stopwords.bak" 0 make_backup
***************
*** 524,528 ****
        "$(PFI_LANG_MBCFGBK_1) 'popfile.cfg' $(PFI_LANG_MBCFGBK_2) ('popfile.cfg.bak').\
        $\r$\n$\r$\n\
!       $(PFI_LANG_MBCFGBK_3)$\r$\n$\r$\n\
        $(PFI_LANG_MBCFGBK_4)" IDNO update_config
    SetFileAttributes "$INSTDIR\popfile.cfg.bak" NORMAL
--- 535,540 ----
        "$(PFI_LANG_MBCFGBK_1) 'popfile.cfg' $(PFI_LANG_MBCFGBK_2) ('popfile.cfg.bak').\
        $\r$\n$\r$\n\
!       $(PFI_LANG_MBCFGBK_3)\
!       $\r$\n$\r$\n\
        $(PFI_LANG_MBCFGBK_4)" IDNO update_config
    SetFileAttributes "$INSTDIR\popfile.cfg.bak" NORMAL
***************
*** 1155,1160 ****
  
    MessageBox MB_YESNO|MB_ICONEXCLAMATION \
!       "$(PFI_LANG_OPTIONS_MBUNINST_1) '$INSTDIR'$\r$\n$\r$\n\
!       $(PFI_LANG_OPTIONS_MBUNINST_2)$\r$\n$\r$\n\
        ($(PFI_LANG_OPTIONS_MBUNINST_3))" IDNO continue
  
--- 1167,1174 ----
  
    MessageBox MB_YESNO|MB_ICONEXCLAMATION \
!       "$(PFI_LANG_OPTIONS_MBUNINST_1) '$INSTDIR'\
!       $\r$\n$\r$\n\
!       $(PFI_LANG_OPTIONS_MBUNINST_2)\
!       $\r$\n$\r$\n\
        ($(PFI_LANG_OPTIONS_MBUNINST_3))" IDNO continue
  
***************
*** 1258,1263 ****
  bad_pop3:
    MessageBox MB_OK|MB_ICONEXCLAMATION \
!       "$(PFI_LANG_OPTIONS_MBPOP3_1) $\"${G_POP3}$\"'.$\n$\n\
!       $(PFI_LANG_OPTIONS_MBPOP3_2)$\n$\n\
        $(PFI_LANG_OPTIONS_MBPOP3_3)"
    Goto bad_exit
--- 1272,1279 ----
  bad_pop3:
    MessageBox MB_OK|MB_ICONEXCLAMATION \
!       "$(PFI_LANG_OPTIONS_MBPOP3_1) $\"${G_POP3}$\"'.\
!       $\r$\n$\r$\n\
!       $(PFI_LANG_OPTIONS_MBPOP3_2)\
!       $\r$\n$\r$\n\
        $(PFI_LANG_OPTIONS_MBPOP3_3)"
    Goto bad_exit
***************
*** 1273,1278 ****
  bad_gui:
    MessageBox MB_OK|MB_ICONEXCLAMATION \
!       "$(PFI_LANG_OPTIONS_MBGUI_1) $\"${G_GUI}$\".$\n$\n\
!       $(PFI_LANG_OPTIONS_MBGUI_2)$\n$\n\
        $(PFI_LANG_OPTIONS_MBGUI_3)"
    Goto bad_exit
--- 1289,1296 ----
  bad_gui:
    MessageBox MB_OK|MB_ICONEXCLAMATION \
!       "$(PFI_LANG_OPTIONS_MBGUI_1) $\"${G_GUI}$\".\
!       $\r$\n$\r$\n\
!       $(PFI_LANG_OPTIONS_MBGUI_2)\
!       $\r$\n$\r$\n\
        $(PFI_LANG_OPTIONS_MBGUI_3)"
    Goto bad_exit
***************
*** 1280,1284 ****
  ports_must_differ:
    MessageBox MB_OK|MB_ICONEXCLAMATION \
!       "$(PFI_LANG_OPTIONS_MBDIFF_1)$\n$\n\
        $(PFI_LANG_OPTIONS_MBDIFF_2)"
  
--- 1298,1303 ----
  ports_must_differ:
    MessageBox MB_OK|MB_ICONEXCLAMATION \
!       "$(PFI_LANG_OPTIONS_MBDIFF_1)\
!       $\r$\n$\r$\n\
        $(PFI_LANG_OPTIONS_MBDIFF_2)"
  
***************
*** 1812,1816 ****
    IfFileExists $INSTDIR\popfile.pl skip_confirmation
      MessageBox MB_YESNO|MB_ICONSTOP|MB_DEFBUTTON2 \
!         "$(un.PFI_LANG_MBNOTFOUND_1) '$INSTDIR'.$\r$\n$\r$\n\
          $(un.PFI_LANG_MBNOTFOUND_2)" IDYES skip_confirmation
      Abort "$(un.PFI_LANG_ABORT_1)"
--- 1831,1836 ----
    IfFileExists $INSTDIR\popfile.pl skip_confirmation
      MessageBox MB_YESNO|MB_ICONSTOP|MB_DEFBUTTON2 \
!         "$(un.PFI_LANG_MBNOTFOUND_1) '$INSTDIR'.\
!         $\r$\n$\r$\n\
          $(un.PFI_LANG_MBNOTFOUND_2)" IDYES skip_confirmation
      Abort "$(un.PFI_LANG_ABORT_1)"