fixed bug #1221772 - Welcome Page icon overlap
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4100 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
7e5ecd148b
commit
a99cda74d9
1 changed files with 17 additions and 5 deletions
|
@ -968,7 +968,7 @@ Var MUI_TEMP2
|
||||||
!insertmacro MUI_UNSET MUI_FINISHPAGE_LINK_LOCATION
|
!insertmacro MUI_UNSET MUI_FINISHPAGE_LINK_LOCATION
|
||||||
!insertmacro MUI_UNSET MUI_FINISHPAGE_LINK_COLOR
|
!insertmacro MUI_UNSET MUI_FINISHPAGE_LINK_COLOR
|
||||||
!insertmacro MUI_UNSET MUI_FINISHPAGE_NOREBOOTSUPPORT
|
!insertmacro MUI_UNSET MUI_FINISHPAGE_NOREBOOTSUPPORT
|
||||||
|
|
||||||
!insertmacro MUI_UNSET MUI_FINISHPAGE_ABORTWARNINGCHECK
|
!insertmacro MUI_UNSET MUI_FINISHPAGE_ABORTWARNINGCHECK
|
||||||
|
|
||||||
!verbose pop
|
!verbose pop
|
||||||
|
@ -1162,6 +1162,9 @@ Var MUI_TEMP2
|
||||||
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038
|
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038
|
||||||
ShowWindow $MUI_TEMP1 ${SW_HIDE}
|
ShowWindow $MUI_TEMP1 ${SW_HIDE}
|
||||||
|
|
||||||
|
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1039
|
||||||
|
ShowWindow $MUI_TEMP1 ${SW_HIDE}
|
||||||
|
|
||||||
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1045
|
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1045
|
||||||
ShowWindow $MUI_TEMP1 ${SW_NORMAL}
|
ShowWindow $MUI_TEMP1 ${SW_NORMAL}
|
||||||
LockWindow off
|
LockWindow off
|
||||||
|
@ -1199,6 +1202,9 @@ Var MUI_TEMP2
|
||||||
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038
|
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038
|
||||||
ShowWindow $MUI_TEMP1 ${SW_NORMAL}
|
ShowWindow $MUI_TEMP1 ${SW_NORMAL}
|
||||||
|
|
||||||
|
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1039
|
||||||
|
ShowWindow $MUI_TEMP1 ${SW_NORMAL}
|
||||||
|
|
||||||
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1045
|
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1045
|
||||||
ShowWindow $MUI_TEMP1 ${SW_HIDE}
|
ShowWindow $MUI_TEMP1 ${SW_HIDE}
|
||||||
LockWindow off
|
LockWindow off
|
||||||
|
@ -1610,6 +1616,9 @@ Var MUI_TEMP2
|
||||||
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038
|
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038
|
||||||
ShowWindow $MUI_TEMP1 ${SW_HIDE}
|
ShowWindow $MUI_TEMP1 ${SW_HIDE}
|
||||||
|
|
||||||
|
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1039
|
||||||
|
ShowWindow $MUI_TEMP1 ${SW_HIDE}
|
||||||
|
|
||||||
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1045
|
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1045
|
||||||
ShowWindow $MUI_TEMP1 ${SW_NORMAL}
|
ShowWindow $MUI_TEMP1 ${SW_NORMAL}
|
||||||
LockWindow off
|
LockWindow off
|
||||||
|
@ -1700,6 +1709,9 @@ Var MUI_TEMP2
|
||||||
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038
|
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038
|
||||||
ShowWindow $MUI_TEMP1 ${SW_NORMAL}
|
ShowWindow $MUI_TEMP1 ${SW_NORMAL}
|
||||||
|
|
||||||
|
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1039
|
||||||
|
ShowWindow $MUI_TEMP1 ${SW_NORMAL}
|
||||||
|
|
||||||
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1045
|
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1045
|
||||||
ShowWindow $MUI_TEMP1 ${SW_HIDE}
|
ShowWindow $MUI_TEMP1 ${SW_HIDE}
|
||||||
LockWindow off
|
LockWindow off
|
||||||
|
@ -1988,15 +2000,15 @@ Var MUI_TEMP2
|
||||||
!macro MUI_LANGDLL_SAVELANGUAGE
|
!macro MUI_LANGDLL_SAVELANGUAGE
|
||||||
|
|
||||||
!ifndef MUI_PAGE_UNINSTALLER
|
!ifndef MUI_PAGE_UNINSTALLER
|
||||||
|
|
||||||
IfAbort mui.langdllsavelanguage_abort
|
IfAbort mui.langdllsavelanguage_abort
|
||||||
|
|
||||||
!ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME
|
!ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME
|
||||||
WriteRegStr "${MUI_LANGDLL_REGISTRY_ROOT}" "${MUI_LANGDLL_REGISTRY_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}" $LANGUAGE
|
WriteRegStr "${MUI_LANGDLL_REGISTRY_ROOT}" "${MUI_LANGDLL_REGISTRY_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}" $LANGUAGE
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
mui.langdllsavelanguage_abort:
|
mui.langdllsavelanguage_abort:
|
||||||
|
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
!macroend
|
!macroend
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue