[prev in list] [next in list] [prev in thread] [next in thread]
List: nsis-commits
Subject: [NSIS-commits] SF.net SVN: nsis:[6587] NSIS/trunk/Contrib
From: anders_k () users ! sourceforge ! net
Date: 2015-06-25 20:12:57
Message-ID: E1Z8DW8-0007It-VG () sfs-ml-2 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 6587
http://sourceforge.net/p/nsis/code/6587
Author: anders_k
Date: 2015-06-25 20:12:57 +0000 (Thu, 25 Jun 2015)
Log Message:
-----------
File treats "" as "*", don't allow empty MUI_*_BITMAP defines.
Modified Paths:
--------------
NSIS/trunk/Contrib/Modern UI/System.nsh
NSIS/trunk/Contrib/Modern UI 2/Interface.nsh
NSIS/trunk/Contrib/Modern UI 2/Pages/Finish.nsh
NSIS/trunk/Contrib/Modern UI 2/Pages/Welcome.nsh
NSIS/trunk/Contrib/Modern UI 2/Pages.nsh
Modified: NSIS/trunk/Contrib/Modern UI/System.nsh
===================================================================
--- NSIS/trunk/Contrib/Modern UI/System.nsh 2015-06-24 19:23:17 UTC (rev 6586)
+++ NSIS/trunk/Contrib/Modern UI/System.nsh 2015-06-25 20:12:57 UTC (rev 6587)
@@ -128,6 +128,12 @@
!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_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
@@ -140,6 +146,13 @@
!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
!ifndef MUI_HEADERIMAGE_UNBITMAP_RTL
!define MUI_HEADERIMAGE_UNBITMAP_RTL "${MUI_HEADERIMAGE_BITMAP_RTL}"
@@ -147,6 +160,13 @@
!insertmacro MUI_SET MUI_HEADERIMAGE_UNBITMAP_RTL_NOSTRETCH
!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
Modified: NSIS/trunk/Contrib/Modern UI 2/Interface.nsh
===================================================================
--- NSIS/trunk/Contrib/Modern UI 2/Interface.nsh 2015-06-24 19:23:17 UTC (rev 6586)
+++ NSIS/trunk/Contrib/Modern UI 2/Interface.nsh 2015-06-25 20:12:57 UTC (rev 6587)
@@ -69,11 +69,25 @@
!insertmacro MUI_SET MUI_HEADERIMAGE_UNBITMAP_STRETCH \
${MUI_HEADERIMAGE_BITMAP_STRETCH}
!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
!ifndef MUI_HEADERIMAGE_UNBITMAP_RTL
!define MUI_HEADERIMAGE_UNBITMAP_RTL "${MUI_HEADERIMAGE_BITMAP_RTL}"
!insertmacro MUI_SET MUI_HEADERIMAGE_UNBITMAP_RTL_STRETCH \
${MUI_HEADERIMAGE_BITMAP_RTL_STRETCH}
!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
!insertmacro MUI_DEFAULT MUI_HEADERIMAGE_UNBITMAP_STRETCH \
${MUI_HEADERIMAGE_BITMAP_STRETCH}
Modified: NSIS/trunk/Contrib/Modern UI 2/Pages/Finish.nsh
===================================================================
--- NSIS/trunk/Contrib/Modern UI 2/Pages/Finish.nsh 2015-06-24 19:23:17 UTC (rev \
6586)
+++ NSIS/trunk/Contrib/Modern UI 2/Pages/Finish.nsh 2015-06-25 20:12:57 UTC (rev \
6587) @@ -71,7 +71,10 @@
!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
Modified: NSIS/trunk/Contrib/Modern UI 2/Pages/Welcome.nsh
===================================================================
--- NSIS/trunk/Contrib/Modern UI 2/Pages/Welcome.nsh 2015-06-24 19:23:17 UTC (rev \
6586)
+++ NSIS/trunk/Contrib/Modern UI 2/Pages/Welcome.nsh 2015-06-25 20:12:57 UTC (rev \
6587) @@ -20,10 +20,13 @@
Var mui.WelcomePage.Title
Var mui.WelcomePage.Title.Font
- Var mui.WelcomePage.Text
+ Var mui.WelcomePage.Text
!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
Modified: NSIS/trunk/Contrib/Modern UI 2/Pages.nsh
===================================================================
--- NSIS/trunk/Contrib/Modern UI 2/Pages.nsh 2015-06-24 19:23:17 UTC (rev 6586)
+++ NSIS/trunk/Contrib/Modern UI 2/Pages.nsh 2015-06-25 20:12:57 UTC (rev 6587)
@@ -49,7 +49,7 @@
;Generate unique ID
!insertmacro MUI_UNSET MUI_UNIQUEID
- !define MUI_UNIQUEID ${__LINE__}
+ !define MUI_UNIQUEID ${__LINE__}
!macroend
@@ -295,12 +295,12 @@
${EndIf}
${DoWhile} $R2 > $R8 ; ImgH > CtlH
- IntOp $R1 $R1 - $R3
- IntOp $R2 $R2 - $R4
+ IntOp $R1 $R1 - $R3
+ IntOp $R2 $R2 - $R4
${Loop}
${DoWhile} $R2 < $R8 ; ImgH < CtlH
- IntOp $R1 $R1 + $R3
- IntOp $R2 $R2 + $R4
+ IntOp $R1 $R1 + $R3
+ IntOp $R2 $R2 + $R4
${Loop}
IntOp $1 $R1 / 10000
IntOp $2 $R2 / 10000
@@ -312,9 +312,9 @@
${EndIf}
${DoWhile} $2 > $8 ; Non-aspect-maintained stretch to make it a pixel perfect \
match
- IntOp $2 $2 - 1
- IntOp $1 $1 - 1
- ${IfThen} $3 == "*" ${|} IntOp $5 $5 + 1 ${|}
+ IntOp $2 $2 - 1
+ IntOp $1 $1 - 1
+ ${IfThen} $3 == "*" ${|} IntOp $5 $5 + 1 ${|}
${Loop}
System::Call 'USER32::SetWindowPos(pr0,p0,ir5,ir6,ir1,ir2,i0x14)'
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
------------------------------------------------------------------------------
Monitor 25 network devices or servers for free with OpManager!
OpManager is web-based network management software that monitors
network devices and physical & virtual servers, alerts via email & sms
for fault. Monitor 25 devices for free with no restriction. Download now
http://ad.doubleclick.net/ddm/clk/292181274;119417398;o
_______________________________________________
NSIS-commits mailing list
NSIS-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nsis-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic