dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

File treats "" as "*", don't allow empty MUI_*_BITMAP defines.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6587 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-06-25 20:12:57 +00:00
parent 15b35daa34
commit 695a478725
5 changed files with 51 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Contrib/Modern UI 2/Interface.nsh
View file

@ -69,11 +69,25 @@ Var mui.Button.Back
!insertmacro MUI_SET MUI_HEADERIMAGE_UNBITMAP_STRETCH ${MUI_HEADERIMAGE_BITMAP_STRETCH} !insertmacro MUI_SET MUI_HEADERIMAGE_UNBITMAP_STRETCH ${MUI_HEADERIMAGE_BITMAP_STRETCH}
!endif !endif
!if "${MUI_HEADERIMAGE_BITMAP}" == ""
!error "Invalid MUI_HEADERIMAGE_BITMAP"
!endif
!if "${MUI_HEADERIMAGE_UNBITMAP}" == ""
!error "Invalid MUI_HEADERIMAGE_UNBITMAP"
!endif
!ifdef MUI_HEADERIMAGE_BITMAP_RTL !ifdef MUI_HEADERIMAGE_BITMAP_RTL
!ifndef MUI_HEADERIMAGE_UNBITMAP_RTL !ifndef MUI_HEADERIMAGE_UNBITMAP_RTL
!define MUI_HEADERIMAGE_UNBITMAP_RTL "${MUI_HEADERIMAGE_BITMAP_RTL}" !define MUI_HEADERIMAGE_UNBITMAP_RTL "${MUI_HEADERIMAGE_BITMAP_RTL}"
!insertmacro MUI_SET MUI_HEADERIMAGE_UNBITMAP_RTL_STRETCH ${MUI_HEADERIMAGE_BITMAP_RTL_STRETCH} !insertmacro MUI_SET MUI_HEADERIMAGE_UNBITMAP_RTL_STRETCH ${MUI_HEADERIMAGE_BITMAP_RTL_STRETCH}
!endif !endif
!if "${MUI_HEADERIMAGE_BITMAP_RTL}" == ""
!error "Invalid MUI_HEADERIMAGE_BITMAP_RTL"
!endif
!if "${MUI_HEADERIMAGE_UNBITMAP_RTL}" == ""
!error "Invalid MUI_HEADERIMAGE_UNBITMAP_RTL"
!endif
!endif !endif
!insertmacro MUI_DEFAULT MUI_HEADERIMAGE_UNBITMAP_STRETCH ${MUI_HEADERIMAGE_BITMAP_STRETCH} !insertmacro MUI_DEFAULT MUI_HEADERIMAGE_UNBITMAP_STRETCH ${MUI_HEADERIMAGE_BITMAP_STRETCH}

16
Contrib/Modern UI 2/Pages.nsh
View file

@ -49,7 +49,7 @@ Support code for all pages
;Generate unique ID ;Generate unique ID
!insertmacro MUI_UNSET MUI_UNIQUEID !insertmacro MUI_UNSET MUI_UNIQUEID
!define MUI_UNIQUEID ${__LINE__} !define MUI_UNIQUEID ${__LINE__}
!macroend !macroend
@ -295,12 +295,12 @@ Support code for all pages
${EndIf} ${EndIf}
${DoWhile} $R2 > $R8 ; ImgH > CtlH ${DoWhile} $R2 > $R8 ; ImgH > CtlH
IntOp $R1 $R1 - $R3 IntOp $R1 $R1 - $R3
IntOp $R2 $R2 - $R4 IntOp $R2 $R2 - $R4
${Loop} ${Loop}
${DoWhile} $R2 < $R8 ; ImgH < CtlH ${DoWhile} $R2 < $R8 ; ImgH < CtlH
IntOp $R1 $R1 + $R3 IntOp $R1 $R1 + $R3
IntOp $R2 $R2 + $R4 IntOp $R2 $R2 + $R4
${Loop} ${Loop}
IntOp $1 $R1 / 10000 IntOp $1 $R1 / 10000
IntOp $2 $R2 / 10000 IntOp $2 $R2 / 10000
@ -312,9 +312,9 @@ Support code for all pages
${EndIf} ${EndIf}
${DoWhile} $2 > $8 ; Non-aspect-maintained stretch to make it a pixel perfect match ${DoWhile} $2 > $8 ; Non-aspect-maintained stretch to make it a pixel perfect match
IntOp $2 $2 - 1 IntOp $2 $2 - 1
IntOp $1 $1 - 1 IntOp $1 $1 - 1
${IfThen} $3 == "*" ${|} IntOp $5 $5 + 1 ${|} ${IfThen} $3 == "*" ${|} IntOp $5 $5 + 1 ${|}
${Loop} ${Loop}
System::Call 'USER32::SetWindowPos(pr0,p0,ir5,ir6,ir1,ir2,i0x14)' System::Call 'USER32::SetWindowPos(pr0,p0,ir5,ir6,ir1,ir2,i0x14)'

5
Contrib/Modern UI 2/Pages/Finish.nsh
View file

@ -71,7 +71,10 @@ Finish page (implemented using nsDialogs)
!endif !endif
!endif !endif
!insertmacro MUI_DEFAULT MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp" !insertmacro MUI_DEFAULT MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"
!if "${MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP}" == ""
!error "Invalid MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP"
!endif
!macroend !macroend

7
Contrib/Modern UI 2/Pages/Welcome.nsh
View file

@ -20,10 +20,13 @@ Welcome page (implemented using nsDialogs)
Var mui.WelcomePage.Title Var mui.WelcomePage.Title
Var mui.WelcomePage.Title.Font Var mui.WelcomePage.Title.Font
Var mui.WelcomePage.Text Var mui.WelcomePage.Text
!endif !endif
!insertmacro MUI_DEFAULT MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp" !insertmacro MUI_DEFAULT MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"
!if "${MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP}" == ""
!error "Invalid MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP"
!endif
!macroend !macroend

20
Contrib/Modern UI/System.nsh
View file

@ -128,6 +128,12 @@ Var MUI_TEMP2
!insertmacro MUI_DEFAULT MUI_UNWELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini" !insertmacro MUI_DEFAULT MUI_UNWELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini"
!insertmacro MUI_DEFAULT MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp" !insertmacro MUI_DEFAULT MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"
!insertmacro MUI_DEFAULT MUI_UNWELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp" !insertmacro MUI_DEFAULT MUI_UNWELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"
!if "${MUI_WELCOMEFINISHPAGE_BITMAP}" == ""
!error "Invalid MUI_WELCOMEFINISHPAGE_BITMAP"
!endif
!if "${MUI_UNWELCOMEFINISHPAGE_BITMAP}" == ""
!error "Invalid MUI_UNWELCOMEFINISHPAGE_BITMAP"
!endif
!ifdef MUI_HEADERIMAGE !ifdef MUI_HEADERIMAGE
@ -140,6 +146,13 @@ Var MUI_TEMP2
!endif !endif
!endif !endif
!if "${MUI_HEADERIMAGE_BITMAP}" == ""
!error "Invalid MUI_HEADERIMAGE_BITMAP"
!endif
!if "${MUI_HEADERIMAGE_UNBITMAP}" == ""
!error "Invalid MUI_HEADERIMAGE_UNBITMAP"
!endif
!ifdef MUI_HEADERIMAGE_BITMAP_RTL !ifdef MUI_HEADERIMAGE_BITMAP_RTL
!ifndef MUI_HEADERIMAGE_UNBITMAP_RTL !ifndef MUI_HEADERIMAGE_UNBITMAP_RTL
!define MUI_HEADERIMAGE_UNBITMAP_RTL "${MUI_HEADERIMAGE_BITMAP_RTL}" !define MUI_HEADERIMAGE_UNBITMAP_RTL "${MUI_HEADERIMAGE_BITMAP_RTL}"
@ -147,6 +160,13 @@ Var MUI_TEMP2
!insertmacro MUI_SET MUI_HEADERIMAGE_UNBITMAP_RTL_NOSTRETCH !insertmacro MUI_SET MUI_HEADERIMAGE_UNBITMAP_RTL_NOSTRETCH
!endif !endif
!endif !endif
!if "${MUI_HEADERIMAGE_BITMAP_RTL}" == ""
!error "Invalid MUI_HEADERIMAGE_BITMAP_RTL"
!endif
!if "${MUI_HEADERIMAGE_UNBITMAP_RTL}" == ""
!error "Invalid MUI_HEADERIMAGE_UNBITMAP_RTL"
!endif
!endif !endif
!endif !endif