fixes
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1818 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg
parent
83b92fb6ea
commit
74bbed5a13
2 changed files with 41 additions and 74 deletions
|
|
@ -155,6 +155,13 @@ you should always escape it ($\"), because the Modern UI macro's use "
|
|||
!define MUI_UNINSTALLER ;Uninstaller
|
||||
!define MUI_UNCUSTOMPAGECOMMANDS ;Use customized uninstaller pages
|
||||
!define MUI_UNCUSTOMGUIINIT ;Use customized un.onGUIInit function
|
||||
</pre>
|
||||
<p class="text">You can also use a LangString for the Readme and Run filenames,
|
||||
if you have different files for different languages:</p>
|
||||
<pre class="margin">
|
||||
LangString FILE_README ${LANG_ENGLISH} "$INSTDIR\Readme-English.txt"
|
||||
|
||||
!define MUI_FINISHPAGE_SHOWREADME "$(FILE_README)"
|
||||
</pre>
|
||||
<p class="subheader">4. Insert language files</p>
|
||||
<p class="text">Insert the Modern UI language files for the languages you are using:</p>
|
||||
|
|
@ -240,8 +247,7 @@ Section "Section Name 2" SectionName2
|
|||
SectionEnd
|
||||
</pre>
|
||||
<p class="header">Custom pages</p>
|
||||
<p class="text">Have a look at the <a href="..\InstallOptions\Install Options.html">
|
||||
Install Options documentation</a> for info about creating Install Options INI Files.</p>
|
||||
<p class="text">
|
||||
<p class="subheader">Custom page commands</p>
|
||||
<p class="text">If you want add custom pages to your installer, you should insert your
|
||||
own page commands to set the order of the pages and the names of the page functions.</p>
|
||||
|
|
@ -258,16 +264,31 @@ Page custom FunctionName $(TEXT_IO_WINDOWTITLE) ;A custom page
|
|||
</pre>
|
||||
<p class="text">This is also possible in the uninstaller:</p>
|
||||
<pre class="margin">
|
||||
LangString UNTEXT_IO_WINDOWTITLE ": Install Options Page Title"
|
||||
LangString un.UNTEXT_IO_WINDOWTITLE ": Install Options Page Title"
|
||||
|
||||
!insertmacro MUI_UNPAGECOMMAND_CONFIRM
|
||||
UninstPage custom FunctionName $(TEXT_IO_WINDOWTITLE) ;A custom page
|
||||
UninstPage custom un.FunctionName $(UNTEXT_IO_WINDOWTITLE) ;A custom page
|
||||
!insertmacro MUI_UNPAGECOMMAND_INSTFILES
|
||||
</pre>
|
||||
<p class="text">Don't forget to define MUI_CUSTOMPAGECOMMANDS or
|
||||
MUI_UNCUSTOMPAGECOMMANDS before inserting the MUI_SYSTEM macro.</p>
|
||||
<p class="subheader">Call Install Options</p>
|
||||
<p class="text">You can call Install Options in FunctionName:</p>
|
||||
<p class="text">First, you need to extract your InstallOptions INI
|
||||
File in the .onInit function (un.onInit for the uninstaller):</p>
|
||||
<pre class="margin">
|
||||
Function .onInit
|
||||
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioFile.ini"
|
||||
FunctionEnd
|
||||
|
||||
Function FunctionName
|
||||
!insertmacro MUI_HEADER_TEXT "$(TEXT_IO_TITLE)" "$(TEXT_IO_SUBTITLE)"
|
||||
!insertmacro MUI_INSTALLOPTIONS_SHOW "ioFile.ini"
|
||||
FunctionEnd
|
||||
</pre>
|
||||
<p class="text">Have a look at the <a href="..\InstallOptions\Install Options.html">
|
||||
Install Options documentation</a> for info about creating Install Options INI Files.</p>
|
||||
<p class="text">You can call Install Options in the function defined with the Page
|
||||
or UninstPage command:</p>
|
||||
<pre class="margin">
|
||||
LangString TEXT_IO_TITLE ${LANG_ENGLISH} "Install Options Page Title"
|
||||
LangString TEXT_IO_SUBTITLE ${LANG_ENGLISH} "A subtitle"
|
||||
|
|
|
|||
|
|
@ -441,10 +441,8 @@
|
|||
!verbose 3
|
||||
|
||||
!ifndef MUI_UNCUSTOMPAGECOMMANDS
|
||||
|
||||
!insertmacro MUI_UNPAGECOMMAND_CONFIRM
|
||||
!insertmacro MUI_UNPAGECOMMAND_INSTFILES
|
||||
|
||||
!endif
|
||||
|
||||
!verbose 4
|
||||
|
|
@ -971,15 +969,17 @@
|
|||
|
||||
!insertmacro MUI_INSTALLOPTIONS_READ ${MUI_TEMP1} "ioSpecial.ini" "Field 4" "State"
|
||||
|
||||
StrCmp ${MUI_TEMP1} "1" "" +2
|
||||
Exec '"${MUI_FINISHPAGE_RUN}"'
|
||||
StrCmp ${MUI_TEMP1} "1" "" +3
|
||||
StrCpy ${MUI_TEMP1} ${MUI_FINISHPAGE_RUN}
|
||||
ExecShell "open" '"${MUI_TEMP1}"'
|
||||
|
||||
!ifdef MUI_FINISHPAGE_SHOWREADME
|
||||
|
||||
!insertmacro MUI_INSTALLOPTIONS_READ ${MUI_TEMP1} "ioSpecial.ini" "Field 5" "State"
|
||||
|
||||
StrCmp ${MUI_TEMP1} "1" "" +2
|
||||
ExecShell "open" '"${MUI_FINISHPAGE_SHOWREADME}"'
|
||||
StrCmp ${MUI_TEMP1} "1" "" +3
|
||||
StrCpy ${MUI_TEMP1} ${MUI_FINISHPAGE_SHOWREADME}
|
||||
ExecShell "open" '"${MUI_TEMP1}"'
|
||||
|
||||
!endif
|
||||
|
||||
|
|
@ -991,8 +991,9 @@
|
|||
|
||||
!insertmacro MUI_INSTALLOPTIONS_READ ${MUI_TEMP1} "ioSpecial.ini" "Field 4" "State"
|
||||
|
||||
StrCmp ${MUI_TEMP1} "1" "" +2
|
||||
ExecShell "open" '"${MUI_FINISHPAGE_SHOWREADME}"'
|
||||
StrCmp ${MUI_TEMP1} "1" "" +3
|
||||
StrCpy ${MUI_TEMP1} ${MUI_FINISHPAGE_SHOWREADME}
|
||||
ExecShell "open" '"${MUI_TEMP1}"'
|
||||
|
||||
!endif
|
||||
|
||||
|
|
@ -1129,6 +1130,7 @@
|
|||
|
||||
!verbose 3
|
||||
|
||||
!insertmacro MUI_PAGECOMMANDS
|
||||
!insertmacro MUI_FUNCTIONS_PAGES
|
||||
!insertmacro MUI_FUNCTIONS_GUIINIT
|
||||
!insertmacro MUI_FUNCTIONS_ABORTWARNING
|
||||
|
|
@ -1143,6 +1145,7 @@
|
|||
|
||||
!ifdef MUI_UNINSTALLER
|
||||
|
||||
!insertmacro MUI_UNPAGECOMMANDS
|
||||
!insertmacro MUI_UNFUNCTIONS_PAGES
|
||||
!insertmacro MUI_UNFUNCTIONS_GUIINIT
|
||||
|
||||
|
|
@ -1173,37 +1176,25 @@
|
|||
|
||||
!endif
|
||||
|
||||
!verbose 4
|
||||
|
||||
!macroend
|
||||
|
||||
!macro MUI_LANGUAGEFILE_STRING STRING VALUE
|
||||
|
||||
!verbose 3
|
||||
|
||||
!ifndef "${STRING}"
|
||||
!define "${STRING}" "${VALUE}"
|
||||
!endif
|
||||
|
||||
!verbose 4
|
||||
|
||||
|
||||
!macroend
|
||||
|
||||
!macro MUI_LANGUAGEFILE_LANGSTRING NAME VALUE
|
||||
|
||||
!verbose 3
|
||||
|
||||
LangString "${NAME}" "${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}"
|
||||
!undef "${NAME}"
|
||||
|
||||
!verbose 4
|
||||
|
||||
!macroend
|
||||
|
||||
!macro MUI_LANGUAGEFILE_LANGSTRING_CONTINUE NAME VALUE INSTALLBUTTON
|
||||
|
||||
!verbose 3
|
||||
|
||||
!ifndef "${INSTALLBUTTON}"
|
||||
!ifdef MUI_TEXT_CONTINUE_NEXT
|
||||
LangString "${NAME}" "${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}${MUI_TEXT_CONTINUE_NEXT}"
|
||||
|
|
@ -1224,47 +1215,31 @@
|
|||
|
||||
!undef "${NAME}"
|
||||
|
||||
!verbose 4
|
||||
|
||||
!macroend
|
||||
|
||||
!macro MUI_LANGUAGEFILE_UNLANGSTRING NAME VALUE
|
||||
|
||||
!verbose 3
|
||||
|
||||
LangString "un.${NAME}" "${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}"
|
||||
!undef "${NAME}"
|
||||
|
||||
!verbose 4
|
||||
|
||||
!macroend
|
||||
|
||||
!macro MUI_LANGUAGEFILE_NSISCOMMAND COMMAND NAME VALUE
|
||||
|
||||
!verbose 3
|
||||
|
||||
"${COMMAND}" "/LANG=${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}"
|
||||
!undef "${NAME}"
|
||||
|
||||
!verbose 4
|
||||
|
||||
!macroend
|
||||
|
||||
!macro MUI_LANGUAGEFILE_NSISCOMMAND_MULTIPARAMETER COMMAND NAME VALUE
|
||||
|
||||
!verbose 3
|
||||
|
||||
"${COMMAND}" "/LANG=${LANG_${MUI_LANGUAGEFILE_CURRENT}}" ${VALUE}
|
||||
!undef "${NAME}"
|
||||
|
||||
!verbose 4
|
||||
|
||||
!macroend
|
||||
|
||||
!macro MUI_LANGUAGEFILE_NSISCOMMAND_CONTINUE COMMAND NAME VALUE INSTALLBUTTON
|
||||
|
||||
!verbose 3
|
||||
|
||||
!ifndef "${INSTALLBUTTON}"
|
||||
!ifdef MUI_TEXT_CONTINUE_NEXT
|
||||
"${COMMAND}" "/LANG=${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE} ${MUI_TEXT_CONTINUE_NEXT}"
|
||||
|
|
@ -1285,55 +1260,23 @@
|
|||
|
||||
!undef "${NAME}"
|
||||
|
||||
!verbose 4
|
||||
|
||||
!macroend
|
||||
|
||||
!macro MUI_LANGUAGEFILE_DEFINE DEFINE NAME VALUE
|
||||
|
||||
!verbose 3
|
||||
|
||||
!ifndef "${DEFINE}"
|
||||
!define "${DEFINE}" "${VALUE}"
|
||||
!endif
|
||||
!undef "${NAME}"
|
||||
|
||||
!verbose 4
|
||||
|
||||
!macroend
|
||||
|
||||
!macro MUI_LANGUAGEFILE_END
|
||||
|
||||
!verbose 3
|
||||
|
||||
!insertmacro MUI_LANGUAGEFILE_DEFINE "MUI_${LANGUAGE}_LANGNAME" "MUI_LANGNAME" "${MUI_LANGNAME}"
|
||||
|
||||
!insertmacro MUI_LANGUAGEFILE_NSISCOMMAND Name MUI_NAME "${MUI_NAME}"
|
||||
|
||||
!ifdef MUI_STARTMENUPAGE
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_STARTMENU_WINDOWTITLE" "${MUI_TEXT_STARTMENU_WINDOWTITLE}"
|
||||
!endif
|
||||
|
||||
!ifdef MUI_FINISHPAGE
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_WINDOWTITLE" "${MUI_TEXT_FINISH_WINDOWTITLE}"
|
||||
!endif
|
||||
|
||||
!ifndef MUI_CUSTOMPAGECOMMANDS
|
||||
!ifndef MUI_PAGECOMMANDS
|
||||
!define MUI_PAGECOMMANDS
|
||||
!insertmacro MUI_PAGECOMMANDS
|
||||
!endif
|
||||
!endif
|
||||
|
||||
!ifdef MUI_UNINSTALLER
|
||||
!ifndef MUI_UNCUSTOMPAGECOMMANDS
|
||||
!ifndef MUI_UNPAGECOMMANDS
|
||||
!define MUI_UNPAGECOMMANDS
|
||||
!insertmacro MUI_UNPAGECOMMANDS
|
||||
!endif
|
||||
!endif
|
||||
!endif
|
||||
|
||||
!ifdef MUI_WELCOMEPAGE
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_WELCOME_TITLE" "${MUI_TEXT_WELCOME_TITLE}"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_CONTINUE "MUI_TEXT_WELCOME_INFO" "${MUI_TEXT_WELCOME_INFO}" "MUI_INSTALLBUTTON_WELCOME"
|
||||
|
|
@ -1362,6 +1305,7 @@
|
|||
!endif
|
||||
|
||||
!ifdef MUI_STARTMENUPAGE
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_STARTMENU_WINDOWTITLE" "${MUI_TEXT_STARTMENU_WINDOWTITLE}"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_STARTMENU_TITLE" "${MUI_TEXT_STARTMENU_TITLE}"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_STARTMENU_SUBTITLE" "${MUI_TEXT_STARTMENU_SUBTITLE}"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING_CONTINUE "MUI_INNERTEXT_STARTMENU_TOP" "${MUI_INNERTEXT_STARTMENU_TOP} " "MUI_INSTALLBUTTON_STARTMENU"
|
||||
|
|
@ -1373,7 +1317,9 @@
|
|||
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_TITLE" "${MUI_TEXT_FINISH_TITLE}"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_SUBTITLE" "${MUI_TEXT_FINISH_SUBTITLE}"
|
||||
|
||||
!ifdef MUI_FINISHPAGE
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_WINDOWTITLE" "${MUI_TEXT_FINISH_WINDOWTITLE}"
|
||||
!insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_MULTIPARAMETER "MiscButtonText" "MUI_TEXT_FINISH_BUTTON" '"" "" "" "${MUI_TEXT_FINISH_BUTTON}"'
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_TEXT_FINISH_INFO "${MUI_TEXT_FINISH_INFO}"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_TEXT_FINISH_INFO_REBOOT "${MUI_TEXT_FINISH_INFO_REBOOT}"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue