From 8dace3977a4ac3a88fe37fabb4750666bdefb37c Mon Sep 17 00:00:00 2001 From: kichik Date: Fri, 30 May 2003 13:35:47 +0000 Subject: [PATCH] Fixed flags collisions (thanks Ramon) and added the ONLY_NUMBERS flag git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2597 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/InstallOptions/InstallerOptions.cpp | 45 ++++++++++++-------- Contrib/InstallOptions/Readme.html | 3 ++ Plugins/InstallOptions.dll | Bin 12800 -> 12800 bytes 3 files changed, 31 insertions(+), 17 deletions(-) diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index cfad5265..91707936 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -47,24 +47,35 @@ char *STRDUP(const char *c) #define FIELD_GROUPBOX (12) // general flags -#define FLAG_BOLD (1) -#define FLAG_RIGHT (2) -#define FLAG_DISABLED (4) -#define FLAG_GROUP (8) -#define FLAG_NOTABSTOP (16) +#define FLAG_RIGHT 0x00000001 + +// OFN_OVERWRITEPROMPT 0x00000002 +// OFN_HIDEREADONLY 0x00000004 + +#define FLAG_DISABLED 0x00000008 +#define FLAG_GROUP 0x00000010 +#define FLAG_NOTABSTOP 0x00000020 // text box flags -#define FLAG_PASSWORD (32) +#define FLAG_PASSWORD 0x00000040 +#define FLAG_ONLYNUMBERS 0x00000080 +//#define FLAG_MULTILINE 0x00000100 // listbox flags -#define FLAG_MULTISELECT (64) -#define FLAG_EXTENDEDSEL (128) +#define FLAG_MULTISELECT 0x00000200 +#define FLAG_EXTENDEDSEL 0x00000400 + +// OFN_PATHMUSTEXIST 0x00000800 +// OFN_FILEMUSTEXIST 0x00001000 +// OFN_CREATEPROMPT 0x00002000 // combobox flags -#define FLAG_DROPLIST (256) +#define FLAG_DROPLIST 0x00004000 // bitmap flags -#define FLAG_RESIZETOFIT (512) +#define FLAG_RESIZETOFIT 0x00008000 + +// OFN_EXPLORER 0x00080000 struct TableEntry { char *pszName; @@ -142,7 +153,7 @@ bool BrowseForFile(int nControlIdx) { hControl = pThisField->hwnd; - ofn.Flags = pThisField->nFlags; + ofn.Flags = pThisField->nFlags & (OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_CREATEPROMPT | OFN_EXPLORER); // ofn.hInstance = m_hInstance; // no templates so we can leave this at NULL; ofn.hwndOwner = hConfigWindow; @@ -469,12 +480,8 @@ bool ReadSettings(void) { { "GROUP", FLAG_GROUP }, { "DISABLED", FLAG_DISABLED }, { "NOTABSTOP", FLAG_NOTABSTOP }, -/* - { "NO_ALPHA", 0 }, - { "NO_NUMBERS", 0 }, - { "NO_SYMBOLS", 0 }, - { "BOLD", FLAG_BOLD }, -*/ + { "ONLY_NUMBERS", FLAG_ONLYNUMBERS }, + //{ "MULTILINE", FLAG_MULTILINE }, { NULL, 0 } }; @@ -839,6 +846,10 @@ int createCfgDlg() case FIELD_TEXT: if (pFields[nIdx].nFlags & FLAG_PASSWORD) dwStyle |= ES_PASSWORD; + if (pFields[nIdx].nFlags & FLAG_ONLYNUMBERS) + dwStyle |= ES_NUMBER; + /*if (pFields[nIdx].nFlags & FLAG_MULTILINE) + dwStyle |= ES_WANTRETURN | ES_MULTILINE;*/ title = pFields[nIdx].pszState; break; case FIELD_COMBOBOX: diff --git a/Contrib/InstallOptions/Readme.html b/Contrib/InstallOptions/Readme.html index 9cedbca9..ac7e07b2 100644 --- a/Contrib/InstallOptions/Readme.html +++ b/Contrib/InstallOptions/Readme.html @@ -403,6 +403,9 @@ numbers from 1 to NumFields. Each Field section can contain the following values DISABLED Causes a control to be disabled. + + ONLY_NUMBERS + Used by "Text" controls. Forces the user to enter only numbers into the edit box.

How to use

Modern UI

diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll index 57c0354111b0ad367c14cfd2395cc6a8ee3e1ad6..dedae72cec84d561c65dba6d64d0d4370a545763 100644 GIT binary patch delta 6347 zcmb6;ZFm!9w(qoQnwGQ)*gy*{q%~lbf=T8h37H8&Qm9%WkTz-MLtN=~h$vqZxA+ti zHt8;Ls0)s)xYz5o#=F)>_X@IVy`mIa`EYfui$Gm;7eAhLYF%%+@RZ`RoqOI%TB_^) zam$mO&-a}3p7+c-?}XU8*t$I|adI!WFe=6Gt2p<0-sbBc-R28G*L_{L`4fQgqt4A| z0UEzFsIc-_feKfwzn8~rQ0C8HjZiI-gC>N}c}95`P+|E5LW@u_aOS4D^KSxZgpXCF zr5VHnStTi7JLslkej;-LFdM6X0XlJh`d?;2R4`jEf<2dIgCfuLeq3u>)hf)Tt-*WOZb z7$gDtH7q|sG~T^t<*DuH$1u@aIx$oP)+(QMW7B`u?{e<2Y6m_Lq6;0H4BlE z|FT}ysZ!2CV2g8aHw$1hlx(pS%d1uEjjcmqya)^`g2gD;NC$G+EVNMiHg^uuFO}-1 z64xY$&fNIhzbi`H;vzpdES4o8#6i4NSc;bg>lITkcpk`(%|Z&j3c?BUmv77XS4>X4 zDWAn0hiGfv=}qk30;vqj_0j=dQ3>8wux*RdI%L@04kaW0A$0$#T9Ip!KGn^Mrnfhd zI)RWE8RMT+mNB9<=`R(%8DU(`PWmRAMH6;-TT%r} zO^WR0Y5#oP0UhpQIoRW%xG{AR^7o;|+y#3$f2`X=QnwM$@svR3{?b6*iZ`*^P5ph76AufY*9*=!DNwYdoMq=!kwLGQNdV0jFxrSq|lpuD6h4!W9_r z(enxL5t8@7A=mRdI5v4Rq_VLwU93r8VNrX_V-rfEi-4P#-Pp)~3FQ)!n?XOLqA6_0 zL1Z6~Hy05Ronn<&U<+zph14gsUOqBBs(wOaX~7=BvPQO#S>ZQjm^yh79!9aR^}H~@ zZDE#QZi1zaVpM&0>S2{$^`;0~y<+mg9#m5FY4yi7*)3y4Y+W&tsc^9j9~PVwk6kFI z$97hgJ~5E29WUYinNTWa35TM3j)G_FsC6qekX*m~fC09dwxQNvJ@18;yi+x1ssyK? z=ZSa0CZ4^5H!-${bkMK|Xe8tJU>wMcU2TbE$IQt4h%Rv|a&a`oHN16vj1W!nsED`V z6B)NJ^O&US2Wv{lB$n|KzErxbw-h4aL4%+m@EF%C%_=Cr*$6DfWLCGL?mm)x+^2OC z15=@$6t%6=QhYP6nL%k&LB$O9Nw2jSleJo}0tFX8UaQufAL=0ZE+l>&uxr(b{`7+0DjS|x{qx>a&M0Y(_XKchnXq<=4bD7y2Tr=a!& zv@L?lvTz142X?`!!(kE{(f8 zwF+z)5|02Kb0R}xCm`~j&@&QUhJ*k_fZqdl0t$_tDW=^~NQ6l5!ruk>Nd^;@U|!Je zy!stHdP3pyjOtmH@9xGCEdfIiQ8SKc4&Z*plmH8`whtl~3cx%zqL^a94QGv72otGV z>^1HCY&bjRUlqMhi*s7AI-$^h&`Q-|)iWZ8yZhS+rbLj}-G#NWjZ|+Ppy%4x0q*V= z3jArdVtNm>gS;1eSIvM9?sOR)Y9rv-fahG!+7xKVI zI;M63D<2nb81;JQO5e0DZ>kEsw&TVIvJ%XSU(k)JsHsS4U<2YDJUs(}uni{y@Bd7I ze{Cub2A_#I3?s5G+@#PAKq;nAKp7J21HzDaJ_n&TpT!DR(+L(pD$<+aJHu9w^(+uh z&`A?euxz+!Hf90pRS~FlFa89gP=~6Y4PYZogu>Pg6_~ADa99UA5_sl6_L#TofN647)jC$4B&rUr>OEWmVX>=Ap0#g7+Q0kfm%c7CVRG zc@<;V;2X?al+*BSZpT)~?4|V;L1$K_mDi=}gb(Y$Tn&gzRk7u|7(f4G(zNNS?@J+6 z$ZULDG1{Il_Rg-eScy8gZfrB7?K()cmGD_A|+W`qVl8(KgSDie!!*jyBvkFLY0 zT1Hu@!wlG0iZY^zs~{+defBDgB@A;1S0lt;sciO&w-;X2A^37C zRO@9p3qawhU&2*TfDa>mErPohT!YxL9HytB*rH=w6+y;DK;@A_7`3}I6i)xa|M9|Sx;k}c%L zN3sm9zX3`#lBa-U*mtz`kK#q4QLHh~t|@LkwPP~uBo@(%4VKvrr9f*jEoj7AOKI2` zSRPyfIWkoo_|XEX87mNYAt{(VEgIyvz!nD5&-M6{(8Qd!h#n>?!C!=EMsws%-}TeY zW%oW9*KrPCiIGsrBWNW&3XXQ%^b3SSV{xWurn^6$v!YJSOX`#cwM#;WYv8ZJ-30n! z5AH-h%UZv@5vQaF8rs0jfP4!OFd8eN2M!bjUXz0 zrK^*tM^#7KV3JTwHDH$PTGI_5Z+D!-5+u0VbpV6$E}cK@RZM=+QE1E(2jNikZHqJz zkQKP<)j&i^t%@YAYr5m#lm_a9BHaPf5I+~j4D`axU?9(@ys+nhBfu9xN=EmN$CEfm z9o@R?!yr96`>>3A4!)CRpGfadDW0TGk8`bEk=c+9NDN&gU70d7iZ43Cf4b6_m>hZE zw@~%i8O+!T{_7!(4w=WnqN@xKb+HWJ0)%|rb5x(FMfyG9j2r&S+3^GZET5j_>TEuH z1W#)h7sVr5C{$=XlQVaN(=HAVXTj8t$M6s4^BEFW;R+B6#+Sxf7pGon@?i+1M=s1o ze8-ai`Za!a!YkzSD!LA%y(-G%u`a)(;`m}A{}-U~o+6j}R+Hq?6YpK9fbTach0@8t z1l1pK;VGA!e~hh{@A)ydQNE+%$M`y#9LJX4ESZ+8HfDIlJ}oJUVqEn+`kKtBZ-;mU z%Dw$KtN2FRDCBl_;p(2`;_yASvlEC&PUiste)%H2*~4!Rt5?Q*O1oivXyP1#WTTXN zweeYWDYa~&Qc`Ns`z-nt3swa^A3cd5l7rYlxBTE`MS+?c^2r zT04=0V}SO7`X_^3u%jCdYg{xQsJ+o}B6?n3Z&BAP1$ce`U86CySajJbJP(E3IN%6= zpMlG~ecJP{lnPk|Z)9)SDr~uT)3ychwkqwMUY`3@c4*6bp-K91`V``TbaeVn#A{Oj z^aaFWY4(f~qE)J%apUZHS%Ibp*DYznqXx;(88jP_eQoN^k*W&zingl0(3@_ zW^A4KGb|6Se{kK#pZYg~j#ZjsUQFzj?lx~EUXVU8(?nFtDL-R)9R+F@HwjDb*|1^b zz38yiU%oOMenOKLSCr>JI18b}@X_3KXiLSfi0C)a*>INd`!L+kNLP|+@c@S_}x0fd2$ngPPQ1lj;l4{-Ev70~bx)nceaQN#j* z7gS+}86o@{hy%ibcmZO^2#{h7K~aYxbgtnA0KvkS0D(k(n2sUT3lIdT2Oti#6QCJj z2f!G>(Z6SaM&Q5B3>-{Av~^gB@xlzgUsWPhKE|`FuH$(bd=Kzr2>4*&|H5$=y;cE(%Qzmm)0-2t$IZOp+is4Y|tDkyk&@pmg4;iM~o_GkHuAGnJXa%wle3D8|DqW|lJ{W-Zgi z+|LNiHYUpag4xYH%XBbDm>%Xd^C#wW=3D0PjK*Pd+~gn~ZinCT6UTbTHpdRf(~b_u zD~{J4J&x0kj~y2r{fAXRq^P=NHbeotK=$&WWxvm&J99tJbx`)#%#jdcyUp>rbvPT%mcZ=ly)%-g!^V zOU-*>-i3J==goA_byMzz?j`Q^Zqfaid%yc>_jB$S-G|-X?vLCT++Vo|-9u6Lh&z`p zU?;Pstc9&&ZLEv+v3Ib`*dTikdmsA%yOn*IZDmDvFZ%@hH2VVkGW$EWhy6W!mi?Ul zioMDztcJ_yinvm)g0pfA$8k%!I_@s6iQB?G!TlT8!5!dURBkMm#J5&W7NA;FV#o=h58$Hg&LtW zw4RvGRW)!JEH|%3Bp=f8H7VEoDo=N#B(0g>ePWPAdcVtd|%QIuMi$P3G~1IKB~gRN8|T? z3_1_=Ccv|A-M)7N;KTbYDt!9a6ID2K>Ea-@v8B{>m*2-Qb!-+>728(HWIpGa!qQ=E zHp7^}xHru-ZTaq5%?_=+MZ?MM?49fp`3U<6`;2zN8D3H_c;;0-@Wu zRAbxP&P(q~5Af0gPr|3PS3s~|$1+U9*BMBx?N*+ZpVvLbHp$m?!Z<3dZwPQ-2Gbfx z6Z4NNAOA>5W5U-hP1m~T4iRn9Jxf0gBAE9B3!OrATbPMhzjpBU#@nIfs* zeJPSpBHcmHN}n&jo#cOc9cvrFN5Pj*QG4VD-WQ+JU5DSLde4$Gx}F6HiTG_?Ey zdvs+jlZWRRC(>+4vn<7u_Yl;pq-A*?f3R;VQxrTpn<+|ETPnyY1X7nXZP=P02ni&b zEhgpX^0u5}cDnqB9FInsDqqUEhy7MA)sJE?$R549@V)DVwAB>*vD&0;l|%ZmbF1N| zA$VrcE-^Z3aMc!byxLM+=gy*=F>G9klr$)Fu^d}nxM2RH@k7N2k)z9!kt#H_tt71j zhK=nwZs}Oyi6eEAw@Lns{+?)h7sL53hN)tT;(sYl_<6~g;hGbEbNrL<5`NPV%aZV0 zhKQ1czeK9a2;+)2Q9az8b~rVm`h7Tlu?~LQ9w&q>TyT&GbT_dHoz+Yc6U0B06Qp=> zh5SnH#3)6TMc-o&y&5j{iJpn~<)d;w?z6A*>QTiQ9 z?^bC)rC$Y|_9}TTNL+FjxFIIEovM&iX;G4vKmG*>uPj`>N@SG@zup_L{F@W zmD*K{FQAO0?vz7U2lcyjmL?hp{OJ_?keT2dIXcV~4M8sx&}?YrtCmSPJD(VQ~h&8jhD8Jt3|GM>`-m3OY(w1;%i*aJF5dJpom`JNh2E5 zjnQDorlC0VX`*k~fq6($e9M}WAxZv?lAun$mTxIkU}rWl@(3~J?Uc(4N(--oMT}-O zX!M%71*6zwa-?7!dfL{4G3aUU7g+LWp}9}2tAWCWf-2T5PbjprW%8WDd&eF|r;3x+ zk!+Gx@+eGY9Ref7;ID`X74r7Nr=zo_zV&_EP`$K=6PMRYOUz3bCcJb_9O zk?g|;B%vEIawHH4+2CJ2hn_%i&nOzQdj7t{p(RA9f+1o&16|~`0)(OEg)D|qM|LK? zVF)Gf3Vf%zs;yIPzHWF;94C>ZA+!N%5$C@Qi;?ok;gB`M z>&ZalYKU;MCIHB#t7wsW>Z)}Sy1pM&J}610624TMuhSpmgJo)U8H=dM*BKi1TH}># zfvVTaKRIzV;X6c(#Sm~QOnJCZnxe>87GREUhVy6V|YCBG_?~Z+LzT zkTzX3q$80-2hMBAQzmI^KRT`yyNvIIua6ijU^d}9({6&nAyeuC64sjs!T!+ zfwIyNyH1Fcys#-whD9bzQ}~wD8g1-z{f?@zE&iFlw*ssQ z^ht;v)f`at!%j<6bXeY7JTQefhyNb`%-s78P)%416uLWf;q3LFp}FXH=+l^n*--@S zD?)xGl1~XmQ3$lo%6;d_Q&kCHzvR0hO)E}UK)LS>iS#FYm;G(JX(V!tPf)L{m{s-cxUVGvs%h2*2c8_EkS`;9vo1x{}15#~%>k&iCBvmIbGNQ}Z zcR%nh-{m*wXkRR?@SC*4a{x1x=D%SIpKg?{$J|W#ZuHUcgxKWf z$f($zjQi@-!~A%Buz4C&4fx^jr7l1w(o?Tku~Lnyai|DsSUMWkJlGzn;#1-1`n8v- zzsS>}DEY7zScp**i-gcjs`m`KzFDu6x?tJRQVOLP46$p?8>U~6Xb}hXcMpOY?GKS4 zHI`1%Rf0AZV$;@QYp*lm?0<&nWFjA4JcV@52oVywOjksE;#Y~G4Zi)MuPmhRGt*J3sCnw& zeK3q?V<@W3dgIG5=o&-kb$Y;u^XT|dCo!fwJ%k(PI_bG-b_eN@9-Ptpu{T_iqICL( z3yDC-ZD#DBbb0CA4IA6(guP|-enBr*^x(q@&`V!y z=n6%nqV$%bT=^^I`sYP~_o+C&Gbn!siq}Dx`o@v)sMs%KK2gg&WrE zl(&A0ov&>8DRzYLp|V|B46Bi;-#$)fSA zN`vpdB6dv#`o^PNxk&S`o_k|Br*j8=0&a7ux7E&VAR<|vTjhD9Oi=}gz$EDn1aDdT zq*~!9sU&?0z{yWqfQ0jdyRk^wgV*=QgUaU1grL+0{7R5AE}q3Vbaip>|I6B9EPK51 zU{@Ahg?_?ZbiyzVW6;n~M-$0JV^O0a1$6nvxq~q@TlCr_9hBjmIB*8Pl;8s2IQkuV zo9524~)H&?T{~yox<*w z%kLP;J}3L`7+>zz)Gv9mY5I~?s~-E8C0N-2I{d)$#gSDEbB@jMr!HSTh3S#yJ5~*k zQ+Z(NlTFK?@h^vtO&(#cVPBFLnwPUX<8|_B3qluz#thmcFsSNA{90qz9U>@MM415_- z4|)S&E?_et?xoBMK>Y5-1OYMTnMHtjgJ5O><^v9XszKwA;VINJQN{vk8}Z)_1KP)&tf{)_+({w!3T( z+L~-Fwzq8^wj;K0Y{m95_A*s;d(nj`7>o#Q>ne#bFKx8qC41;@9J|91T7 zh-#g;J4>84r^h+PS?iqVeB8Oh8F6lQzUtiO-09ro+~+*x{LIt{`K|MkGv8%$ z-Qk+xs&P$s&2oiYFS&NRzHps$&73r6()vjoC%rW3%}LuQeL1Ob(gb(8+vcuvKj?nk zy}|vW`xW==?soSM_g;6(eZqa#eZl>W`%=_>-L3QFd2aWN^ptw;^4#kYJySe2o;pvx zXMv~56Y{L^JmdMLXM<;x=Vj09p0_=_JbOF`Jcm6eJ^$so;2H4z;9<)W_eZKwY_9yMn+Sl8kx3}44`)l?$?K|!7 z+4tIe>|fij+J~c7#&I^z#XS(^>bQB_V_b;)1sCHsa9g-Hx$WFe?mccFm*PI<@fNN{HOeJ{uF7R$tYL|&XO){FDRCE}A}M0{Or7k7#s;z!~^@woUE%I)vsby4Fmpx|r{hhwe- pnW|!#Ir8-T+#{}9b+#f~iLK1W+p27JwmEo~R@j<5+V5-B{0|h9Zd3pO