fixed finish page link positioning, color (standard RRGGBB hex format)

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3269 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2003-12-12 21:26:21 +00:00
parent e53d122cfd
commit b33de3866d
2 changed files with 10 additions and 8 deletions

View file

@ -552,10 +552,10 @@ Text for a link on the which the user can click to view a website or file.</p>
<p><strong>MUI_FINISHPAGE_LINK_LOCATION</strong> <span class="parameter">file/url</span><br /> <p><strong>MUI_FINISHPAGE_LINK_LOCATION</strong> <span class="parameter">file/url</span><br />
Website or file which the user can select to view using the link. You don't need to put quotes Website or file which the user can select to view using the link. You don't need to put quotes
around the filename when it contains spaces.</p> around the filename when it contains spaces.</p>
<p><strong>MUI_FINISHPAGE_LINK_COLOR</strong> <span class="parameter">(color: 0xBBGGRR <p><strong>MUI_FINISHPAGE_LINK_COLOR</strong> <span class="parameter">(color: RRGGBB hexadecimal)
hexadecimal)</span><br /> </span><br />
Text color for the link on the Finish page.<br /> Text color for the link on the Finish page.<br />
<em>Default: 0x800000</em></p> <em>Default: 000080</em></p>
</div> </div>
<p><strong>MUI_FINISHPAGE_NOREBOOTSUPPORT</strong><br /> <p><strong>MUI_FINISHPAGE_NOREBOOTSUPPORT</strong><br />
Disables support for the page that allows the user to reboot the system. Define this option to save Disables support for the page that allows the user to reboot the system. Define this option to save

View file

@ -917,8 +917,7 @@ Var MUI_TEMP2
!insertmacro MUI_DEFAULT MUI_FINISHPAGE_TEXT_REBOOTLATER "$(MUI_TEXT_FINISH_REBOOTLATER)" !insertmacro MUI_DEFAULT MUI_FINISHPAGE_TEXT_REBOOTLATER "$(MUI_TEXT_FINISH_REBOOTLATER)"
!insertmacro MUI_DEFAULT MUI_FINISHPAGE_RUN_TEXT "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_FINISH_RUN)" !insertmacro MUI_DEFAULT MUI_FINISHPAGE_RUN_TEXT "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_FINISH_RUN)"
!insertmacro MUI_DEFAULT MUI_FINISHPAGE_SHOWREADME_TEXT "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_FINISH_SHOWREADME)" !insertmacro MUI_DEFAULT MUI_FINISHPAGE_SHOWREADME_TEXT "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_FINISH_SHOWREADME)"
!insertmacro MUI_DEFAULT MUI_FINISHPAGE_LINK_COLOR "000080"
!insertmacro MUI_DEFAULT MUI_FINISHPAGE_LINK_COLOR "0x800000"
!ifndef MUI_VAR_HWND !ifndef MUI_VAR_HWND
Var MUI_HWND Var MUI_HWND
@ -1383,7 +1382,11 @@ Var MUI_TEMP2
!endif !endif
!endif !endif
!else !else
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Bottom" "185" !ifndef MUI_FINISHPAGE_LINK
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Bottom" "185"
!else
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Bottom" "175"
!endif
!endif !endif
!ifndef MUI_FINISHPAGE_NOREBOOTSUPPORT !ifndef MUI_FINISHPAGE_NOREBOOTSUPPORT
@ -1558,7 +1561,6 @@ 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}" "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}" "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}" "State" "${MUI_FINISHPAGE_LINK_LOCATION}"
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field ${MUI_FINISHPAGE_CURFIELD_NO}" "TxtColor" "${MUI_FINISHPAGE_LINK_COLOR}"
!endif !endif
@ -1654,7 +1656,7 @@ Var MUI_TEMP2
!else !else
GetDlgItem $MUI_TEMP1 $MUI_HWND 1203 GetDlgItem $MUI_TEMP1 $MUI_HWND 1203
!endif !endif
SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}" SetCtlColors $MUI_TEMP1 "${MUI_FINISHPAGE_LINK_COLOR}" "${MUI_BGCOLOR}"
!endif !endif
!ifndef MUI_FINISHPAGE_NOREBOOTSUPPORT !ifndef MUI_FINISHPAGE_NOREBOOTSUPPORT