From 4c24a93e6acd1b8c4aa6ef8e3199988c17ca7082 Mon Sep 17 00:00:00 2001 From: joostverburg Date: Tue, 12 Aug 2003 13:08:28 +0000 Subject: [PATCH] added MUI_FINISHPAGE_LINK_COLOR git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2801 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI/Readme.html | 2 ++ Contrib/Modern UI/System.nsh | 43 +++++++++++++++++++++++------------ 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html index 93fd0160..3a862fa9 100644 --- a/Contrib/Modern UI/Readme.html +++ b/Contrib/Modern UI/Readme.html @@ -353,6 +353,8 @@ parameters.

MUI_BGCOLOR (color: 0xBBGGRR hexadecimal)
Background color for the header, Welcome page and Finish page.
Default: 0xFFFFFF

+

MUI_FINISHPAGE_LINK_COLOR (color: 0xBBGGRR hexadecimal)
+ Text color for the link on the Finish page.
Default: 0x800000

MUI_RTL_UI
Right-to-left interface.

5. Define custom functions (optional)

diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index 0ea0f527..fb2ee28d 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -99,6 +99,11 @@ Var MUI_TEMP2 !ifndef MUI_FINISHPAGE_NOAUTOCLOSE AutoCloseWindow true !endif + !ifdef MUI_FINISHPAGE_LINK + !ifndef MUI_FINISHPAGE_LINK_COLOR + !define MUI_FINISHPAGE_LINK_COLOR "0x800000" + !endif + !endif !endif XPStyle On @@ -650,6 +655,10 @@ Var MUI_TEMP2 !verbose 3 !endif + !ifndef MUI_INSTFILESPAGE + !define MUI_INSTFILESPAGE + !endif + Page instfiles mui.InstFilesPre mui.InstFilesShow mui.InstFilesLeave !ifndef MUI_MANUALVERBOSE @@ -707,6 +716,10 @@ Var MUI_TEMP2 !ifndef MUI_UNINSTALLER !define MUI_UNINSTALLER !endif + + !ifndef MUI_UNINSTFILESPAGE + !define MUI_UNINSTFILESPAGE + !endif UninstPage instfiles un.mui.InstFilesPre un.mui.InstFilesShow un.mui.InstFilesLeave @@ -890,7 +903,9 @@ Var MUI_TEMP2 !insertmacro MUI_FUNCTIONS_STARTMENUPAGE mui.StartmenuPre mui.StartmenuLeave !endif - !insertmacro MUI_FUNCTIONS_INSTFILESPAGE mui.InstFilesPre mui.InstFilesShow mui.InstFilesLeave + !ifdef MUI_INSTFILESPAGE + !insertmacro MUI_FUNCTIONS_INSTFILESPAGE mui.InstFilesPre mui.InstFilesShow mui.InstFilesLeave + !endif !ifdef MUI_FINISHPAGE !insertmacro MUI_FUNCTIONS_FINISHPAGE mui.FinishPre mui.FinishLeave @@ -911,10 +926,10 @@ Var MUI_TEMP2 GetDlgItem $MUI_TEMP1 $HWNDPARENT 1035 ShowWindow $MUI_TEMP1 ${SW_HIDE} - GetDlgItem $MUI_TEMP1 $HWNDPARENT 1037 + GetDlgItem $MUI_TEMP1 $HWNDPARENT 1037 ShowWindow $MUI_TEMP1 ${SW_HIDE} - GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038 + GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038 ShowWindow $MUI_TEMP1 ${SW_HIDE} GetDlgItem $MUI_TEMP1 $HWNDPARENT 1045 @@ -955,10 +970,10 @@ Var MUI_TEMP2 GetDlgItem $MUI_TEMP1 $HWNDPARENT 1035 ShowWindow $MUI_TEMP1 ${SW_NORMAL} - GetDlgItem $MUI_TEMP1 $HWNDPARENT 1037 + GetDlgItem $MUI_TEMP1 $HWNDPARENT 1037 ShowWindow $MUI_TEMP1 ${SW_NORMAL} - GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038 + GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038 ShowWindow $MUI_TEMP1 ${SW_NORMAL} GetDlgItem $MUI_TEMP1 $HWNDPARENT 1045 @@ -1238,7 +1253,7 @@ Var MUI_TEMP2 !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field ${MUI_FINISHPAGE_CURFIELD_NO}" "Top" "175" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field ${MUI_FINISHPAGE_CURFIELD_NO}" "Bottom" "185" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field ${MUI_FINISHPAGE_CURFIELD_NO}" "State" "${MUI_FINISHPAGE_LINK_LOCATION}" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field ${MUI_FINISHPAGE_CURFIELD_NO}" "TxtColor" "0x800000" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field ${MUI_FINISHPAGE_CURFIELD_NO}" "TxtColor" "${MUI_FINISHPAGE_LINK_COLOR}" !endif @@ -1335,16 +1350,16 @@ Var MUI_TEMP2 GetDlgItem $MUI_TEMP1 $HWNDPARENT 1035 ShowWindow $MUI_TEMP1 ${SW_NORMAL} - GetDlgItem $MUI_TEMP1 $HWNDPARENT 1037 + GetDlgItem $MUI_TEMP1 $HWNDPARENT 1037 ShowWindow $MUI_TEMP1 ${SW_NORMAL} - GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038 + GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038 ShowWindow $MUI_TEMP1 ${SW_NORMAL} GetDlgItem $MUI_TEMP1 $HWNDPARENT 1045 ShowWindow $MUI_TEMP1 ${SW_HIDE} - Pop $MUI_TEMP1 + Pop $MUI_TEMP1 StrCmp $MUI_TEMP1 "success" 0 mui.finish_done !ifndef MUI_FINISHPAGE_NOREBOOTSUPPORT @@ -1403,10 +1418,6 @@ Var MUI_TEMP2 mui.finish_done: - !ifdef MUI_CUSTOMFUNCTION_FINISH - Call "${MUI_CUSTOMFUNCTION_FINISH}" - !endif - FunctionEnd Function "${LEAVE}" @@ -1485,8 +1496,10 @@ Var MUI_TEMP2 !ifdef MUI_UNCONFIRMPAGE !insertmacro MUI_UNFUNCTION_CONFIRMPAGE un.mui.ConfirmPre un.mui.ConfirmShow un.mui.ConfirmLeave !endif - - !insertmacro MUI_UNFUNCTION_INSTFILESPAGE un.mui.InstFilesPre un.mui.InstFilesShow un.mui.InstFilesLeave + + !ifdef MUI_UNINSTFILESPAGE + !insertmacro MUI_UNFUNCTION_INSTFILESPAGE un.mui.InstFilesPre un.mui.InstFilesShow un.mui.InstFilesLeave + !endif !macroend