diff --git a/installer.nsi b/installer.nsi index 1d063c2db..8a89eb6fd 100644 --- a/installer.nsi +++ b/installer.nsi @@ -261,42 +261,10 @@ IntOp ${Var} $0 - $1 !define StrRPos "!insertmacro StrRPos" -;-------------------------------- -;Pages - - - - !insertmacro MUI_PAGE_LICENSE "resources/license.txt" - !insertmacro MUI_PAGE_COMPONENTS - !insertmacro MUI_PAGE_DIRECTORY - ;!insertmacro CUSTOM_PAGE_JREINFO - ;!insertmacro CUSTOM_PAGE_FLASHINFO - -var SMDir - -!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${APP_NAME}" -!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" -!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_UNINSTKEY}" -!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Inno Setup: Icon Group" - !insertmacro MUI_PAGE_STARTMENU 0 $SMDir - ;Page custom CUSTOM_PAGE_CONTEXTMENU - !insertmacro MUI_PAGE_INSTFILES - ;Page custom CUSTOM_PAGE_HELPUS -!define MUI_FINISHPAGE_RUN "$INSTDIR\${APP_EXENAME}" - !insertmacro MUI_PAGE_FINISH - - - !insertmacro MUI_UNPAGE_CONFIRM - !insertmacro MUI_UNPAGE_INSTFILES ;-------------------------------- ;Languages - - - - - !define !IfExist `!insertmacro _!IfExist ""` !define !IfNExist `!insertmacro _!IfExist "n"` @@ -350,6 +318,36 @@ var SMDir !insertmacro LANG_LOAD "Italian" +;-------------------------------- +;Pages + + + + !insertmacro MUI_PAGE_LICENSE "resources/license.txt" + !insertmacro MUI_PAGE_COMPONENTS + !insertmacro MUI_PAGE_DIRECTORY + ;!insertmacro CUSTOM_PAGE_JREINFO + ;!insertmacro CUSTOM_PAGE_FLASHINFO + +var SMDir + +!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${APP_NAME}" +!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" +!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_UNINSTKEY}" +!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Inno Setup: Icon Group" + !insertmacro MUI_PAGE_STARTMENU 0 $SMDir + ;Page custom CUSTOM_PAGE_CONTEXTMENU + !insertmacro MUI_PAGE_INSTFILES + ;Page custom CUSTOM_PAGE_HELPUS +!define MUI_FINISHPAGE_RUN "$INSTDIR\${APP_EXENAME}" + !insertmacro MUI_PAGE_FINISH + + + !insertmacro MUI_UNPAGE_CONFIRM + !insertmacro MUI_UNPAGE_INSTFILES + + + ;-------------------------------- ;Installer Sections