From 79ddaab5541f52e31c8cc9fb24435310e18e8d0d Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Wed, 28 Aug 2002 22:38:14 +0000
Subject: [PATCH] Languages are inserted backward Language in language is
 selected automatically Dialog caption is no longer dialog :)

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@801 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/LangDLL/LangDLL.c |  18 +++++++++++++-----
 Plugins/LangDLL.dll       | Bin 4096 -> 4096 bytes
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Contrib/LangDLL/LangDLL.c b/Contrib/LangDLL/LangDLL.c
index 44bd4358..d2cbe450 100644
--- a/Contrib/LangDLL/LangDLL.c
+++ b/Contrib/LangDLL/LangDLL.c
@@ -35,6 +35,7 @@ enum
   INST_INSTDIR,   // $INSTDIR
   INST_OUTDIR,    // $OUTDIR
   INST_EXEDIR,    // $EXEDIR
+  INST_LANG,      // $LANGUAGE
   __INST_LAST
 };
 
@@ -61,12 +62,19 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
   int i;
   switch (uMsg) {
   	case WM_INITDIALOG:
-      for (i = 0; i < langs_num; i++) {
+      for (i = langs_num - 1; i >= 0; i--) {
         SendDlgItemMessage(hwndDlg, IDC_LANGUAGE, CB_ADDSTRING, 0, (LPARAM)langs[i].name);
-        if (popstring(temp))
-          SetDlgItemText(hwndDlg, IDC_TEXT, temp);
-        SendDlgItemMessage(hwndDlg, IDC_LANGUAGE, CB_SETCURSEL, 0, 0);
-        SendDlgItemMessage(hwndDlg, IDC_APPICON, STM_SETICON, (LPARAM)LoadIcon(GetModuleHandle(0),MAKEINTRESOURCE(103)), 0);
+      }
+      if (!popstring(temp))
+        SetDlgItemText(hwndDlg, IDC_TEXT, temp);
+      if (!popstring(temp))
+        SetWindowText(hwndDlg, temp);
+      SendDlgItemMessage(hwndDlg, IDC_APPICON, STM_SETICON, (LPARAM)LoadIcon(GetModuleHandle(0),MAKEINTRESOURCE(103)), 0);
+      for (i = 0; i < langs_num; i++) {
+        if (!lstrcmp(langs[i].id, getuservariable(INST_LANG))) {
+          SendDlgItemMessage(hwndDlg, IDC_LANGUAGE, CB_SETCURSEL, i, 0);
+          break;
+        }
       }
       ShowWindow(hwndDlg, SW_SHOW);
       break;
diff --git a/Plugins/LangDLL.dll b/Plugins/LangDLL.dll
index f8b95c6b39763672ab7c5f15cfddf4edcd3795dd..04d3519659b9ea26fca953bdfb76763d7cf755c2 100644
GIT binary patch
delta 1100
zcmbtTU1$?o6h1eZq-h(?R85U&VL~DmtuXgC-K}V`(nf0$x7c=uP+EUmr-OBiPN;?0
z3bl#`p=Ep$5v#Zl%dW~sQK(@216@`SwkwK0R6!W6_=otj4?CVaN!<q@J@C!B=R3c1
z?#w=EpENR5bMWF{+a~@;=fpVLzua6laUS)P*DVtlQ1AM4i=!J~ZgTX7?yVZn84ZUP
zH^l+g5f5~4?5TmgOv21?G4TQjNceMP#VpfB))$@+1FS`+)=ZEH={3h(F+oCeG(6wD
zM|`Bud`Qa4XOp=4$Zwf`*FiGantqv%`;{R}G(t;(02qk|L#WJ7MFN-NVuKNGNS10K
zgJ{KF012JgNuM2zNg!5cYdhMni%|JNQM5Ifsl9LmIBpr;=^1{^vW;tkRm?M$sas=G
z4EZYVZB~!$vBzJy2LXodRA|hJjeXKVtHVmoyvqHb`mL)H)=(`Ix#4Ug8Bn#?(>*G%
zifZ-eJw>Y1coCn=R`u<w9Rxf#*}*7RS}(?FZ}PeKm(}n|2CDQ>os~gPqA53k@ky|Q
zAxs#~8pUgtJ5i}eQ!{l?we=X6n@jgNy(Em=*!KM6e<tz#Sdc(>da2)B>4^>c&{Nx_
z*V_N&mY^J}4+!}V1=s=aL{zK}yeR%sam5aPn;``9J1NM;*DWvOGp9yyMIeHxgWhRZ
z`S^;1)qIkU_O=`8`lxW)XTI}9X7L{B8BxA)uX2dkLD4MtM&|mFwyQ);OTV#=sQ<`n
z0e3XV-0UqaTNf3E@1*7oeV(^BFvddy=dQUu6<Fd%Wj2%aR*<gS_%%I7ScvxsR~SG<
zT){J!#dxkp)FTvxh8RE`MsP_<j&dFgIEVIe#IzhoPLf8$rH$X)>6ClNZe!Qhp59gF
zufBnj1Fq&yL+#$V?dQIh&OOE|Fv|<um%!H_>nS!SIK?y`p#2yziKr_9cxC=x82O_}
z5O(xp)I#|Oxm9kHd*t2n0r`Y{S-vYjlqcm6vX_c<KCPx}=?2<PyJ!y`p!?}jdW>f1
zReFd1O`p-X^k3>`MQk=JV-ZH#3f9WnSQksOz3ea>VJF!cc9z{_cUh*SXoP$Li`X|%

delta 956
zcmb7CQAkr^6#oBtH#eJlCtWpExMRyq68`^g(^M9QGfhH9x*Kac#S(9$B<h+3;sl8p
zBT#<mA$qY^6!l<QNCmM{g3JdYvU(7TAXW+*MEMZh&fSzAdg{P;59gfk`_DQ5e@Dep
zaeU1C>(S!L#9#C!9z%S4zBVxh{?mF#;vx8R3%zOIy4I8SM^Bwlbj^glxYFN*&=G7z
z?V&SXv}GSro_z;4A;dw#nn|wNm;tw0M(qe4hRl8z#15>mNrRgcA)K(6uqAB9#q0y#
zgI_Uh7{WJZE*dW5Xx!&C%VQ~C-BpD!LTac*<y^_t-TAXVC*PvlTLz01L=c}c84wCa
zu%<e#ny^nqyerude!(NxPgz!)L8^SqLI}#mnot4dc&-&>n);key@qN~UY!rbPdly0
zTw1MHbR&LbDDJ6<0<-<8uAEHM-J21lGy=appe-w+-dKj{QZlI8(xI{r+<+!HK^Q?m
zZrdV5&>umXuoDV?O%QdboQ0yYkyb1>*QeVKUkyc!a6l;#y1TNz)@baYu_n6?nDHtz
ziyGZgxHG=NA8F9uW|oj+zI-k-pPJ2S0)o1n3d2RiT!T%rCj6`5^0yYs&hQ)S%k-s(
z$6;i|r)TfeJZAlh1fq`;?h4JpV{kXkOfoqN^d9kCCrIKZIfgaC%KA-?A~U2l4-c~V
zhW->+4soz7&n8WUGs~t*%%%+8;Uv8IBH%sX3*ZOfK0voTJ3^&^3P2se59kEwriy8o
z`RF-_#{t_m0J&0e!d_UNgzW!!U@y%hOty6H-Ts}Y;Xn+hZ{rTc_W@IYEE_`4*owu$
z?i$E+4#)K>z;u#o5+EURfsBwCxlZnpS+Ydlku|bOEVO`@(Q;Zv4^SWNpvUQX8l^GH
s=q>tyKB04Tfxe+D^fUcVe^Ws!k;)~H<ds?_ztki3NdwZ1E$15k19)KoDF6Tf