From: Brian S. <xue...@us...> - 2005-09-02 17:07:18
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31077 Modified Files: installer-Uninstall.nsh installer.nsi Log Message: Stop using an anonymous "Language Selection" dialog for the main installer and uninstaller wizards. Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.260 retrieving revision 1.261 diff -C2 -d -r1.260 -r1.261 *** installer.nsi 12 Aug 2005 12:58:23 -0000 1.260 --- installer.nsi 2 Sep 2005 17:07:04 -0000 1.261 *************** *** 467,474 **** ;---------------------------------------------------------------- ! ; Same "Language selection" dialog is used for the installer and the uninstaller ! ; so we override the standard "Installer Language" title to avoid confusion. ! !define MUI_LANGDLL_WINDOWTITLE "Language Selection" ; Always show the language selection dialog, even if a language has been stored in the --- 467,473 ---- ;---------------------------------------------------------------- ! ; Override the standard "Installer Language" title for the language selection dialogue ! !define MUI_LANGDLL_WINDOWTITLE "POPFile Installer Language Selection" ; Always show the language selection dialog, even if a language has been stored in the Index: installer-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** installer-Uninstall.nsh 12 Aug 2005 12:58:23 -0000 1.3 --- installer-Uninstall.nsh 2 Sep 2005 17:07:03 -0000 1.4 *************** *** 61,64 **** --- 61,69 ---- ; (if the language entry is not found in the registry, a 'language selection' dialog is shown) + ; Use a different "Language selection" dialog title for the uninstaller + + !undef MUI_LANGDLL_WINDOWTITLE + !define MUI_LANGDLL_WINDOWTITLE "POPFile Uninstaller Language Selection" + !insertmacro MUI_UNGETLANGUAGE |