Menu
▾
▴
[popfile-commit] windows getparser.nsh, 1.1.2.5, 1.1.2.6 getssl.nsh, 1.6.2.23, 1.6.2.24
|
From: Brian S. <xue...@us...> - 2008-04-02 20:19:38
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27073 Modified Files: Tag: b0_22_2 getparser.nsh getssl.nsh Log Message: The 1 April 2008 version of the Inetc plugin now hides the "details" so there is no longer any need to disable/enable the "Show Details" button. Index: getssl.nsh =================================================================== RCS file: /cvsroot/popfile/windows/getssl.nsh,v retrieving revision 1.6.2.23 retrieving revision 1.6.2.24 diff -C2 -d -r1.6.2.23 -r1.6.2.24 *** getssl.nsh 4 Mar 2008 14:55:01 -0000 1.6.2.23 --- getssl.nsh 2 Apr 2008 20:19:42 -0000 1.6.2.24 *************** *** 50,54 **** ; to the appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 11 August 2007 19:06:24 ;------------------------------------------------ --- 50,54 ---- ; to the appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 1 April 2008 10:33:06 ;------------------------------------------------ *************** *** 280,288 **** ; WARNING: The 'untgz' plugin is hard-coded to use $R0 ! !define L_DLG_ITEM $R1 ; used to disable/enable the "Show Details" button ! !define L_LISTSIZE $R2 ; number of patches to be applied Push ${L_RESULT} - Push ${L_DLG_ITEM} Push ${L_LISTSIZE} --- 280,286 ---- ; WARNING: The 'untgz' plugin is hard-coded to use $R0 ! !define L_LISTSIZE $R1 ; number of patches to be applied Push ${L_RESULT} Push ${L_LISTSIZE} *************** *** 372,386 **** StrCpy $G_PATCH_SOURCE "${C_INTERNET}" ; this means "download the latest SSL patches" - ; Unlike the NSISdl plugin shipped with NSIS, the Inetc plugin leaves the "Show Details" - ; button in view so we temporarily disable it during the download to avoid a messy display - ; (if the user has already clicked the button then they'll just need to put up with the mess) - ; - ; In order to avoid screen flicker effects as a result of downloading several files, we - ; disable the button "for the duration" instead of disabling/enabling it for every transfer - - FindWindow ${L_DLG_ITEM} "#32770" "" $HWNDPARENT - GetDlgItem ${L_DLG_ITEM} ${L_DLG_ITEM} 0x403 - EnableWindow ${L_DLG_ITEM} 0 - ; Download the SSL archives and OpenSSL DLLs --- 370,373 ---- *************** *** 497,504 **** MessageBox MB_OK|MB_ICONSTOP "$(PFI_LANG_MB_UNPACKFAIL)" - ; Enable the "Show Details" button now that we have stopped downloading files - - EnableWindow ${L_DLG_ITEM} 1 - !ifdef INSTALLER installer_error_exit: --- 484,487 ---- *************** *** 616,620 **** File "/oname=$PLUGINSDIR\${C_PATCH_CTRL_FILE}" "${C_PATCH_CTRL_FILE}" ! ; 0.22.5 release does not need any SSL patches so "SSL_pm.pat" is not needed here ; File /nonfatal "/oname=$PLUGINSDIR\SSL_pm.pat" "SSL_pm.pat" --- 599,603 ---- File "/oname=$PLUGINSDIR\${C_PATCH_CTRL_FILE}" "${C_PATCH_CTRL_FILE}" ! ; The 0.22.5, 1.0.0 and 1.0.1 releases do not need any SSL patches so "SSL_pm.pat" is not needed here ; File /nonfatal "/oname=$PLUGINSDIR\SSL_pm.pat" "SSL_pm.pat" *************** *** 674,681 **** Pop ${L_RESULT} - ; Enable the "Show Details" button now that we have stopped downloading files - - EnableWindow ${L_DLG_ITEM} 1 - ; Are there any patches to be applied? --- 657,660 ---- *************** *** 705,714 **** Pop ${L_LISTSIZE} - Pop ${L_DLG_ITEM} Pop ${L_RESULT} !undef L_RESULT - - !undef L_DLG_ITEM !undef L_LISTSIZE --- 684,690 ---- Index: getparser.nsh =================================================================== RCS file: /cvsroot/popfile/windows/Attic/getparser.nsh,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** getparser.nsh 8 Feb 2008 14:48:48 -0000 1.1.2.5 --- getparser.nsh 2 Apr 2008 20:19:42 -0000 1.1.2.6 *************** *** 4,17 **** # POPFile uses a 'Nihongo Parser' to split the text into words # to allow the text to be analysed properly. POPFile 0.22.5 ! # (and earlier) only supported the 'Kakasi' parser. The 1.0.0 ! # release offers a choice of three parsers (Kakasi, MeCab and ! # internal. To make it easier to change the Nihongo Parser ! # the 1.0.0 release creates a "Change" option in the "Add/Remove ! # Programs" entry for POPFile. This new option is handled by the ! # POPFile uninstaller. # # The 'MeCab' parser is too big (about 13 MB) to include in the ! # installer so it is downloaded from the Internet when the user ! # selects this parser. # # Since the installer and uninstaller both need to offer a choice --- 4,17 ---- # POPFile uses a 'Nihongo Parser' to split the text into words # to allow the text to be analysed properly. POPFile 0.22.5 ! # (and earlier) only supported the 'Kakasi' parser. Starting ! # with the 1.0.0 release POPFile offers a choice of 3 parsers ! # (Kakasi, MeCab and internal). To make it easier to change ! # the Nihongo Parser a "Change" option is created in the ! # "Add/Remove Programs" entry for POPFile. This new option ! # is handled by the POPFile uninstaller. # # The 'MeCab' parser is too big (about 13 MB) to include in the ! # installer so if necessary it is downloaded from the Internet ! # when the user selects the MeCab parser. # # Since the installer and uninstaller both need to offer a choice *************** *** 53,57 **** ; to the appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 11 August 2007 19:06:24 ;------------------------------------------------ --- 53,57 ---- ; to the appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 1 April 2008 10:33:06 ;------------------------------------------------ *************** *** 108,112 **** !define C_NPD_MD5SUMS "http://getpopfile.org/installer/nihongo/mecab/${C_MD5SUMS_FILE}" !define C_NPD_MECAB_MD5 "http://getpopfile.org/installer/nihongo/mecab/${C_MECAB_MD5}" ! !define C_NPD_MECAB_PERL "http://getpopfile.org/installer/nihongo/mecab/MeCab.tar.gz" !define C_NPD_MECAB_DICT "http://getpopfile.org/installer/nihongo/mecab/mecab-ipadic.zip" --- 108,112 ---- !define C_NPD_MD5SUMS "http://getpopfile.org/installer/nihongo/mecab/${C_MD5SUMS_FILE}" !define C_NPD_MECAB_MD5 "http://getpopfile.org/installer/nihongo/mecab/${C_MECAB_MD5}" ! !define C_NPD_MECAB_PERL "http://getpopfile.org/installer/nihongo/mecab/MeCab.tar.gz" !define C_NPD_MECAB_DICT "http://getpopfile.org/installer/nihongo/mecab/mecab-ipadic.zip" *************** *** 381,395 **** AddSize 43000 ! !define L_RESERVED $0 ; used in system.dll call !define L_RESULT $R0 ; result from 'GetMeCabFile' function or the 'untgz' plugin ; WARNING: The 'untgz' plugin is hard-coded to use $R0 ! !define L_DLG_ITEM $R1 ; used to disable/enable the "Show Details" button ! !define L_LISTSIZE $R2 ; number of patches to be applied Push ${L_RESERVED} Push ${L_RESULT} - Push ${L_DLG_ITEM} Push ${L_LISTSIZE} --- 381,393 ---- AddSize 43000 ! !define L_RESERVED $0 ; used in system.dll call !define L_RESULT $R0 ; result from 'GetMeCabFile' function or the 'untgz' plugin ; WARNING: The 'untgz' plugin is hard-coded to use $R0 ! !define L_LISTSIZE $R1 ; number of patches to be applied Push ${L_RESERVED} Push ${L_RESULT} Push ${L_LISTSIZE} *************** *** 401,415 **** !insertmacro NIHONGO_PERL_SUPPORT "mecab" - ; Unlike the NSISdl plugin shipped with NSIS, the Inetc plugin leaves the "Show Details" - ; button in view so we temporarily disable it during the download to avoid a messy display - ; (if the user has already clicked the button then they'll just need to put up with the mess) - ; - ; In order to avoid screen flicker effects as a result of downloading several files, we - ; disable the button "for the duration" instead of disabling/enabling it for every transfer - - FindWindow ${L_DLG_ITEM} "#32770" "" $HWNDPARENT - GetDlgItem ${L_DLG_ITEM} ${L_DLG_ITEM} 0x403 - EnableWindow ${L_DLG_ITEM} 0 - ; Use MD5 sums to check the integrity of the Mecab files we download --- 399,402 ---- *************** *** 490,497 **** MessageBox MB_OK|MB_ICONSTOP "$(PFI_LANG_MB_UNPACKFAIL)" - ; Enable the "Show Details" button now that we have stopped downloading files - - EnableWindow ${L_DLG_ITEM} 1 - installer_error_exit: StrCpy $G_PLS_FIELD_1 "(undefined)" --- 477,480 ---- *************** *** 559,563 **** Pop ${L_LISTSIZE} - Pop ${L_DLG_ITEM} Pop ${L_RESULT} Pop ${L_RESERVED} --- 542,545 ---- *************** *** 566,571 **** !undef L_RESULT - - !undef L_DLG_ITEM !undef L_LISTSIZE --- 548,551 ---- |
