From bcd6451d390dd4c27e42ecbb567f36d36007ac1a Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Wed, 31 Oct 2018 15:00:24 +0100
Subject: [PATCH] + enh: add switch and opacity level settings2 for
 Find/Replace dialog

---
 Build/Notepad3.ini                  | Bin 5876 -> 5934 bytes
 Versions/build.txt                  |   2 +-
 language/common_res.h               |   1 +
 language/np3_af_za/dialogs_af_za.rc | Bin 75806 -> 76162 bytes
 language/np3_be_by/dialogs_be_by.rc | Bin 74898 -> 76168 bytes
 language/np3_de_de/dialogs_de_de.rc | Bin 77020 -> 77556 bytes
 language/np3_en_gb/dialogs_en_gb.rc | Bin 75832 -> 76198 bytes
 language/np3_en_us/dialogs_en_us.rc | Bin 75674 -> 76180 bytes
 language/np3_es_es/dialogs_es_es.rc | Bin 77908 -> 78420 bytes
 language/np3_fr_fr/dialogs_fr_fr.rc | Bin 77236 -> 77742 bytes
 language/np3_ja_jp/dialogs_ja_jp.rc | Bin 72704 -> 73212 bytes
 language/np3_nl_nl/dialogs_nl_nl.rc | Bin 77054 -> 77554 bytes
 language/np3_ru_ru/dialogs_ru_ru.rc | Bin 74876 -> 76146 bytes
 language/np3_zh_cn/dialogs_zh_cn.rc | Bin 70918 -> 71446 bytes
 minipath/src/Helpers.c              |  10 ++--------
 minipath/src/Helpers.h              |   2 +-
 minipath/src/minipath.c             |  11 +++++++----
 res/Notepad3.exe.manifest.conf      |   4 ++--
 src/Dialogs.c                       |   5 ++---
 src/Dialogs.h                       |   2 +-
 src/Edit.c                          |  17 ++++++++++++++---
 src/Notepad3.c                      |  11 ++++++++---
 src/TypeDefs.h                      |   2 ++
 src/VersionEx.h                     |   6 +++---
 24 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/Build/Notepad3.ini b/Build/Notepad3.ini
index 9662e4903d2ea057840db06c8f8e4646e87370a9..1ab7e9d54587353d0dbc7b54d877e9b57c060d91 100644
GIT binary patch
delta 42
ycmeyOyH0PzITlejhD?S$h7^V%hE#?Eh8%`OhGd4+$tzi;nN1lCHXmov6#@VZGz(Gy

delta 12
TcmZ3d_eFQZIhM^FtZG64B#{Jo

diff --git a/Versions/build.txt b/Versions/build.txt
index 6f2c618b8..a9449958c 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-1335
+1338
diff --git a/language/common_res.h b/language/common_res.h
index 38c8be2bc..e52abe3d7 100644
--- a/language/common_res.h
+++ b/language/common_res.h
@@ -276,6 +276,7 @@
 #define IDC_COPYVERSTRG                 18090
 #define IDC_RICHEDITABOUT               18091
 #define IDC_TRANSL_AUTH                 18092
+#define IDC_TRANSPARENT                 18093
 
 #define CMD_ESCAPE                      20000
 #define CMD_SHIFTESC                    20001
diff --git a/language/np3_af_za/dialogs_af_za.rc b/language/np3_af_za/dialogs_af_za.rc
index 95a8550b32b21b69f77f326bf8ff77b34a3a48e1..2aa5df0cf8ed46f289ab10a3d9d6d025bc42e9dc 100644
GIT binary patch
delta 779
zcmcgq&rcIk5T3_tNi9&3)z(^~OT|PZCcE2ZcL5<3i-}RJQj(gG&>B%NK{TL=CsR3k
zFv_UagG6JZ2NNaPLoZh8m7v+^KcH3<z3E9r{4sAgB>V+l-uGtaeQ&<`G3WSZ-udPO
zAq<A(4HhWS1_tQ3ub~USJ*h`|W5~V{8uf7<G<^7C%pQ?m22qK`4-df<oP<f3h6{vK
zaGLHHL56d19!ANM2`A~CAe@G?bRQ$@3|Xh(5_#g3Nrpp^f&-XqjB>KDWw(UytEmPR
zRIuE*N@<T*BbZl~>@VBja-IOiF2`ex8(;}RI3iuK7g`_G{RdGx=<7w<dF56uZwCX*
z@#pqqv*)Q_r3M;U31_%P`08^v<~1K)uj-s4c=OIKboMH|gQQc;9{&`ONPjKv&uqm|
zc?duLn8(XsWxoa{v|(j=I6_FhFx)fY_QVn*u>0q0?97I#Q|+!O@y^8W_at<d4J@oQ
zMb{!8+hq~o<HpcgnGpO<8hKnU@pUnM%9_Myzk<=Vh{yLzU(fGEWmUt2i`%w{qBY`c
z-v6YQW{3Az`>}U8AY~v418@wEKtJT557KY~bB|(s(vXFt<Qt?77^F8@w??slV*1{H
zrl=g#zq`;W)YEnfuS#`Rk}+JkmZ}pPJ%))N23qW%KYeUA8z{b!Sd%^Xcf5uriY&}J
kO1(9#S*(m&yy|C((ky3-J8nCyxm4K6HnY;*RyM=`0Y_cNcK`qY

delta 752
zcmZXSO=#3m5XWas`oUU*?pjk_+@x-*EqF-M-Oa8PvF-LyEwmz~2cb|rxV^PSP!I%r
z5j==6O2C64dh5Z(fH?^YA|85J>di~PP&^49Tieyid&yRikc9W%|NUm>KePNrecn*(
zof^G&j?*bk%bHLI8_t6XB`Ao$3l8t`4h?^D$iCeb+|ia)9Hhyqc^c}w7p!G2rD)b&
z4YrImMRC9j!h9B$B9!Rr)XiY1FV_{!x=-4b0u(6BzYbniF0OQ#jI~*^?p!}y=3r4s
z-l0D^of_LNJ^a=mYdoQ;$Rt{tqditI@x47m3m2+1vC~5%V<+h2P8~VVce-wZCy?^%
zfGgLudCsH8uGO2IJFU=zae%U{o9^#tsn&1N<=>Aa^JJ7@F?J=PyTTbs)u_6c&i|`Q
z=rNNc2v3<kP3AL;e(Y&2w##P;H8P_h`w(Z$4)3R!eV|I%?5e2rfc-!+S)EjG^Sy}a
zCK+(mvZr2ijMaCWMz;xP;2PY5IezEi2Ct%?uQaoUY?W+K<fJ5dv2#V5ds!JUVH~P3
z30K5vG%-@g;~*okb7HRO*vu$Ld@-6iEvu2!_P=h?(&=l*o2NB=?3cPR7p4(whtTmq
uq_G&*6*Q42%JzqQdD+>9pADWD@%X=VG{T=2rqSPML-p-hTvpU0kb=Jur=?8*

diff --git a/language/np3_be_by/dialogs_be_by.rc b/language/np3_be_by/dialogs_be_by.rc
index 02dc5a261772d28871d92413351573eed187bc1c..e8061783818df878ea0a4ae80b65c299416236b2 100644
GIT binary patch
delta 827
zcmcgq&1(};5TED9wrR03-G;3Y+jVQT)YQ$U+3cz(twBqZY_k0j6|^5}5!<w;6-9ce
zilE12zy<NpURAWPwYe7Biy$IZyeW9lQ$bIH7jgE*6#NG~yf@$TW`4g{dhL7g-nYC_
zFQ}m6(p(2FzHRbr5Can;AY<{iB*jV7=~TUcB@PAJu@pFrnMX1%h;{B({l}eB5(eNR
zq+tkBFbI8g_dy1dsI7)DcAy!}Ri(d@lK~4(Q}iTwc9Jq>n5R>T+9Z!t%%bWPoc$-3
zq3&roK^ZoF7Y}0BR2Q}eXM{M!++wh!0i&|gKL`aFg*?o{49NmqCVh_DOu;l<B1<Nj
zr+bp*EL<ghf~+fKjl&J{DBk{jyk2Czdjt=SV2j9PypucDCWFD_8ll3G;^=rt$)rUw
zcT~l&`qaI<cT*60$Whc^VvRB>B*4UC@T+^SeewU!8Heh0v2Bgd>4w!pji5uqE$TT5
zpWLfsCVm-S#~10J0_}%vUBnTwvpY#-qzHJ6Q|1vnKomzf5;2I9Rz<_4D((IR{#fV~
z2w8k+wMpGD##tDJYlN;0H#sYL4CF!$XNYQ>h^DWCpR96irI(4<&xde1yC3JRh=02t
ze`OEhXKTf;(=YYjG*LTc;AZv%UdYD%3BH{M1}=q-lHE+`A3<$xob}-Ju;D!Ru|{{z
ze)Ej{x})tTx2ZI`?|wHi;zr}1S1oKya0<KF2s0cOV0xLVHp2M4w$-_{k9{kTDJ;6<
E54V%M?f?J)

delta 340
zcmeCU%rfaD%Z4Ldll?YpY+lEGjdik<yTarMAq_zVh8hM11_Oo)1|tSbhGYhl$@N0T
zjK-5c{>Y!~rCPE1maqfYWCwqx%?|Q4EX;-s=9~8`OEWT>PUg4DoSes5H#yBjVDl5<
z4UCf&<|$29kYt&hWx}(0i~2fFkgmxN@~bu*8J}QfHUXNvUwQrJHI|FSxGjJd>Hw`Z
zXRw$oXmxP1RNyy8i^+zwg(nM4Rhqo-Fc+s0ScN4}{$N-B<O!h)lcPd(coi5@8S)rX
z7&3um`s9frciBxCEPy5%PS$^9J$XaurO6M(W!OPx8!{M8ZcGyey1``ffp!+4hZv(%
zCnp^=n?8Y)k#F<1@H49!4W~Ow0X?!ng>U;YW=0{#=}laWX50B#8Q(B7n==?sZ{%T&
d1u_h$Uu0!8-VW4vL}qz}8YAQO5OqcqCIGJ2X|ezS

diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc
index ba8b4420c2b86993a50d03ef606730c5dad1021f..25d4145e49c3d7263a165b6b3fe94aef6bc5a7ac 100644
GIT binary patch
delta 324
zcmca}ljX}@mJK07%q9#*lMN52Z{8=ghimcz870pUh9ZVUhCGI1h5{g6#E=SPmjKCP
z1_cH;Fs~TQF9P!O88U#fsbHCWhHQpXpeiK>9R^PZ7Y66azTA?NS;T{Q4H*m>EP$eh
z3`PtllN*1TZk{8%hH>%|SG~y%#wwfh<ja_tjTsC!KUb7wWHw{40J&%KKB2nJFO+9+
z)67jK3?|5Knmk8#(PkHeJFLv63}%y`E3Vyq!Hn$!qw(~MQjC_{1=ty7KyEXf9>~RL
LygiA7u}TF10-{nR

delta 106
zcmexzm*vh)mJK07jK-7myD~TL6WYVIxj^n5<75^^xy>C4bxh2L4Ca%qE!IxnrkulU
z%3wCRuq%D?KB2nJT&gp;Cl|;a*&JhZhn3lc!DO?w#pVk@<;L4Taxexn0)-5w16iiq
JYq%IIQ~+g;B_#j=

diff --git a/language/np3_en_gb/dialogs_en_gb.rc b/language/np3_en_gb/dialogs_en_gb.rc
index d880cb7b7a5e332284779ba0c0bebafc265ecb06..39e3b6d63fb194ef6acaa539500b489a475f25f2 100644
GIT binary patch
delta 787
zcmcIi&1(};5TDmwLQT?bG)<Zh2-_G$Fo)gE$EJv&HW5Y9+D3%linUSEd{sS)pr|KB
zMo3RKpoj;FfrX}CO8)>W8@&||V!h};P#bG?-rM%#-OHOdGw=7C-^`mOTYmLPZif_%
zDC(XZXpn>~r18kWVO+_3Q5#gOrZOW-X)y4-U9!slWj7ujj-M_<9j2iSb5JE)hs$)o
z2`b!x3e1qFk}cDDo$MT3rF)6IS@JHyEsDgck_x9F4`W#Ig;^47CjuB-&kyRLLr!FM
zFd*GvG7Df;dvE=WeUzjWXx3^x%A_phxFRh3?^t%C>G|)f(vbc~l~vWAxugtaaW($d
zS~P!@*a2%{VR{VPUu2fWZg7%jnkAGD8a^E{(f8Gdi|YqP-W2&!(d$m$y8o@;PaV1N
z^M)6vCcU_97jb)|jjumMu=U*~8DQeb_$aRYa${^WGHeQRr$kCn<+x1j_M&()kihxP
z$JqZoG>{SE`D>GYa+hJg7Yys*<a8lapoz!fcu3eFsxM@ZgG^Ff+d&V7>2rvUH^=Kc
z<Jm=Cz%yG07VpLO8k92}MtVmdi|@7yXkT%o`}YvmUxp5ygNtw$3NS&-FagKN69W?`
zUjdFcMU4zTSu4;;c}%BC)Y?(BZ|6N+313|&=Ev~|iZ!);oZ;QByU~=GVlDl-*2hwf
gip(<D+OKqG``A9dLwchovs9-gv7Xv_lVFdezYv<v?EnA(

delta 758
zcmZ9K&rcIk5Xa}an*s$_LP-iK(#4kYBVcxyEn7U16iAGT{1CWs;Kzj@2SPb<Xrf+}
z6TuAHn3#YUys5axdLnviG=?Dj2LwEL(7+9(jkEjS7Q$sVJMa5GGxMFdxi5d-mEYGW
zxT{xVtD=NdNPq@yph72@?$-dFa+JYmIUTqAD(q!tQDz-DIWUV0r#?)VE!hWwZa>Z&
zKkSq6o+RmD*||uFNpa}J!M*9C?0e%zxjk>J`6Lre%thYWAG>}}+Z(SZk|iqD(MbPS
zA1hB#b*Bf);Eiw)wNEj8bz};S<!ZWkS4E9l6Se1l`2zUpPESyUG+pn32QUsv=!N?*
zOmPUmzNy8-)3=O<c^D*><(A=52ZR6Pag&9A&Y}(8xn69iLljMLb8tN$!lmXY&iq^9
z%vz`ExUkNn8?Jqvs^HXlRpheDqYEZgaE&MS2!2_+g_SR4EX`LG`39YPWXB|vFHCgp
z$8_FL{0o)GC(GSwFZfS6lhmFA8r^f4hSvp6&X+$@=q2^bLYQJ|GeGfMAw&*2OXI6@
z{Nr~m;TQRUKS!+=74Fh5`r)2XCWMmSiSRQnW=JKIMBbVV+~gB@?5n!R(IB3ce0ctZ
vt!84?tS)<-vAJtZ&!oy&Ji8+?mC+N^vd1!OZ^(2jOwQKF*s>&F2S5A=sOqlH

diff --git a/language/np3_en_us/dialogs_en_us.rc b/language/np3_en_us/dialogs_en_us.rc
index ef31d673c2af291e3d64c8718553927973731f99..4c9d61ae7cd524397f4830a52836e828d512884d 100644
GIT binary patch
delta 865
zcmcIiJ8V*66h5~Xu@p+d@+QSwz(*~y+*@9T_$(x?wtze=gRvO3jfqkOyO_o}Y21v*
zgv6nV4r*#ri+5l$u}SwPx|q0>HZBgtt<_@U`MI*VyPWrT{_mXsJl{|~`>a~E=+UMZ
zG!gKF4?+;YXm1o#MxFdbui~w7$iNItK@KJ%3lk(KAOUeaSTp0x$0j^na}Ovr2}r^?
zWn;knI8_R;2m*f94j4NXIqGzda%o&M9l?k5$MA=-#0Nma7aMc9;<+!6_n+y(l-+$g
z3uU+pMW{fDbQx}teV1C^hIzP7o<O=t@)qd|+$4LByjk+D!2(p!sJG)igO2l|IBCY>
zR;*V95h66BKw82NTUI=tcVly8S<bpX@%$+G<sr9|<3kW(bmSF}OZVTX1R(G)6}dT5
zR`Wp!;gI{Cd?0-4?bA&a7s7@uM{@YvNh~xBsNO!x!eI($_!C5xB}&sO`OCJdpH`?w
z-;NHiT-4!`CX0!kRm>*^UV<<VnxeS*Q-|eUi#1G-i}c$}j<&ZFVT5q-mlM}_-xJ2t
zCql4IlGTQ3V+!77@5B{+8%G@!^doF8TKXjN6qJuF|6gP`I`(?(ot%PJ*3d!cFty~x
zk9&H2b;)5C=^`b1TT;3cTlziJwBlHJ-HrK{1-&8La1y53K|-1iFAZnOV>7W^X8*0=
z!|h3fxVA8+WjDa0B5kDcW=6~SDAmmG$HJ6eUjDt#?jcye!*LmQ5Mq_AV7=AFNkY}&
m<jz+gcsN_tAdvOl!#VcFi9-x)`!CcldpR{%pFPC+yZ!*7>Dng%

delta 857
zcmZWnO=}ZT6uqxAL>rsIB&M;6CeM5sA(WZvq)9dsX}S=h#xE>cXo5m1xbTY-K@b;K
z1c~Am2Hd-;prwNZL8LB<JH_e`(1osCbkT*?Hh5>=OjB?%Z{EA_ymQaF_dfk1Kl>yv
z4l6jH*oS#ViE}7}3I*UW4u<pBL8BN&@a_i<o6qGZ3%jj(MV7D`;dmjG4|2Focoo{9
zLj^8@f%if;*cb+J7MmMBtY_QSw{X>u9~&v`=nK|ba#fNvC|N7%IFpJnj>lGKY^YVw
z?jN#YR!6_?lMJF-Nx!m|Do0-oa?+uassetVis0KsZBN-gQD%x`AQ{DKA%_ot7%sB3
z16dIcwvo%RjMez*3uAq{78UYqa0V{I1WdvdoTc?NUb{SkUpHPdj;&i!LJ=V)6RSp6
zogJQ93nSmu@z<Z>L;YJ%*qEEREQ*Pbw&FOK&*1dmj^G`!<rm#jdl_`6+=985-igp$
z%Pt?WJ53_qb66cp;riy@ZC;)3JVsl&AsXu{9>ptLe&X(<JZ`GG<FwCxUvLuIbFb1n
zn^X4`kS;MKlf6koKj<YR98y%%o6w?fmc}CGxO&rzCq*ko>+DJjrjqNeh^=<z2#4cP
zgOhN=xwS`7;Am__CaRh<s2F@dVe2~|J}BIX@%<lnClkfryOv(hv5>?xvo*+y-FFh>
zjOI-3ewWz{$EyL^TpVDd&PF}JV&>y4i#eyNpB0?Vvdj|ZI)zPDVX~>@SiRfGF+b}z
M4>Myx4uBv20Xqf0A^-pY

diff --git a/language/np3_es_es/dialogs_es_es.rc b/language/np3_es_es/dialogs_es_es.rc
index 422ea15884f0f70b9dc021759dc61d87c673ede5..9f0d7cf87b74d7c80813147dedca4293fab6839e 100644
GIT binary patch
delta 351
zcmccefaS^)mJK$-%q9#*lNIgKC%;jt+pHqe!ZkTTQ^`Aop@<=oA&;S$p#Vr1F{A?7
zB@7A-xeWOXDL|eAkj?{=IY7FYArr_>2lCQ@ykv$_pokKK4v_E3;KJZMd7*$Lqt0YT
z57Eg^uUvQy84MXLz_NxwizmJkpZwvk(&kfg(^!~|84M=NTWp>zrjo;K#$W+*)#f)U
zX*@J{kqLtdx{D^ClH0S{z~~JtvnhkwW_b(2OF-wDPCqEZXgobZj*(@uj|$iJ5-vs|
XMxav-!Q$KZa5H{V*uF`JaUL@Ot?pT9

delta 123
zcmccegyqTumJK$-jK<Ri85uJte^9O4tRm9FHMy@%Y4bVxX)Mf!4Cb5DRpc2NO(zF#
z%G~@xHH`-(Ir*IYp3N2}Z&;a47)&;+TM1rbG@LFd1XR_qk7aUzD%bWJ9!4QXpsd06
aiM))eiqjv6F|usmrpGvsnT3~uiva+aNhehR

diff --git a/language/np3_fr_fr/dialogs_fr_fr.rc b/language/np3_fr_fr/dialogs_fr_fr.rc
index 42917abd667885c09f09858e34418d7946e582a7..6d667f1c3ea618d454133c8814bf25bcc41c4385 100644
GIT binary patch
delta 365
zcmdmTn`Pa7mJM9O%q9#*lQ$-(PmbcOo2;P9viX~E3fJTfkJYRb8S)s4844H@8HyNE
zf$S0n1%_OPe1;StPXS2h0m&R7UCfXPWTyjpX+T~wLn%Y?WI;a3$@4sT7<DF3bQhg$
z^3p}vkin3_f<XtU%8<c`!34yb+}L5fxkhdd3$rnU!Q{2(8z-Mp&S5rVuz<N|vx4d_
zZko8o1mXfTxBM|!$Hr{RV77U!dG*=J1=qNyH}Ej>P2R=9wcU@EF@Xu_PSfoh*%^Zw
yfvz;14rG~bx8Y<wAwS)Ln^9(R&L5HGW}1wQtgZ}x3@+0Xbs6Qi$7wMJF#`agtY5?c

delta 168
zcmZ2?pJmH!mJM9O%*G4`lN%4GPmbcOoAiNg^AF)9uFY}s`&gI_8O%4!tH?4kn=+Uo
zRIp6u(h%5ep|*^Ba-95w&4-LXurix4m`s*e*|<5)>eQL(Wqgb>lXr1&Z4Y8+OkiR(
zoL;EFXuACcC!+%6^i2YcX4~z!8BfVGDoj`8W|ZBoqRlA6INd>tk%iTj!H>aZdb~cP
Q{Pq|f#vo=EUIs1(0Q?Cul>h($

diff --git a/language/np3_ja_jp/dialogs_ja_jp.rc b/language/np3_ja_jp/dialogs_ja_jp.rc
index d343028d3f1152ad617c01ae1d11efa913e97cee..c6f90c9efb4b57093c7867d78cc6aed2b5f5ffbf 100644
GIT binary patch
delta 307
zcmZqJ!SZJ}%Z3L+%q9#*lN~eDC&ww*Z9XA9i*xb>872D=h9ZVUhCGI1h5{g6#E=SP
zmoO+W<TB(lqyTveKspad<^btphD;zk9mq=q@{$=!8Hy+W=9Qcr$IUaj=th*VA%h`<
z1%nPy-jKnF!34zG94On%!fec7u=$~)Fe9@Wg9XS5o8y#IxM^U$3B*z)>o@8ZvoV`8
ym`#4DxP0?D(<OT+o#)!z@VSBs=qA(2f!|Fx8+?-kxyx{K;CEfc?M)JlRm=eL4p1xr

delta 132
zcmeyfo26j~%Z3L+jK-4%eKR+E2}^KI{uiV)`HjJ>%}VkIn3)Y3%qQ!cFQ43_oWp23
zxp7J6WG~^m%@0(bfz@q(W8lEXY{Fo&S>N1y-{fQ8WHwLwn#IIuIK7YqsC=I?-)4s&
jLX1Ea2GbXEG8%90`1wm=@_|1r+nb~qtC(4M8Mqh#Z-FtL

diff --git a/language/np3_nl_nl/dialogs_nl_nl.rc b/language/np3_nl_nl/dialogs_nl_nl.rc
index 1789dff4c5eefdd75c0d72955a1859a47f51ea0b..ddd62b3120ee60b10bfe3405639cc6920e8f7f1a 100644
GIT binary patch
delta 360
zcmex&ljYN0mJN@Dm`xarCKuYKPj=v}+k8s6jB9d(jFNW<LlHwFLmophLjjO3Vn_wD
zOBfUwavAa&Qh+=KAe{#!bAWU)Lne@&4&<c)dC3f=KoKPd9U$M6!G*zjvLUx5qt0YS
zchSj4&s}&884MXLz_NxwiyNPdZ+4K|!oqCKV6geSk~|}`8G{ALIhz|)0(fZd6cYv$
z6sKG;*uuta%3!v+-TdyE$qqNUrY{g=<lElB!kEPbbfW3>jVg@hlOHH^ZP#OG6aqQc
j5F})}y@G@Bg#7dXPDYu@J-<bkS7<OYZm-c~tYZcMnmJj>

delta 193
zcmex#m*wA0mJN@D7>y@?jLDqrz*)EXlyDi><O7{blYbd)+AN{)fSK8l!F+PR<>txj
zRC1V28O$ap2Bw2lPJW^;viXMa8pg>9OO!T0QUAaR(zf}R(Ihrz69$vb{g!vnOrIvq
zC^LBh2iNvKHpT=dpi#!#KXNbzGXhl@Ob4<|C-d2`O*i3W447;pFEG7Nkx^+o3pb;K
pJi7t|7*017WK^6y<FCN-5-mo?=?y%LEZa-88S9v*AJArG0RU7HL8Jfx

diff --git a/language/np3_ru_ru/dialogs_ru_ru.rc b/language/np3_ru_ru/dialogs_ru_ru.rc
index 2d3b9688e9db92f70b4ef335044579bf04ea62fc..a356629f4238cbd7e0690180e8989ac616a48ea4 100644
GIT binary patch
delta 834
zcmcgqOKTHR6h7C9)+CzL)-g(>PEx@~QuCe}=|Zap4Vh#zNmK;E#8&I8X-p%6F9_;R
z3wjpWN$W<i3m>CqDX54Gp*4#x3*G9@g)1qZxwWPJ11|18kMEvy&;7pp=d0~k+xF_c
zLkK|#CubFV1frlq5G4Fw_juyuC1@>W|5-fd?#27={a7jPG3Ok!YXeCrz*)$^3DBSj
zDcVzzg(OIDo7N&aKxh$kG#-f9b<=CC#Im5najH4W&nBsUC7P$~0AV`y)Zp|gEK6N8
zaF|ZyalU&udPnwQ=ccL<hbX>&K8z*%UGrksAqQ5s`qM?IK^ZDA234{(I8T0^+Ks>{
z3{fPJt<Zjz>=;}kf0&{R6b-_4%J?m2_?SoVk$W2pqLCJvgk`b6M*@YT5n_uo$XT-(
zl<<QQLs#g9S>N6kgcyX)l&^;gGN{WVYP}QA|2SeC_+YC?G+m+EIw1ivrhG5WsQhdT
zj^A6)RGj?$2`4hY1$r7D?C$SNk`fxRu5-OCtqY`VkP{GvFnLQPs8rE-ycaw5Gfx^0
zff&VG`c6+Doa5}5;R>-T!40lP1(_i_Pm$Dl5}G~`PV23X#dgG0TEv;sF0AN5`*J=0
z%mr{pf9p)pzqPJaN%m_21;6Cln9IfOGJj|U6rA2n^@dFJAHexLgDi&SlS=cUjk(M>
z`EOH{PneB`f+Y*hypVXef&CDgLmOF%Da}zQQ(EIT_R)(^J9acL``BDd^Rw`pzXG|z
A*Z=?k

delta 311
zcmex#iRI4;mJQpuCa>G2v3UXaHP*>aT?&)Egfs*d7-|?47z`LH7>pP!8Il=HCKn17
zGa648tj(O9z*)EXjIaaOW&!zmEX;-s=9@PvOEWT>PG+<MOHQ7qF0lEC>ICk|0`g}z
zs~DePWi|mCuu*ya=6RNj#JDYh=IQ`VH)pVzys`Q4WWK;J%oYqrlRr)|p1k2O7pD<e
z-V!J)*p)wdgOtK#pAenN#{&5#p9<BOye4D|y9t8@&;-NDijS-(FABXhSs_`9(+sT3
z5NM9#S5ctNN|P6~i-BBxHWf(L9~GZm5G}WPR`{*ejE2)6sxnGWHxOl%*}jUIQGs!q
yB%|3jR>n8XjONo9N-)MVn==?rSL6Wdn-$KteF7)rHks*OYK%X&+o>~}FaZFg=VG-0

diff --git a/language/np3_zh_cn/dialogs_zh_cn.rc b/language/np3_zh_cn/dialogs_zh_cn.rc
index a4890cc1be820cef35f0120dbee5063ef52b11c3..14d0468642745122dcfb8f160a6a441d6a392aaf 100644
GIT binary patch
delta 363
zcmZo$#WHOj%Z3I)W)lXZ$%>p$H)jata853eRPqjCC}K!t$YUsGC;-w$45>hN34;Pd
zE<-*;3XrD&r1OAe4v;Qp$ON*}fxI*zFPWhfD5Aum1LS)$xG*?R?&X(c2J$8sY6>$d
zOl}mnR##v!2g@5W7&2HuSw;*dP?iBuCm2pH<kH{#O*)N**_gp#bG(8mBeNNU1=yi6
zN?W*S?@)1sLrvh$13Gl_#SfyJ1$4{Um`xeXCdVtR+-ziWU>BqDWc!b%ldTl_Hk-W{
R0=d<2vg1eN&2=9-Q~(SKPt5=T

delta 92
zcmV-i0Hgnwt^|gv1h9Y+lc<?$v+5D*36mf%{IlF0i~|EP05`L1Ar%1wH2^o0AqnNP
yXd|==vmh^a1_LwzG?Qx~sk1^hz`6l3m%#@CHM2PJAOQn305OwM^E0!K@`xl==^^d_

diff --git a/minipath/src/Helpers.c b/minipath/src/Helpers.c
index 8e1c5245c..8c67a61e5 100644
--- a/minipath/src/Helpers.c
+++ b/minipath/src/Helpers.c
@@ -553,17 +553,11 @@ void DeleteBitmapButton(HWND hwnd,int nCtlId)
 //
 //  SetWindowTransparentMode()
 //
-void SetWindowTransparentMode(HWND hwnd,BOOL bTransparentMode)
+void SetWindowTransparentMode(HWND hwnd, BOOL bTransparentMode, int iOpacityLevel)
 {
   if (bTransparentMode) {
     SetWindowLongPtr(hwnd, GWL_EXSTYLE, GetWindowLongPtr(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED);
-
-    // get opacity level from registry
-    int iAlphaPercent = IniGetInt(L"Settings2", L"OpacityLevel", 75);
-    iAlphaPercent = clampi(iAlphaPercent, 0, 100);
-
-    BYTE const bAlpha = (BYTE)MulDiv(iAlphaPercent, 255, 100);
-
+    BYTE const bAlpha = (BYTE)MulDiv(iOpacityLevel, 255, 100);
     SetLayeredWindowAttributes(hwnd, 0, bAlpha, LWA_ALPHA);
   }
   else
diff --git a/minipath/src/Helpers.h b/minipath/src/Helpers.h
index 4e0d24dbe..aa2217096 100644
--- a/minipath/src/Helpers.h
+++ b/minipath/src/Helpers.h
@@ -68,7 +68,7 @@ BOOL SetWindowPathTitle(HWND,LPCWSTR);
 void CenterDlgInParent(HWND);
 void MakeBitmapButton(HWND hwnd, int nCtlId, HINSTANCE hInstance, WORD uBmpId);
 void DeleteBitmapButton(HWND,int);
-void SetWindowTransparentMode(HWND,BOOL);
+void SetWindowTransparentMode(HWND hwnd, BOOL bTransparentMode, int iOpacityLevel);
 
 #define StatusSetSimple(hwnd,b) SendMessage(hwnd,SB_SIMPLE,(WPARAM)b,0)
 BOOL StatusSetText(HWND,UINT,LPCWSTR);
diff --git a/minipath/src/minipath.c b/minipath/src/minipath.c
index 4e6947b21..116869be1 100644
--- a/minipath/src/minipath.c
+++ b/minipath/src/minipath.c
@@ -504,8 +504,10 @@ HWND InitInstance(HINSTANCE hInstance,LPWSTR pszCmdLine,int nCmdShow)
   if (bAlwaysOnTop)
     SetWindowPos(hwndMain,HWND_TOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE);
 
-  if (g_bTransparentMode)
-    SetWindowTransparentMode(hwndMain,TRUE);
+  if (g_bTransparentMode) {
+    int const iAlphaPercent = IniGetInt(L"Settings2", L"OpacityLevel", 75);
+    SetWindowTransparentMode(hwndMain, TRUE, clampi(iAlphaPercent, 0, 100));
+  }
 
   if (!flagStartAsTrayIcon) {
     ShowWindow(hwndMain,nCmdShow);
@@ -2257,8 +2259,9 @@ LRESULT MsgCommand(HWND hwnd,WPARAM wParam,LPARAM lParam)
 
 
     case ACC_SWITCHTRANSPARENCY:
-      g_bTransparentMode = g_bTransparentMode ? 0 : 1;
-      SetWindowTransparentMode(hwnd,g_bTransparentMode);
+      g_bTransparentMode = !g_bTransparentMode;
+      int const iAlphaPercent = IniGetInt(L"Settings2", L"OpacityLevel", 75);
+      SetWindowTransparentMode(hwndMain, g_bTransparentMode, clampi(iAlphaPercent, 0, 100));
       break;
 
 
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index d97af7675..11993d34d 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,8 +3,8 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.18.1030.1334"
+    version="5.18.1031.1338"
     type="win32"
   />
-  <description>Notepad3  RC_NewMenu</description>
+  <description>Notepad3  RC NewMenu</description>
 </assembly>
diff --git a/src/Dialogs.c b/src/Dialogs.c
index b6ff62616..a8bcb85d4 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -2985,13 +2985,12 @@ bool SetWindowTitle(HWND hwnd, UINT uIDAppName, bool bIsElevated, UINT uIDUntitl
 //
 //  SetWindowTransparentMode()
 //
-void SetWindowTransparentMode(HWND hwnd, bool bTransparentMode)
+void SetWindowTransparentMode(HWND hwnd, bool bTransparentMode, int iOpacityLevel)
 {
   if (bTransparentMode) {
     SetWindowLongPtr(hwnd, GWL_EXSTYLE, GetWindowLongPtr(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED);
     // get opacity level from registry
-    int const iAlphaPercent = Settings2.OpacityLevel;
-    BYTE const bAlpha = (BYTE)MulDiv(iAlphaPercent, 255, 100);
+    BYTE const bAlpha = (BYTE)MulDiv(iOpacityLevel, 255, 100);
     SetLayeredWindowAttributes(hwnd, 0, bAlpha, LWA_ALPHA);
     return;
   }
diff --git a/src/Dialogs.h b/src/Dialogs.h
index 8e47c556a..023a603a6 100644
--- a/src/Dialogs.h
+++ b/src/Dialogs.h
@@ -49,7 +49,7 @@ void DialogAdminExe(HWND hwnd,bool);
 INT_PTR InfoBoxLng(int iType, LPCWSTR lpstrSetting, int uidMessage, ...);
 
 bool SetWindowTitle(HWND hwnd, UINT uIDAppName, bool, UINT uIDUntitled, LPCWSTR lpszFile, int iFormat, bool, UINT uIDReadOnly, bool, LPCWSTR lpszExcerpt);
-void SetWindowTransparentMode(HWND hwnd, bool);
+void SetWindowTransparentMode(HWND hwnd, bool bTransparentMode, int iOpacityLevel);
 void CenterDlgInParent(HWND hDlg);
 void GetDlgPos(HWND hDlg, LPINT xDlg, LPINT yDlg);
 void SetDlgPos(HWND hDlg, int xDlg, int yDlg);
diff --git a/src/Edit.c b/src/Edit.c
index 6ae8c51c3..512994ecd 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -5125,6 +5125,8 @@ INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARA
         }
       }
 
+      CheckDlgButton(hwnd, IDC_TRANSPARENT, Settings.FindReplaceTransparentMode ? BST_CHECKED : BST_UNCHECKED);
+
       if (!s_bSwitchedFindReplace) {
         if (Settings.FindReplaceDlgPosX == CW_USEDEFAULT || Settings.FindReplaceDlgPosY == CW_USEDEFAULT)
           CenterDlgInParent(hwnd);
@@ -5137,7 +5139,8 @@ INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARA
         CopyMemory(sg_pefrData, &s_efrSave, sizeof(EDITFINDREPLACE));
       }
       _SetSearchFlags(hwnd, sg_pefrData); // sync
-      s_anyMatch = s_fwrdMatch = NO_MATCH;
+      s_fwrdMatch = NO_MATCH;
+      s_anyMatch = (SciCall_IsSelectionRectangle() || SciCall_IsSelectionEmpty() ? NO_MATCH : MATCH);
 
       HMENU hmenu = GetSystemMenu(hwnd, false);
       GetLngString(IDS_MUI_SAVEPOS, tchBuf, COUNTOF(tchBuf));
@@ -5150,6 +5153,11 @@ INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARA
       hBrushGreen = CreateSolidBrush(rgbGreenColorRef);
       hBrushBlue = CreateSolidBrush(rgbBlueColorRef);
 
+      // find first occurrence of clip-board text
+      //if (!SciCall_IsSelectionRectangle() && SciCall_IsSelectionEmpty()) {
+      //  PostMessage(hwnd, WM_COMMAND, MAKELONG(IDOK, 1), 0);
+      //}
+
       SetTimer(hwnd, IDT_TIMER_MRKALL, USER_TIMER_MINIMUM, MQ_ExecuteNext);
     }
     return true;
@@ -5220,13 +5228,13 @@ INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARA
         case WA_INACTIVE:
           //~s_InitialTopLine = -1;
           //~g_bFindReplCopySelOrClip = true;
-          SetWindowTransparentMode(hwnd, true);
+          SetWindowTransparentMode(hwnd, Settings.FindReplaceTransparentMode, Settings2.FindReplaceOpacityLevel);
           break;
 
         case WA_CLICKACTIVE:
           // mouse click activation
         case WA_ACTIVE:
-          SetWindowTransparentMode(hwnd, false);
+          SetWindowTransparentMode(hwnd, false, 100);
         default:
           s_fwrdMatch = NO_MATCH;
           s_InitialSearchStart = SciCall_GetSelectionStart();
@@ -5501,6 +5509,9 @@ INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARA
         _DelayMarkAll(hwnd, 0, s_InitialSearchStart);
         break;
 
+      case IDC_TRANSPARENT:
+        Settings.FindReplaceTransparentMode = (IsDlgButtonChecked(hwnd, IDC_TRANSPARENT) == BST_CHECKED);
+        break;
 
       case IDC_REPLACE:
       case IDC_REPLACEALL:
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 51fc6614e..a9c9e5b45 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -1023,7 +1023,7 @@ HWND InitInstance(HINSTANCE hInstance,LPCWSTR pszCmdLine,int nCmdShow)
   }
 
   if (Settings.TransparentMode) {
-    SetWindowTransparentMode(Globals.hwndMain, true);
+    SetWindowTransparentMode(Globals.hwndMain, true, Settings2.OpacityLevel);
   }
   
   if (s_WinInfo.zoom) {
@@ -4927,7 +4927,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
 
     case IDM_VIEW_TRANSPARENT:
       Settings.TransparentMode = !Settings.TransparentMode;
-      SetWindowTransparentMode(hwnd,Settings.TransparentMode);
+      SetWindowTransparentMode(hwnd,Settings.TransparentMode, Settings2.OpacityLevel);
       break;
 
     case IDM_SET_RENDER_TECH_DEFAULT:
@@ -6704,7 +6704,10 @@ void LoadSettings()
     Settings2.FileLoadWarningMB = clampi(IniSectionGetInt(pIniSection, L"FileLoadWarningMB", Defaults2.FileLoadWarningMB), 0, 2048);
     
     Defaults2.OpacityLevel = 75;
-    Settings2.OpacityLevel = clampi(IniSectionGetInt(pIniSection, L"OpacityLevel", Defaults2.OpacityLevel), 0, 100);
+    Settings2.OpacityLevel = clampi(IniSectionGetInt(pIniSection, L"OpacityLevel", Defaults2.OpacityLevel), 10, 100);
+
+    Defaults2.FindReplaceOpacityLevel = 50;
+    Settings2.FindReplaceOpacityLevel = clampi(IniSectionGetInt(pIniSection, L"FindReplaceOpacityLevel", Defaults2.FindReplaceOpacityLevel), 10, 100);
 
     Defaults2.FileBrowserPath[0] = L'\0';
     IniSectionGetString(pIniSection, L"filebrowser.exe", Defaults2.FileBrowserPath, Settings2.FileBrowserPath, COUNTOF(Settings2.FileBrowserPath));
@@ -6877,6 +6880,7 @@ void LoadSettings()
     GET_BOOL_VALUE_FROM_INISECTION(AlwaysOnTop, false);
     GET_BOOL_VALUE_FROM_INISECTION(MinimizeToTray, false);
     GET_BOOL_VALUE_FROM_INISECTION(TransparentMode, false);
+    GET_BOOL_VALUE_FROM_INISECTION(FindReplaceTransparentMode, true);
     GET_INT_VALUE_FROM_INISECTION(RenderingTechnology, Defaults.RenderingTechnology, 0, 3);  // set before
     GET_INT_VALUE_FROM_INISECTION(Bidirectional, Defaults.Bidirectional, 0, 2);  // set before
     ///~Settings2.IMEInteraction = clampi(IniSectionGetInt(pIniSection, L"IMEInteraction", Settings2.IMEInteraction), SC_IME_WINDOWED, SC_IME_INLINE);
@@ -7231,6 +7235,7 @@ void SaveSettings(bool bSaveSettingsNow)
     SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, AlwaysOnTop);
     SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, MinimizeToTray);
     SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, TransparentMode);
+    SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, FindReplaceTransparentMode);
     SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, RenderingTechnology);
     SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, Bidirectional);
     ///~IniSectionSetInt(pIniSection, L"IMEInteraction", Settings2.IMEInteraction);
diff --git a/src/TypeDefs.h b/src/TypeDefs.h
index 1e4c91d13..20773370d 100644
--- a/src/TypeDefs.h
+++ b/src/TypeDefs.h
@@ -317,6 +317,7 @@ typedef struct _settings_t
   bool AlwaysOnTop;
   bool MinimizeToTray;
   bool TransparentMode;
+  bool FindReplaceTransparentMode;
   int RenderingTechnology;
   int Bidirectional;
   bool ShowToolbar;
@@ -352,6 +353,7 @@ typedef struct _settings2_t
 {
   int    FileLoadWarningMB;
   int    OpacityLevel;
+  int    FindReplaceOpacityLevel;
   DWORD  FileCheckInverval;
   DWORD  AutoReloadTimeout;
   int    IMEInteraction;
diff --git a/src/VersionEx.h b/src/VersionEx.h
index f4681f197..9bb0fe9f0 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -6,8 +6,8 @@
 #define APPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 18
-#define VERSION_REV 1030
-#define VERSION_BUILD 1334
+#define VERSION_REV 1031
+#define VERSION_BUILD 1338
 #define SCINTILLA_VER 412
 #define ONIGMO_REGEX_VER 6.1.3
-#define VERSION_PATCH " RC_NewMenu"
+#define VERSION_PATCH " RC NewMenu"