From 5458fbf3913ca8066d1a46951c9b791cd80f86b1 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Fri, 15 Nov 2002 15:07:09 +0000
Subject: [PATCH] New lines in labels, different rect and dialog background

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1725 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/InstallOptions/InstallerOptions.cpp |  51 +++++++++++++++++---
 Plugins/InstallOptions.dll                  | Bin 11264 -> 11776 bytes
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
index 80fb8636..bb94a717 100644
--- a/Contrib/InstallOptions/InstallerOptions.cpp
+++ b/Contrib/InstallOptions/InstallerOptions.cpp
@@ -161,6 +161,7 @@ HWND hMainWindow      = NULL;
 HWND hCancelButton    = NULL;
 HWND hNextButton      = NULL;
 HWND hBackButton      = NULL;
+
 HINSTANCE m_hInstance = NULL;
 
 char *pszFilename         = NULL;
@@ -174,6 +175,7 @@ int bCancelEnabled = FALSE;   // by ORTIM: 13-August-2002
 int bCancelShow    = FALSE;   // by ORTIM: 13-August-2002
 
 FieldType *pFields   = NULL;
+int nRectId          = 0;
 int nNumFields       = 0;
 int g_done;
 
@@ -460,6 +462,8 @@ bool ReadSettings(void) {
 
   nNumFields = GetPrivateProfileInt("Settings", "NumFields", 0, pszFilename);
 
+  nRectId = GetPrivateProfileInt("Settings", "Rect", 1018, pszFilename);
+
   bBackEnabled = GetPrivateProfileInt("Settings", "BackEnabled", 0xFFFF0000, pszFilename);
   // by ORTIM: 13-August-2002
   bCancelEnabled = GetPrivateProfileInt("Settings", "CancelEnabled", 0xFFFF0000, pszFilename);
@@ -522,6 +526,34 @@ bool ReadSettings(void) {
     pFields[nIdx].nFlags |= LookupToken(FlagTable, szResult);
 
     pFields[nIdx].pszText = myGetProfileStringDup(szField, "TEXT");
+    if (pFields[nIdx].nType == FIELD_LABEL) {
+      int j = 0;
+      for (int i = 0; pFields[nIdx].pszText[i]; i++, j++) {
+        if (pFields[nIdx].pszText[i] == '\\') {
+          switch (pFields[nIdx].pszText[i+1]) {
+            case 'n':
+              pFields[nIdx].pszText[j] = '\n';
+              break;
+            case 'r':
+              pFields[nIdx].pszText[j] = '\r';
+              break;
+            case 't':
+              pFields[nIdx].pszText[j] = '\t';
+              break;
+            case '\\':
+              pFields[nIdx].pszText[j] = '\\';
+              break;
+            default:
+              i--;
+              j--;
+              break;
+          }
+          i++;
+        }
+        else pFields[nIdx].pszText[j] = pFields[nIdx].pszText[i];
+      }
+      pFields[nIdx].pszText[j] = 0;
+    }
 
     // pszState cannot be NULL (?)
     myGetProfileString(szField, "STATE");
@@ -673,6 +705,7 @@ BOOL CALLBACK cfgDlgProc(HWND   hwndDlg,
       }
     break;
     case WM_CTLCOLORSTATIC:
+    case WM_CTLCOLORDLG:
     {
       COLORREF color = GetWindowLong((HWND)lParam, GWL_USERDATA);
       if (color) {
@@ -710,14 +743,6 @@ int createCfgDlg()
     pushstring("error finding mainwnd");
     return 1; // cannot be used in silent mode unfortunately.
   }
-  childwnd=FindWindowEx(hMainWindow,NULL,"#32770",NULL); // find window to replace
-  if (!childwnd) childwnd=GetDlgItem(hMainWindow,1018);
-  if (!childwnd)
-  {
-    popstring(NULL);
-    pushstring("error finding childwnd");
-    return 1;
-  }
 
   if (!g_stacktop || !*g_stacktop || !(pszFilename = (*g_stacktop)->text) || !pszFilename[0] || !ReadSettings())
   {
@@ -725,6 +750,16 @@ int createCfgDlg()
     pushstring("error finding config");
     return 1;
   }
+
+  childwnd=FindWindowEx(hMainWindow,NULL,"#32770",NULL); // find window to replace
+  if (!childwnd) childwnd=GetDlgItem(hMainWindow,nRectId);
+  if (!childwnd)
+  {
+    popstring(NULL);
+    pushstring("error finding childwnd");
+    return 1;
+  }
+
   cw_vis=IsWindowVisible(childwnd);
   if (cw_vis) ShowWindow(childwnd,SW_HIDE);
 
diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll
index be65ca8842c700ca675692ed09cd86d7c53832f2..d82c16d4a0a33344dc418dd73c1bd8fcc12b2934 100644
GIT binary patch
delta 4337
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

delta 4065
zcma)9e{d6Z7T>f@8%ml6+QqiEl4^iL4eqaOHrY*Eq(~hRg0a7#{5tV&t#}8RC`yO)
zOc{yWBFt6~lsk+;Jx)jAa7OfwBenG^4mx^Zi+X6iQCxm0<8f6{+<R}6)N<n=*O}eC
z?|Yy3zHi^J@3)<8oh{o=R3^?J_Y>*A5yDnE(UeONQ-E<zifP^c-Nvljv(@ccth(1U
zBmW)}_;z@vs2`fDXO^W<nRgvQ)XiSKDzpk1zb}LrFo+y@u2pAe&6qhIsBwRFh+co^
zn%~?(5J$5?uo50bR~^`tHDV%r7ZLWJoMaEzr`*ITo21x0E#9Wyo3qZ;tA3ud>N-Qt
z>3yfNmHJ$eUW~VaMr__uZP$;w9-DVO-mBha{<W!1Jz?&hu>)kA8k7RmVn=&&Y|#zH
zc^%ckV7pCUE9vB4DZ&m?Rn4uu9<d$CeWn%5m-hFhcd$`ne~1hQ1G*cx(aC*jg^^tT
zDpV-k`jCkr6h9h@)jNyPm@BW;`fY=;zFt2T?>%r^-gHxC2+&P(%Z-FxMxjm?qp5nQ
zBMNE_qIrk9)8Z&Yn@v6I^v$D%-P<85J;kHVegDc<{JrWi3lqWbP!{AnVhxUH-<eoL
zN$S&p<%~5r#}?(WhH|AYEsSc}vHE<6Qh>JS#EhSX(K8LOMbG`ZuCG|$ue;H^&S~Gy
zg*3|=q(w$j-UVDe<Sa2BlB3kF30Fl>qHVmS>#b+A*yQULB6`jmY-;}7YSd_hSCcjf
zX5|JX6C1#U_6n{AW8H!4=WtzRtUGc2J6NZDQ2b5^OQH+7?Sx#85Pdi$`U^qmdSXWe
zL_yg;UXs{i@Q5pT-3IR>#2YLmw!tcn0oa@@+*%GF2sPF>k`vH+zXPKf*0i*>aO>qP
zf@ow%2kV{oeNdT)oeK&3A^d8{mffuG&%Zjd2WqWRw$y>|>um(l+L{V|tlm}}M`O{B
z++w1zs}n8BYXR2Nmdk1L0XiYOwN-8aubQ=PFp|<U%Az@zW7BRy!<q%0N=XKDoSz{W
zEazxTGYS#Ad?L-YXr;j2oD5Y*lUV_6-?tgfM)^2EK+kG;q=#~?I{5+wH#%TX$GQSz
z4Pictw)A6T-*A0O4w8ZK68Yuyo>h~ye_YP&13OUAb1l{z^0A1F>S<KBTgxg>eFHU;
zGTI0zd&Uo_{c_kCl#W`<BB%sA^^V^O&?RF&^v=1`JI9!0+yCg4k4d(Sm&l!Izn$6>
zKVYm1yS6}UHR`05A|iJG7f=rOTIJP%0$vHY*6GJ|6UrOPNo?w~&7A@fYUva^!Z&wb
zM~Elx;{$RC;5z95^yZ}TW#PQP*XIhRvt`gN#h7m+@tVnsNmtsOj@H(>U?OxW)&_H;
zA7}z7b4fS>k@&Kp;sz|w!tPRt>@to29vgF?X=!x8+Rq+o@-A=|H-{G~B!a~EHq8Sa
zpN-GI1!8<Qcd@o=RDIA^miI7xS5%v!?zT;J)IuqAB}4Z|bv>M`n=iu95r0H#0o1c@
zzMy_=Yl(ab#RCPwCRZ#!^17XfuLSeab1lI}_M@g|u|HOUYOxAb35F+W4mc>FB$E)G
z)7e1F2Z4g=NOnOS6n7`Q#r{Mcpu<)2C5Wr;MvMAThC4Z^{nKpNcnWPq4#OfI0KC{=
z*!2u76auLyfr=(`Knu&GuuFk8<e;$YAt1Ci7(QK)#V{;%H}0mB9jUD~a5q#C%y2gV
zw>>N4M7t@m8of#T)SjJ)$m7<EJA`nP?nYE%4T^?9=Nyh}w}Bi|Tn7Pjn1G?*EIV#R
zfdL+w59IrCoNjPp6a-RioqQS4&2kI6n6mJG94B5HBNyQwX^@5{+-nx85qnuAjw9_b
zPCRiiGy%+|youvf15Qz9gQ0IuT%D{-)WZgGoN*v4MOJjgl7WyIghV;`nmVT7@T1cq
z7!Jx>Dej6%f=YL`->JLT0$r<<Ye5U*kH=nN*BP9c_0B4=nF{v+NENpX?=(A=W>`>w
zS*h-x<n*DcPOb(F#5CkAZ>Q3y=&(+%1TMA~oAg#-NhccM3ktUu!afSwd*JdU+Ek2=
zRJS?n6ir`OSG~sB0P5<EMb1*h0t&=E)+4d{x1@NQqehCHc^UdoMKj0f4~v%A4gRsY
zk4)@35<U*<YJKtE1<0&}!*|Su?r&g3q_Q0KZvZwCa>{r?kxOpQL`r{OccUmBMI(Rc
zo0oJ=-vVWQwjijLKqo?{tc9gk4>X%>ty{5t8T4~Ye>|Xelh>F6>hol2ITk+=^2QzT
z+Z0V&0_}A=DL{C1w?iEvi<colA!4~ko5ZN){n2yfjZKRCDZn(#m#>5H{*d-$sNIri
zF&s<99y6b=J2DA0dmaYdE+7>D4tU307u3a5N+uiN;myf#HRR74!2E5TGA(ied+9~5
z3!6V|)=pl~^*CA=-v~_%{IqB0YP1C`dR^EoiXR&(G@&uw1;bt!_J_eR+GtpDV`Buz
zb&x(ZzDtH=ZGHrOPnErK^m{9?_(L|`jnzJ8x&q67X{a=g75;Oj?{#6WLIvX!IOKI1
zlfu?+$y9VIRtVMX=kYoc=|I|S(AcxurE|!}tBLj%kjB{bx^}=iUA;JcQ|BGrE_AL>
zdlO)(+B9yU$PM-7X#0PTZPlK*k{wCG?OOCoeu{0;)@0bxf#NGm_yOZOh5ez;2T-Fn
z70#4Y9$Q;Oc?UJD(aByH&h~>Nun3zEo`9c#HXDGgP^Qs=@_uz!Nl7GCM{6Kidbn5*
z!`rHdA!b+yI=Kh<%i!36i&0M0Ujhjr5;zE8ZAoB3<Bcg{6fhK4;&$MKtnvleO4|=@
z*4nSl9>oJWJQ~nsWSl;U-S?BV$p35Z4#V7_8GV4+Oq?G2k73A?aqH*338%er8tQrh
zs-Iqx@u9<6WXVq87z*V@JDe5*J|5cqjnWVQTs~mVhJT~f!OF^f(Mb?7c;0g!__}hI
zS#{1hvz@XWuvLwkOoVElm57w`Q~4_1#k0J`&*A6ui}>65d-(Od!f)eu^Uv}x@~`oO
z{JZ?8{J(jf&+(Lc93IN!_T1)a@vQRP?Fo4v^!(QIh^N={q-T$3ujf_I>z=PYmpxg+
z1ffEhA<zOZEEZaXRl?oEdSRomS?CrX6Lt&F3NHyS3vWk+4}=lnlwk4Nyrj3<8}zR8
zKJMM^y}{@8)%q6tmiofJi0_ZSSAB<l@AyvmMtrAy=Y5xa+2UleTolA5;!5#X;#%=O
zag+G4*dsnJ?h^NiFNpia*Tkgwrg%*JK>S$zT)ZHTia&^1(gdkkDw7=2bjc+NQjHXu
zD+Q$`(w)*e={{+Tv{h22ol-)2UfM4mlKQ2$q>rRer7xtfC0%m*XZZzxoqvIUv45Gr
z$G^k>XwB0#uhjI_4A#6|^FhrgH5Y4gYV&KkT3_vBwR>s_2SHdM;Zvw<shQM5s*zek
z{gPTkJwQdMhp8S)rFK$JN2tBjAT>mtqs;U~dI~*_cF{h%jt<a`^m6(h`d)e?-9<k_
zZ=)ZlchS$#&(r(q!}MG9NAx-Rd)mZIU`Xa#W)?#+JR>plm|K}9W;wH(X=m0k_cNQA
zE@nHkliAHY$GpTGV)~gQ%)87G^D(0_UosaNomrL7lI%2g7R$3Yu?yH`>>X@~eUMey
z?d;R+3+#UO5c>{0%znat#-3$K?rP4(vD_SPJ{RCxxnFR1agTD3aev^R<Mwf{a0A>h
dcal5BeZ`G(+3qRsY3^$GLX~u#RkxY!{{;nDqC@}y