Modern UI 1.65

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

Examples/Modern UI/StartMenu.nsi

@@ -1,12 +1,20 @@
-;NSIS Modern User Interface version 1.64
+;NSIS Modern User Interface version 1.65
 ;Start Menu Folder Selection Example Script
 ;Written by Joost Verburg
 
-!define MUI_PRODUCT "Modern UI Test" ;Define your own software name here
-!define MUI_VERSION "1.0" ;Define your own software version here
+!define TEMP $R0
+  
+;--------------------------------
+;Include Modern UI
 
 !include "MUI.nsh"
 
+;--------------------------------
+;Product Info
+
+!define MUI_PRODUCT "Modern UI Test"
+!define MUI_VERSION "1.65"
+
 ;--------------------------------
 ;Configuration
 
@@ -18,9 +26,26 @@
   
   ;Get install folder from registry if available
   InstallDirRegKey HKCU "Software\${MUI_PRODUCT}" ""
+
+;--------------------------------
+;Pages
+
+  !insertmacro MUI_PAGE_LICENSE
+  !insertmacro MUI_PAGE_COMPONENTS
+  !insertmacro MUI_PAGE_DIRECTORY
+  !insertmacro MUI_PAGE_STARTMENU
+  !insertmacro MUI_PAGE_INSTFILES
+  
+  !insertmacro MUI_UNPAGE_CONFIRM
+  !insertmacro MUI_UNPAGE_INSTFILES
+  
+;--------------------------------
+;Modern UI Configuration
+
+  !define MUI_ABORTWARNING
   
   ;$9 is being used to store the Start Menu Folder.
-  ;Do not use this variable in your script (or Push/Pop it)!
+  ;Do not use this variable in your script!
 
   ;To change this variable, use MUI_STARTMENUPAGE_VARIABLE.
   ;Have a look at the Readme for info about other options (default folder,
@@ -31,31 +56,10 @@
   !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\${MUI_PRODUCT}" 
   !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
 
-  !define TEMP $R0
-  
-;--------------------------------
-;Modern UI Configuration
-
-  !define MUI_LICENSEPAGE
-  !define MUI_COMPONENTSPAGE
-  !define MUI_DIRECTORYPAGE
-  !define MUI_STARTMENUPAGE
-  
-  !define MUI_ABORTWARNING
-  
-  !define MUI_UNINSTALLER
-  !define MUI_UNCONFIRMPAGE
-  
 ;--------------------------------
 ;Languages
  
   !insertmacro MUI_LANGUAGE "English"
-  
-;--------------------------------
-;Language Strings
-
-  ;Description
-  LangString DESC_SecCopyUI ${LANG_ENGLISH} "Copy the modern.exe file to the application folder."
 
 ;--------------------------------
 ;Data
@@ -65,7 +69,7 @@
 ;--------------------------------
 ;Installer Sections
 
-Section "modern.exe" SecCopyUI
+Section "Dummy Test File" SecCopyUI
 
   ;ADD YOUR OWN STUFF HERE!
 
@@ -75,6 +79,9 @@ Section "modern.exe" SecCopyUI
   ;Store install folder
   WriteRegStr HKCU "Software\${MUI_PRODUCT}" "" $INSTDIR
   
+  ;Create uninstaller
+  WriteUninstaller "$INSTDIR\Uninstall.exe"
+  
   !insertmacro MUI_STARTMENU_WRITE_BEGIN
     
     ;Create shortcuts
@@ -83,15 +90,14 @@ Section "modern.exe" SecCopyUI
     CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
   
   !insertmacro MUI_STARTMENU_WRITE_END
-  
-  ;Create uninstaller
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
 
 SectionEnd
 
 ;--------------------------------
 ;Descriptions
 
+LangString DESC_SecCopyUI ${LANG_ENGLISH} "Copy modern.exe to the application folder."
+
 !insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SecCopyUI} $(DESC_SecCopyUI)
 !insertmacro MUI_FUNCTIONS_DESCRIPTION_END
@@ -105,6 +111,10 @@ Section "Uninstall"
 
   Delete "$INSTDIR\modern.exe"
   Delete "$INSTDIR\Uninstall.exe"
+
+  RMDir "$INSTDIR"
+
+  DeleteRegKey /ifempty HKCU "Software\${MUI_PRODUCT}"
   
   !insertmacro MUI_STARTMENU_DELETE_BEGIN ${TEMP}
   
@@ -114,8 +124,4 @@ Section "Uninstall"
     
   !insertmacro MUI_STARTMENU_DELETE_END
 
-  RMDir "$INSTDIR"
-
-  DeleteRegKey /ifempty HKCU "Software\${MUI_PRODUCT}"
-
 SectionEnd