From 8943e010085f29ba4de7e255fe264837f4522a55 Mon Sep 17 00:00:00 2001 From: joostverburg Date: Sun, 22 Sep 2002 11:58:04 +0000 Subject: [PATCH] added io nextpage/prevpage macro's git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1140 212acab6-be3b-0410-9dea-997c60f758d6 --- Examples/Modern UI/InstallOptions.nsi | 10 ++-------- Examples/Modern UI/ModernUI.nsh | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Examples/Modern UI/InstallOptions.nsi b/Examples/Modern UI/InstallOptions.nsi index 9b5d9d51..38153f5f 100644 --- a/Examples/Modern UI/InstallOptions.nsi +++ b/Examples/Modern UI/InstallOptions.nsi @@ -106,20 +106,14 @@ FunctionEnd Function .onNextPage !insertmacro MUI_NEXTPAGE_OUTER - StrCmp ${IO_NOSETDIRECTION} "1" no_setdirection - !insertmacro MUI_INSTALLOPTIONS_SETDIRECTION ${IO_DIRECTION_NEXT} - no_setdirection: - StrCpy ${IO_NOSETDIRECTION} "0" + !insertmacro MUI_INSTALLOPTIONS_NEXTPAGE !insertmacro MUI_NEXTPAGE SetPage FunctionEnd Function .onPrevPage - StrCmp ${IO_NOSETDIRECTION} "1" no_setdirection - !insertmacro MUI_INSTALLOPTIONS_SETDIRECTION ${IO_DIRECTION_PREV} - no_setdirection: - StrCpy ${IO_NOSETDIRECTION} "0" + !insertmacro MUI_INSTALLOPTIONS_PREVPAGE !insertmacro MUI_PREVPAGE SetPage FunctionEnd diff --git a/Examples/Modern UI/ModernUI.nsh b/Examples/Modern UI/ModernUI.nsh index 5645604e..91a90ef2 100644 --- a/Examples/Modern UI/ModernUI.nsh +++ b/Examples/Modern UI/ModernUI.nsh @@ -1,4 +1,4 @@ -;Modern UI Header File version 1.19g +;Modern UI Header File version 1.19h ;Written by Joost Verburg ;See Example.nsi & Multilanguage.nsi for an example of usage @@ -228,6 +228,24 @@ !macroend +!macro MUI_INSTALLOPTIONS_NEXTPAGE + + StrCmp ${IO_NOSETDIRECTION} "1" no_setdirection + !insertmacro MUI_INSTALLOPTIONS_SETDIRECTION ${IO_DIRECTION_NEXT} + no_setdirection: + StrCpy ${IO_NOSETDIRECTION} "0" + +!macroend + +!macro MUI_INSTALLOPTIONS_PREVPAGE + + StrCmp ${IO_NOSETDIRECTION} "1" no_setdirection + !insertmacro MUI_INSTALLOPTIONS_SETDIRECTION ${IO_DIRECTION_PREV} + no_setdirection: + StrCpy ${IO_NOSETDIRECTION} "0" + +!macroend + !macro MUI_INSTALLOPTIONS_SHOW PAGE FILE IOBACK IONEXT InstallOptions::dialog "$PLUGINSDIR\${FILE}"