From 4b668f4b4318cdfe8ed3de9d27ab7b3149868a76 Mon Sep 17 00:00:00 2001 From: kichik Date: Fri, 23 Sep 2005 10:17:16 +0000 Subject: [PATCH] documented /ENABLECANCEL git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4284 212acab6-be3b-0410-9dea-997c60f758d6 --- Docs/src/pages.but | 24 ++++++++++++++++++++---- Source/tokens.cpp | 8 ++++---- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/Docs/src/pages.but b/Docs/src/pages.but index 9d8462a0..8997a10d 100644 --- a/Docs/src/pages.but +++ b/Docs/src/pages.but @@ -107,20 +107,36 @@ Examples: \S{page} Page -\c custom [creator_function] [leave_function] [caption] +\c custom [creator_function] [leave_function] [caption] [/ENABLECANCEL] \c OR -\c (license|components|directory|instfiles|uninstConfirm) [pre_function] [show_function] [leave_function] +\c internal_page_type [pre_function] [show_function] [leave_function] [/ENABLECANCEL] Adds an installer page. See the above sections for more information about built-in versus custom pages and about callback functions. +\e{internal_page_type} can be: + +\b \e{license} - license page + +\b \e{components} - components selection page + +\b \e{directory} - installation directory selection page + +\b \e{instfiles} - installation page where the sections are executed + +\b \e{uninstConfirm} - uninstall confirmation page + +The last page of the installer has its cancel button disabled to prevent confusion. To enable it anyway, use \e{/ENABLECANCEL}. + \S{uninstpage} UninstPage -\c custom [creator_function] [leave_function] [caption] +\c custom [creator_function] [leave_function] [caption] [/ENABLECANCEL] \c OR -\c (license|components|directory|instfiles|uninstConfirm) [pre_function] [show_function] [leave_function] +\c internal_page_type [pre_function] [show_function] [leave_function] [/ENABLECANCEL] Adds an uninstaller page. See the above sections for more information about built-in versus custom pages and about callback functions. +See \R{page}{Page} for possible values of \e{internal_page_type}. + \S{pageex} PageEx \c [un.](custom|uninstConfirm|license|components|directory|instfiles) diff --git a/Source/tokens.cpp b/Source/tokens.cpp index 7c52fb1c..facd99c1 100644 --- a/Source/tokens.cpp +++ b/Source/tokens.cpp @@ -128,9 +128,9 @@ static tokenType tokenlist[TOK__LAST] = {TOK_NAME,"Name",1,1,"installer_name installer_name_doubled_ampersands",TP_GLOBAL}, {TOK_OUTFILE,"OutFile",1,0,"install_output.exe",TP_GLOBAL}, #ifdef NSIS_SUPPORT_CODECALLBACKS -{TOK_PAGE,"Page",1,4,"((custom [creator_function] [leave_function] [caption]) | ((license|components|directory|instfiles|uninstConfirm) [pre_function] [show_function] [leave_function]))",TP_GLOBAL}, +{TOK_PAGE,"Page",1,4,"((custom [creator_function] [leave_function] [caption]) | ((license|components|directory|instfiles|uninstConfirm) [pre_function] [show_function] [leave_function])) [/ENABLECANCEL]",TP_GLOBAL}, #else -{TOK_PAGE,"Page",1,1,"license|components|directory|instfiles|uninstConfirm",TP_GLOBAL}, +{TOK_PAGE,"Page",1,1,"license|components|directory|instfiles|uninstConfirm [/ENABLECANCEL]",TP_GLOBAL}, #endif {TOK_PAGECALLBACKS,"PageCallbacks",0,3,"([creator_function] [leave_function]) | ([pre_function] [show_function] [leave_function])",TP_PAGEEX}, {TOK_PAGEEX,"PageEx",1,0,"[un.](custom|uninstConfirm|license|components|directory|instfiles)",TP_GLOBAL}, @@ -203,9 +203,9 @@ static tokenType tokenlist[TOK__LAST] = {TOK_UNINSTCAPTION,"UninstallCaption",1,0,"uninstaller_caption",TP_GLOBAL}, {TOK_UNINSTICON,"UninstallIcon",1,0,"icon_on_local_system.ico",TP_GLOBAL}, #ifdef NSIS_SUPPORT_CODECALLBACKS -{TOK_UNINSTPAGE,"UninstPage",1,4,"((custom [creator_function] [leave_function] [caption]) | ((license|components|directory|instfiles|uninstConfirm) [pre_function] [show_function] [leave_function]))",TP_GLOBAL}, +{TOK_UNINSTPAGE,"UninstPage",1,4,"((custom [creator_function] [leave_function] [caption]) | ((license|components|directory|instfiles|uninstConfirm) [pre_function] [show_function] [leave_function])) [/ENABLECANCEL]",TP_GLOBAL}, #else -{TOK_UNINSTPAGE,"UninstPage",1,1,"license|components|directory|instfiles|uninstConfirm",TP_GLOBAL}, +{TOK_UNINSTPAGE,"UninstPage",1,1,"license|components|directory|instfiles|uninstConfirm [/ENABLECANCEL]",TP_GLOBAL}, #endif {TOK_UNINSTTEXT,"UninstallText",1,1,"Text_to_go_on_uninstall_page [subtext]",TP_PG}, {TOK_UNINSTSUBCAPTION,"UninstallSubCaption",2,0,"page_number(0-2) new_subcaption",TP_GLOBAL},