compatible with new modern ui

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1436 212acab6-be3b-0410-9dea-997c60f758d6

Examples/makensis.nsi

@@ -11,9 +11,18 @@
 !endif
 !verbose 4
 
-;Language
+!ifndef CLASSIC_UI
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
+  ;Modern UI defines
-!include "${NSISDIR}\Contrib\Modern UI\Language Files\English.nsh"
+  !define MUI_LICENSEPAGE
+  !define MUI_COMPONENTPAGE
+  !define MUI_DIRSELECTPAGE
+  !define MUI_ABORTWARNING
+  !define MUI_UNINSTALLER
+
+  ;Language
+  LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
+  !include "${NSISDIR}\Contrib\Modern UI\Language Files\English.nsh"
+!endif
 
 Name "NSIS"
 Caption "Nullsoft Install System - Setup"
@@ -24,10 +33,8 @@ SetCompressor bzip2
 !insertmacro MUI_INTERFACE "modern2.exe" "modern-install.ico" "modern-uninstall.ico" "modern.bmp" "smooth" "Tahoma" "$9"
 !endif
 
-LicenseText "Scroll down to see the rest of the agreement."
 LicenseData ..\license.txt
 
-ComponentText "This will install the Nullsoft Install System v${VER_MAJOR}.${VER_MINOR} on your computer:"
 InstType "Full (w/ Source and Contrib)"
 InstType "Normal (w/ Contrib, w/o Source)"
 InstType "Lite (w/o Source or Contrib)"
@@ -35,7 +42,6 @@ InstType "Lite (w/o Source or Contrib)"
 AutoCloseWindow false
 ShowInstDetails show
 ShowUninstDetails show
-DirText "Please select a location to install NSIS (or use the default):" " "
 SetOverwrite on
 SetDateSave on
 
@@ -644,8 +650,6 @@ Function .onMouseOverSection
 FunctionEnd
 !endif
 
-UninstallText "This will uninstall NSIS from your system:"
-
 Section Uninstall
   IfFileExists $INSTDIR\makensis.exe skip_confirmation
     MessageBox MB_YESNO "It does not appear that NSIS is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)" IDYES skip_confirmation