From 575b9ae83ffe161cf6aa8354c1fce0f945c616f4 Mon Sep 17 00:00:00 2001 From: joostverburg Date: Tue, 18 Nov 2003 21:31:44 +0000 Subject: [PATCH] header image RTL support, fixed NOSTRETCH settings git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3164 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Graphics/Header/nsis-r.bmp | Bin 0 -> 9744 bytes Contrib/Graphics/Header/nsis.bmp | Bin 9744 -> 9744 bytes Contrib/Modern UI/Readme.html | 61 +++++++++++++++++++++-------- Contrib/Modern UI/System.nsh | 51 ++++++++++++++++++++---- 4 files changed, 87 insertions(+), 25 deletions(-) create mode 100644 Contrib/Graphics/Header/nsis-r.bmp diff --git a/Contrib/Graphics/Header/nsis-r.bmp b/Contrib/Graphics/Header/nsis-r.bmp new file mode 100644 index 0000000000000000000000000000000000000000..eb3650f7d3901e6d8b969afc6b3647433d773e58 GIT binary patch literal 9744 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 I6;%N1{~MpyNdN!< literal 0 HcmV?d00001 diff --git a/Contrib/Graphics/Header/nsis.bmp b/Contrib/Graphics/Header/nsis.bmp index 6d64407ff60992350d5b688ac4581d08941d7ec6..cbb52312f16e431e9b0c634948e3e59dda14d1eb 100644 GIT binary patch literal 9744 zcmaJ{3tZ0U`@VBpCL5c>+A#Z#{usZMt&x1lf5WC zCY7?1Pf_yHHFSE-R=T`nFXin!NH+et_0&dGGTwQo07MuyS7ghNzzESaty zilnmiRJw5FFcskMD^DG#%-?p?{fv`zKl2Qg96d~T(h@0SjX$MEgi&E~EbUw#K#{?l z>CxR1diMAcJ$+P7Nx|!BjmI4NGyWhI9EqZe6NyxD<|tKVq*2MK6iV5*iyl|prAOs= z=;^};bT@7_$a!Udx`$OeS;q2Q&Uw=k1NaQobN=+ zT=G4g_n$)N`RkIYbUt7zWiFkD&veQRoIzPZGbwA?EV{6KHf7;+VZ|KETH!_)SIwhK ztAC(^t&8c>T2IPe=SBIOedzM~g_Ql%0=l+o5nb7+!@uLR0iTVFC~uoT73>V8D_eXi zXVYSQ^`k4>me8L&m(i_XR?#(lEehLAccMaQ)y#1ezTBJ2j{Hs)$>CIaESgG_!s+%O zVYJiFlZx>DoukqC8Dpt9C5lRp#ZdW)!&I7{KozHx=+(Ea=zdT`?^{Z(+C{wmA^M}N}a#Rc@R=q6Q{-lD%t z3h5#Ky}GP~YVK9gWAImVzmgu~`{z$;=vmEUa5W7a%>p-b=)#X~bYbOOx(I$Qt(gxF z7Em^LxxB%fvcbuUi6iK0@KVbC`A53GXAPa-v7GYvZ={>y!E|oV2D%luhi)hQMkR@1 zbn(Crx{G3$|?GNZMk;={;ql&C_D$hJlW#`kVoWH+tf+{bcrK+o$bnjXg zYJLGfV>aEpehEKYE`BEbJa=x>qq1VEzFS03s~^&nzyG43v4iR6p`Y>Jfs_1fx_{#e zG*yD1x0s&%b&qNuRMD2{BWa(<7}_!S8(R1M2#WBTLRTZU(>?t6k19&($;12f{OJ>V z20k*@&!fvBew2ux|Ma%Sl(Z#)PVQa_-tN-l`xTVDYzqFr52z}3HB}{Ur>fLFRGI!e zxO@!VKcuQKcghM4qN<&P>G`v#lpnW}ZXEKXvfceCd&d`aa_ex)4xfd4|D2vbe@6e2 zGi=zf;r}~g^tq0?r~nmK#UoC62k-Q5o!JQ$7> z$tQ|WR#w)bLx*BwyuBAK^7Zxe^EZ`9u?H>ILV2v5OZyaz<44n#Gvu6VqZ~@j!xHMQAuEU3y{Go8ABp(ej;#v({r+xyg zO&hmtK654``$nHW!5Xgf8m$CIcKLK4I-!BYl zTm7O<8zW!C{(~|OS9GC_-+ue6;2Jj$Wn{WgM$qNPXRbPtk@M!&Dx(I=*AKA3*HS4X z(*;~VrlE|h*Irt;?x&wNY#6j@3(9zzaSaJpWdvP}YZv2c16W4BpsrznrRW+3bulhg z#)-f+6S$@yaGSwL!!>vAJU*;1rLH=3vAj}}la_0ArJq!Ep^O{8*tikuItzLA3EsJ5 z$CaEMQ5WM1329r<2C6sm1-ga}C*+0laq}#9~&pj0ScJl z61rISiY^7~DELxzDO{&S^^h0Jc$VoJvi&Y_8B|{=>SDs=u)dfs@bxp~HHztCSdcx` zwO`Q%Saat(xmxLLwWG6gwRRdX?*|;?Z4_KkJ(p3h`XBi=8tEFemFW_BaT!4u)TPSE ze6^|8!xG&~8Ap8iCF5d~7{hca)lZ!=Yo?H8W2MvSJUl##itvYy0qR_x1_&^tOR(x; z5=#>mu3B`#B)E)n8#6BVz0r4wQvJ=(6s(V#E|z`mI--hf5<=HEP#4Tg(FN5{o;d+E zWK`!lPom7y9`0!}0T7EPh+w3ADavQmf?DZe-Dhw&8i%Xf;NO6f#qrUltO=66wYtqE2 zlP6D~VWaZ^SBGMK`uhj;?rmR^YirZpvA08iUptqsR<^dTP5>r+DY~@VXf!WTJ)wAC-T`-BC;S&1WsCv-;sh~^2%8CIj2f*rC`t<2_ zTc=MQ9eelaZtv37)z;R^k_lUg+sK}(sb0)06}NFWA`eWK-3f7h3lCiJ?;_On1}eMZ=+D zeHL>Odp>+pgY!gyb#v_8LosG;0boAh%Rtvr_IkdJta`0wZ(!A*K@UR9<|x5*eI}|m z(4~2*0T=fmNjTDiH1iU=T=R;vVq;?$_G58%FBMn%+NuXzFKWRe$cw$6>o{t(QvFylFVHo4#sQC8 z2eZ6m7y2w_b!9#K>#x80)YRlTnSbW^gLxfY9>mEj4K4e`pQ|sa z+h|B$8m=7RI;SNsL>yz3V7j=D!(pmFbMhKJT1AO{`^F=AO_}_in@3SGt|FI_aXowd zxT1ogJ$d@9Q_4pG*2Mw9Y;0|*|g_R&?9l|WXe>jYE+tVd6~I9Cw%`R88! z3_(@%dQLbjFGI_gpbEM;5kg)P2tQ%fGp_1-xR@@vj-cz;J^CIb>hdUxh&q(TxL~OP z0ln?x?p0L*SS?&!NgJK5b!)+;wMI?#X~$QcTn)1aE>1XG5G8OKxr|!N);tw_)t49Q z$m$v?WmE}gte7frO+S!VRvgIz3%J<60$#?|txJ!dF3})t0B|iqA~dvYm{;0yEqNJC zLSRWE6!SXw06mCveL-6!FGCL!eGL_pP-U!TUZL`YmfX!=HA(BKLQ)S(A8AV>4 zaI^p|s-NJd%e|I&>$U(}$Q`?XeB5IH#hyP@6qU4MTzr7b-X+?K3%Ov4p$Cb1rKNL# zR`Z4=oXr^-+ZdN5ubZEhqhl*meM$91!-o%ty0`}!gDTHKkiC2E)!e)?1_r{=n0@@> zA3oyq_@PT@!SrsIE?qjKkWjv>#petBkH~nY1y%H*3uxJERBKepYa7(nXK<~S4P3B# zmRB9s0~gAunvj||#*F3hY(LEFy8~CRf-nsjXJyVq3_Ihoa1zo~do!dB#>dhO^3DC98 zo`w=9FEKBey|Ii_HC$nOV7DR|SUw*Ymrn2Cv})C=gE@0%ZfSN$GDG>w!=pp2s#76(p>T$Y?(KB4nl8K%M!ps#|B?@*dqG30hdZ% zs*L+XIjM3TGZkU*eQRq=E1flf#YLN$0T@$e;H;9ynBW33 z)Y80DSKP+|UW)?)laqr~8Kq^jd8ymT$xEjHAuKN~O2E5hY{YGRUXQTxq)pk%yvFkM zKOS^pDWS(D3M+DI*wDnpq-D!SRs*b@nyW&-(+aRUn0ElI5}lO=a3#uRl(A8-dbRW7 zmd)cCyq?FioSXV6ftJlCQ4bcm5xWG&jbFa~FXW|_@q5NKea3+>sUv$>v1P-C4O%xG zU}@6Q;En8{|1FBY?x<;3lSXr~|Q`AyIf+}vKo-Q?SAgJkKR3!ql{BtlD*-y=EOv2d+4?fdim(t%37CBy?^0JlS|f1rI6HQ) z^q{Fzr%juQt%Tcr5m;_saeln-;hu{Cr9lHz{L`dy;*6Iv)x;1~5ePYWiRw{C?3U*0q>#Bq`HK*~ z`up0)cWPqVw25i!CMKw_suu;SJ zJJ`jkGI}lW4@^l~9;7Wxcs$d}h@iR|2}e!YvLehewCuLhg6gZD2)Hn0s|B>Sl#osD z%-P^;1``Hc5x%{HQda~yE?E>6-mW>k!PNAPCJn$`!={~qtF*M#)zxAFZexle;qXRv z4dx(D63Xj^F6}nT5=WL2g-}=Bc|#GFYQjMk!5+C@a7|+K;xb|}K7B?66P8=-&G*A zeZBF_P)9YMaZuHAJ#SRiV%%-UT#xISVONX1d!sx-jB8%I*I$3VS@XBe-+!a2X#>;u zI@rgRczC#4dxEY&MVI9I3nwpXLG=sSEu9gQQ1b?MOA;k^?ZQI!6}K_fgz1vY$aJyl z#Z=Y8-fhM~+pw_fdHMd1K|x8q{e7G}c4S~?&0Dyt{BEL0E3FFNU;${$3w^(6OW0>t=7h*`j%Kv*u=I?ReE{ z#Z`0&1YI&VBH>`(P`fzJ&%E=J9gg&%9WXCmU23biw$+BkxTY-q7cQeVp6!#MDyrv) z1Uv`1xy=Z-ozK8x7bhen{Obb-*39g!x84LOvv%!(3b4Fc^ibDP{fZD{<654wIT4)_5i1!{?!6nJqPKZsqpGDcdi0f6zS>3uozhj;A+v_tXYYN ztp=+<1|hU;S(ZRv1NEv0U;K`sTDBw!Uf9cRl;p*@{uvhORj(~^cww)~s9w(iEYfQJ zbx@Y~?~aTL;Qqz1+Ii&J&Y$n$+S1bt^TtwbF}`9Y2h~~u8qY!O^)hd$K&T}zY$cSb zz6zHy;f$L!(P&=U>)F9@Jh?>ZpngW?9tq)hbne)$nTKvZj?UT=u&}b@ofqg*En7cj zv#D<6K&VwLBcWEa*VheBP4B zc!4c{Y$fD5NM0M$u&`IpRI)6Q0Ii??IoG2%BG)6>hhX}zyNiRYw6k>HZY-dc*Be`Q z-A7PnY+j@lBMS>-Jn8_|Ax|zMwi5gZYS^gq&I{gEC#YgP3s&zg0*mL3kiu$~mmW#o zujfBfrm8*8?*CoA>Z#jU>#-4!RFSTY0Z0$c)~Y2?d3yOQR?CuF^M;n|RZx`x-HSKS zDoQBx`eYYyNe_BO8QV3|PqVxt+|NN(^`Lrh#&~YzW9j6C*EA=*rs0tTJ7}y@^pCUZ zRgcX}+bxMn$g7@OK+BYkuS*wZrM#`w>jftvdv#Hj@6&0m`$qO34yf|Z_ z3Rs7E1I^2lqbhmfaaOf#wIbAlDq7GTo@T}C^`?r}h*zpt@U^jt3aYY-`%PN5-n?FZ zV~>ggA_dCX6B{wVe#VWe@iwB2`W4|I399_YF1sbh#a_><=OxaoS`bM4>jyEeGZ~j*UU#&eSGm@M?u$vhO7%n& zdP(v!OxcE(UFTO4n`hR*5;WxgB{twri+}r>F literal 9744 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 diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html index 258a3f76..3b56a013 100644 --- a/Contrib/Modern UI/Readme.html +++ b/Contrib/Modern UI/Readme.html @@ -173,21 +173,47 @@ Display an image on the header of a page.

MUI_HEADERIMAGE_BITMAP bmp_file
Bitmap image to display on the header of installers pages (recommended size: 150x57 pixels).
Default: ${NSISDIR}\Contrib\Graphics\Header\nsis.bmp

-

MUI_HEADERIMAGE_UNBITMAP bmp_file
-Bitmap image to display on the header of uninstaller pages (recommended size: 150x57 pixels).
-Default: Installer header bitmap

-

MUI_HEADERIMAGE_NOSTRETCH
+

+

MUI_HEADERIMAGE_BITMAP_NOSTRETCH
Do not stretch the installer header bitmap to fit the size of the field. Use this option only if you have an image that does not use the whole space. If you have a full size bitmap that fits exactly, you should not use this option because the size of the field will be different if the user has a custom DPI setting.

-

MUI_HEADERIMAGE_UNNOSTRETCH
+

MUI_HEADERIMAGE_BITMAP_RTL bmp_file
+Bitmap image to display on the header of installers pages when using a RTL language +(recommended size: 150x57 pixels).
+Default: Non-RTL bitmap

+
+

MUI_HEADERIMAGE_BITMAP_RTL_NOSTRETCH
+Do not stretch the installer header bitmap when using a RTL language to fit the size of the field. Use this option only if +you have an image that does not use the whole space. If you have a full size bitmap that fits +exactly, you should not use this option because the size of the field will be different if the user +has a custom DPI setting.

+
+
+

MUI_HEADERIMAGE_UNBITMAP bmp_file
+Bitmap image to display on the header of uninstaller pages (recommended size: 150x57 pixels).
+Default: Installer header bitmap

+
+

MUI_HEADERIMAGE_UNBITMAP_UNNOSTRETCH
Do not stretch the uninstaller header bitmap to fit the size of the field. Use this option only if you have an image that does not use the whole space. If you have a full size bitmap that fits exactly, you should not use this option because the size of the field will be different if the user has a custom DPI setting.

+

MUI_HEADERIMAGE_UNBITMAP_RTL bmp_file
+Bitmap image to display on the header of uninstallers pages when using a RTL language (recommended size: 150x57 pixels).
+Default: Installer RTL header bitmap

+
+

MUI_HEADERIMAGE_UNBITMAP_RTL_NOSTRETCH
+Do not stretch the uninstaller header bitmap when using a RTL language to fit the size of the field. Use this option only if +you have an image that does not use the whole space. If you have a full size bitmap that fits +exactly, you should not use this option because the size of the field will be different if the user +has a custom DPI setting.

+
+

MUI_HEADERIMAGE_RIGHT
-Display the header image on the right side instead of the left side.

+Display the header image on the right side instead of the left side (when using a RTL language it +will be displayed on the left side instead of the right side).

MUI_BGCOLOR (color: RRGGBBR hexadecimal)
Background color for the header, Welcome- and Finish page.
@@ -224,7 +250,7 @@ text (with the default font).

Bitmap for the Welcome- and Finish page (recommended size: 164x314 pixels).
Default: ${NSISDIR}\Contrib\Graphics\Wizard\win.bmp

-

MUI_WELCOMEFINISHPAGE_NOSTRETCH
+

MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
Do not stretch the bitmap for the Welcome and Finish page to fit the size of the field. Use this option only if you have an image that does not use the whole space. If you have a full size bitmap that fits exactly, you should not use this option because the size of the field will be different @@ -241,7 +267,7 @@ InstallOptions INI file for the Welcome- and Finish page with space for 3 lines the default font).
Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini

-

Uninstaller Welcome/Finish Page InstallOptions INI Settings

+

Uninstaller Welcome/Finish Page Settings

MUI_UNWELCOMEFINISHPAGE_3LINES
Create a bigger area for the title on the uninstaller Welcome- and Finish page, to allow displaying @@ -250,14 +276,14 @@ Create a bigger area for the title on the uninstaller Welcome- and Finish page, Bitmap for the Welcome- and Finish page (recommended size: 164x314 pixels).
Default: ${NSISDIR}\Contrib\Graphics\Wizard\win.bmp

-

MUI_UNWELCOMEFINISHPAGE_NOSTRETCH
+

MUI_UNWELCOMEFINISHPAGE_BITMAP_NOSTRETCH
Do not stretch the bitmap for the Welcome and Finish page to fit the size of the field. Use this option only if you have an image that does not use the whole space. If you have a full size bitmap that fits exactly, you should not use this option because the size of the field will be different if the user has a custom DPI setting.

-

Uninstaller Welcome/Finish Page Interface INI File Settings

+

Uninstaller Welcome/Finish Page Interface INI Settings

MUI_UNWELCOMEFINISHPAGE_INI ini_file
InstallOptions INI file for the uninstaller Welcome- and Finish page.
@@ -457,9 +483,9 @@ Do not display the checkbox to disable the creation of Start Menu shortcuts.

MUI_STARTMENUPAGE_REGISTRY_VALUENAME value_name
The registry key to store the Start Menu folder. The page will use it to remember the users -preference. You should also use it in the uninstaller to remove the Start Menu folders. Don't -forget to remove this key in the uninstaller.

-

In the uninstaller, use the MUI_STARTMENU_GETFOLDER macro to get the Start Menu folder:

+preference. You should also use for the uninstaller to remove the Start Menu folders. Don't +forget to remove this key during uninstallation.

+

For the uninstaller, use the MUI_STARTMENU_GETFOLDER macro to get the Start Menu folder:

 !insertmacro MUI_STARTMENU_GETFOLDER page_id $R0
   Delete "$SMPROGRAMS\$R0\Your Shortcut.lnk"
@@ -567,7 +593,7 @@ LoadLanguageFile.

 

 
If you want the installer to display a language selection dialog (have a look at the MultiLanguage.nsi example), insert the
-MUI_LANGDLL_DISPLAY macro in the .onInit function.

+MUI_LANGDLL_DISPLAY macro in the .onInit function:

 
 Function .onInit
 
@@ -575,6 +601,7 @@ Function .onInit
 
 FunctionEnd
 

+
You can also use this macro for the uninstaller, in the un.onInit function.

 
Language Selection Dialog Settings

 

 
To remember to users preference, you can define a registry key.

@@ -583,10 +610,10 @@ FunctionEnd
 MUI_LANGDLL_REGISTRY_KEY key

 MUI_LANGDLL_REGISTRY_VALUENAME value_name

 The registry key to store the language. The users preference will be remembered. You can also use
-it in the uninstaller to display the right language. Don't forget to remove this key in the
+it for the uninstaller to display the right language. Don't forget to remove this key in the
 uninstaller.

-
In the uninstaller, insert the MUI_UNGETLANGUAGE macro in un.onInit to get the stored language
-preference.

+
For the uninstaller, insert the MUI_UNGETLANGUAGE macro in un.onInit to get the stored language
+preference:

 
 Function un.onInit
 
diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index c21c7b99..f76d7494 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -106,15 +106,25 @@ Var MUI_TEMP2
   !insertmacro MUI_DEFAULT MUI_UNWELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"
 
   !ifdef MUI_HEADERIMAGE
+  
     !insertmacro MUI_DEFAULT MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\nsis.bmp"
+    
     !ifndef MUI_HEADERIMAGE_UNBITMAP
       !define MUI_HEADERIMAGE_UNBITMAP "${MUI_HEADERIMAGE_BITMAP}"
-      !ifdef MUI_HEADERIMAGE_NOSTRETCH
-        !ifndef MUI_HEADERIMAGE_UNNOSTRETCH
-          !define MUI_HEADERIMAGE_UNNOSTRETCH
+      !ifdef MUI_HEADERIMAGE_BITMAP_NOSTRETCH
+        !insertmacro MUI_SET MUI_HEADERIMAGE_UNBITMAP_NOSTRETCH
+      !endif
+    !endif
+    
+    !ifdef MUI_HEADERIMAGE_BITMAP_RTL
+      !ifndef MUI_HEADERIMAGE_UNBITMAP_RTL
+        !define MUI_HEADERIMAGE_UNBITMAP_RTL "${MUI_HEADERIMAGE_BITMAP_RTL}"
+        !ifdef MUI_HEADERIMAGE_BITMAP_RTL_NOSTRETCH
+          !insertmacro MUI_SET MUI_HEADERIMAGE_UNBITMAP_RTL_NOSTRETCH
         !endif
       !endif
     !endif
+  
   !endif
 
   XPStyle On
@@ -362,12 +372,37 @@ Var MUI_TEMP2
   !ifdef MUI_HEADERIMAGE
   
     InitPluginsDir
-    File "/oname=$PLUGINSDIR\modern-header.bmp" "${MUI_HEADERIMAGE_${UNINSTALLER}BITMAP}"
     
-    !ifndef MUI_HEADERIMAGE_${UNINSTALLER}NOSTRETCH
-      SetBrandingImage /IMGID=1046 /RESIZETOFIT "$PLUGINSDIR\modern-header.bmp"
-    !else
-      SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp"
+    !ifdef MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_RTL
+    
+    StrCmp $(^RTL) 0 mui.headerimageinit_nortl
+      
+        File "/oname=$PLUGINSDIR\modern-header.bmp" "${MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_RTL}"
+        
+        !ifndef MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_RTL_NOSTRETCH
+          SetBrandingImage /IMGID=1046 /RESIZETOFIT "$PLUGINSDIR\modern-header.bmp"
+        !else
+          SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp"
+        !endif
+        
+        Goto mui.headerimageinit_done
+      
+      mui.headerimageinit_nortl:
+      
+    !endif
+      
+        File "/oname=$PLUGINSDIR\modern-header.bmp" "${MUI_HEADERIMAGE_${UNINSTALLER}BITMAP}"
+        
+        !ifndef MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_NOSTRETCH
+          SetBrandingImage /IMGID=1046 /RESIZETOFIT "$PLUGINSDIR\modern-header.bmp"
+        !else
+          SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp"
+        !endif
+        
+    !ifdef MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_RTL
+    
+    mui.headerimageinit_done:
+    
     !endif
     
   !endif