From a28a854112d7e0634d91aa63874d422eba686d38 Mon Sep 17 00:00:00 2001 From: joostverburg Date: Fri, 15 Nov 2002 18:46:19 +0000 Subject: [PATCH] new modern ui git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1741 212acab6-be3b-0410-9dea-997c60f758d6 --- Examples/makensis.nsi | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi index d88ce8bd..728fabc2 100644 --- a/Examples/makensis.nsi +++ b/Examples/makensis.nsi @@ -14,12 +14,21 @@ SetCompressor bzip2 !include "${NSISDIR}\Contrib\Modern UI\System.nsh" + !define MUI_WELCOMEPAGE !define MUI_LICENSEPAGE !define MUI_COMPONENTSPAGE !define MUI_DIRECTORYPAGE + !define MUI_FINISHPAGE + + !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\makensis.htm" + !define MUI_FINISHPAGE_NOREBOOTSUPPORT + !define MUI_ABORTWARNING !define MUI_UNINSTALLER + ;NSIS updates no system files + !define MUI_TEXT_WELCOME_INFO "\r\n\r\nThis will install ${MUI_PRODUCT} on your computer.\r\n\r\n\r\n\r\n" + !insertmacro MUI_LANGUAGE "English" !define MUI_UI "${NSISDIR}\Contrib\UIs\modern2.exe" @@ -34,7 +43,6 @@ InstType "Full (w/ Source and Contrib)" InstType "Normal (w/ Contrib, w/o Source)" InstType "Lite (w/o Source or Contrib)" -AutoCloseWindow false ShowInstDetails show ShowUninstDetails show SetOverwrite on @@ -43,6 +51,10 @@ SetDateSave on InstallDir $PROGRAMFILES\NSIS InstallDirRegKey HKLM SOFTWARE\NSIS "" +!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS +!insertmacro MUI_RESERVEFILE_WIZARDINI +!insertmacro MUI_RESERVEFILE_WIZARDBITMAP + Section "NSIS Development System (required)" SecCore SectionIn 1 2 3 RO SetOutPath $INSTDIR @@ -459,6 +471,10 @@ SectionEnd SubSectionEnd SubSectionEnd +Function .onInit + !insertmacro MUI_WELCOMEFINISHPAGE_INIT +FunctionEnd + Function AddContribToStartMenu Pop $0 ; link Pop $1 ; file @@ -607,16 +623,8 @@ Section -post nofunshit: Delete $INSTDIR\uninst-nsis.exe WriteUninstaller $INSTDIR\uninst-nsis.exe -!ifndef CLASSIC_UI - !insertmacro MUI_FINISHHEADER -!endif -SectionEnd -Function .onInstSuccess - MessageBox MB_YESNO|MB_ICONQUESTION "Setup has completed. View readme file now?" IDNO NoReadme - ExecShell open '$INSTDIR\makensis.htm' - NoReadme: -FunctionEnd +SectionEnd !ifndef CLASSIC_UI