From 41d46243153f7f60b6e865c059b96b8d2f665777 Mon Sep 17 00:00:00 2001
From: muqing <1966944300@qq.com>
Date: Sat, 17 Aug 2024 14:41:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=89=BE=E5=9B=9E=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 RustTools/ApiFox/user.cs                    |  46 ++++++
 RustTools/Assets/WindowIcon.ico             | Bin 211467 -> 151083 bytes
 RustTools/MainWindow.xaml.cs                |   6 +-
 RustTools/RustTools.csproj                  |  20 ++-
 RustTools/Themes/LoginPage.xaml             |  14 +-
 RustTools/Themes/LoginPage.xaml.cs          |  42 +++---
 RustTools/Themes/RediscoverPassGrid.xaml    |  58 ++++++++
 RustTools/Themes/RediscoverPassGrid.xaml.cs | 106 ++++++++++++++
 RustTools/ViewModels/CodeTableViewModel.cs  |  13 ++
 RustTools/Views/CodeTablePage.xaml          |  13 ++
 RustTools/Views/CodeTablePage.xaml.cs       |  29 ++++
 RustTools/Views/ShellPage.xaml.cs           |  11 +-
 RustTools/Views/UserPage.xaml.cs            |   7 +-
 RustTools/WindowUI/ModuleInfoWin.xaml       |  63 +++-----
 RustTools/WindowUI/ModuleInfoWin.xaml.cs    | 152 ++++++++++++--------
 RustTools/muqing/wl.cs                      |   8 +-
 16 files changed, 451 insertions(+), 137 deletions(-)
 create mode 100644 RustTools/Themes/RediscoverPassGrid.xaml
 create mode 100644 RustTools/Themes/RediscoverPassGrid.xaml.cs
 create mode 100644 RustTools/ViewModels/CodeTableViewModel.cs
 create mode 100644 RustTools/Views/CodeTablePage.xaml
 create mode 100644 RustTools/Views/CodeTablePage.xaml.cs

diff --git a/RustTools/ApiFox/user.cs b/RustTools/ApiFox/user.cs
index 279deca..1e36efc 100644
--- a/RustTools/ApiFox/user.cs
+++ b/RustTools/ApiFox/user.cs
@@ -7,6 +7,7 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using RustTools.muqing;
 using RustTools.Views;
+using static IniHelper;
 
 namespace RustTools.ApiFox;
 
@@ -70,6 +71,12 @@ public class user
         return task;
     }
 
+    /// <summary>
+    /// 激活用户
+    /// </summary>
+    /// <param name="account"></param>
+    /// <param name="key"></param>
+    /// <returns></returns>
     public static async Task<string> enableAccount(string account, string key)
     {
         var task = await wl.postAsync("/php/user.php?action=enableAccount", new string[][]
@@ -80,4 +87,43 @@ public class user
         return task;
     }
 
+    
+    /// <summary>
+    /// 修改密码 发送邮箱验证码
+    /// </summary>
+    /// <param name="account"></param>
+    /// <returns></returns>
+    public static async Task<string> requestChangePassword(string account)
+    {
+        var pattern = @"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$";
+        var v = Regex.IsMatch(account, pattern);
+        var task = await wl.postAsync("/php/user.php?action=requestChangePassword", new string[][]
+        {
+            new []{ "account",account},
+            new []{ "isEmail", v.ToString().ToLower()}
+        });
+        return task;
+    }
+
+    /// <summary>
+    /// 修改密码
+    /// </summary>
+    /// <param name="account"></param>
+    /// <param name="newPassword"></param>
+    /// <param name="code"></param>
+    /// <returns></returns>
+    public static async Task<string> changePassword(string account, string newPassword, string code)
+    {
+        var pattern = @"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$";
+        var v = Regex.IsMatch(account, pattern);
+        var task = await wl.postAsync("/php/user.php?action=changePassword", new string[][]
+        {
+            new []{ "account",account},
+            new []{ "isEmail", v.ToString().ToLower()},
+            new []{ "code", code},
+            new []{ "newPassword", newPassword}
+        });
+        return task;
+    }
+
 }
diff --git a/RustTools/Assets/WindowIcon.ico b/RustTools/Assets/WindowIcon.ico
index b6c9dd1ac5e1524f294bb46e18b585ebff3b0a4d..f66504c4a07d5af1800522a29de2a27a7ae77e53 100644
GIT binary patch
delta 158
zcmeDF!n1k~XFUT0BLf?QfB*v!C@^HOFfgQnSPBsS3ZVEopqPULgs<Vmz)&X2z>tst
zm7l`EFfW{ep`igP&%wyx_J)Chmlwom;N2U^z>xQakwF8<0a>8{#Ef7P$N-wluyKDd
a%jQ{pD+D&ba?x;VZ*peb-sH^G`3(Rf${P~^

delta 26047
zcmcJ%33L`k7WduFk^l*iKw=WIZxCcl$W90l$i6@j5D=9`QBgq=_bowmU|i7H;v=#N
z4vxFyz9Z;3<I0E&?t<&M%rNS>i}d&VS3mvmBr@MQ-*?_O=ls+4bXV2ARdwsuty{PI
zj`h8-_%6E5vTUo56%(UthILX8%euv~ti(j`_p08O)vu>zWn_52ZzbRL{VXd#KlnS>
zvc{!b)`SV(@4ShY^;xxL)z=5hPpAA!%W7@)et&)<<=?fedGmth2VZAd7f-US_V!=}
zy=-gnTehV?G4$kY%bL8m+r0}H_ZR?A7Ie*hJ-2#0OCuV)H<V@tG8^nv=i7*}&bXAm
z1B-L4hLY?IFbR}{et{1**?QP-P*x9qp8(zmKY{PSL*Q^{b!L&1meW6{JHO5VKY+i2
z6Tu4bAMgO^3p$n$Ro*;5?~mMj7^DGF7cK+;1!W-cc8Q(l%(MrNsxQe3FC@~bz%Qih
z$v_oW0cUAcT$_2=RC2hk@t^=yfP63rECVX=AV>k>mF4pLMevsYOg)!4ASyhM(uaeq
z!0X^^@O^!8);{oFLrI&dTunbz<vWxa%xft12#Wx}eRLyz6xah)=_56xGcKM|nRmv~
zjiaxbT|4Ue*2=tl%5vh9j%zKo&RkIKmlNYpt4u>%N%pBERFQeuG{%gu)mUP#^SQ5n
ze!jXOz2?@y;={gt_okyhe|yty|9orXOM70q;obLMzJ43&=^wqeuIH&ojaMCm!81Uk
zukH@j-BOb2GoY(__>+PBdtv<W<ZSob`w~BUbK|X_?%oiHonyz<fB)H=8!kAiE`J0$
zRNc2g!es+fO)XcyKWMw|uL0lI7G_R#-DjgIfBTz%zcw&+g`Ly}um3%HR^@wjMOl))
z6Pkh@YAP$uG8OriaW5G#I@$MduRHBsy!&q*2hKgQ-aYq(dUw~;SGiQ~e)7ipPPp=d
znQmQC=2w&(1q_qTV@%yn&mJ-LW4QSp8BTZIzs0`!+_f(+KYfY|=fA+z&r9b{bYFh*
z@=g`gvF`m_&T^Z}bAPKZ&Yq)6>nl<M_fE41Ix#(Z);DnHM}}tltIw<+cj>aJ64d?V
zT*-AYweCA*cBT9Ghc9zK4YErQyW9WL?jjeWtf99WiZc(^I8ilH!?Gi*M_dP8<?7&G
zZ<Dhmdk*~n`}iZuyjpi}fZvVoW4B%4POcbofV^{+uPOgvjn$I1Pr%1OU4Ikk4@~!P
zt)|A$7fdPXRO7nKj}v8yUL^=*w%YMdzaEj*5&XIfxZq9@2mG4KsOjxvnhM>g?rAgq
zh%C8pJ$J3kz-wThC$HqqS=vjLMU_wChbjr5dL!tzowMum-A8UcKU4|Q?OwOyShuk>
z=Qr{%a&`_#Q4M2z@hcYiEabrSvomW(y7%9Fw)@YwHi3=qJ1<=4UVqtKcgk4P>9>-<
zAApUd?kO?-oJ>2eD4iQmG?r$&e>`V~``jacaCh9>?%wR2?4EW^mD^aB!}w>Zpj46}
z)>N9?u{_h+*%CE;9QXbXzHc2j)SW(YxI2|Azkj05uhf@hFCi_0D(8F?F*I+^@Ig#)
zWT`ky_XdC}(x=uJWnIX1DZeFI3C^~GWl?pdL5)z#Fla64H=uX7LbP<|Tz9{1xj$K!
z`!(1Lwp$iSi;LAB1Q-6a>U0N@p#LGjI%j#<YmK+|T5Z6+|K%Qc#SGB0G!JOWGJiSu
zXYN1J&YnGZgjL7Pg;A@yMAs~<UK)lqYEp$|)fHw0zFA?fjnspNl3c@l1R`xUmafUS
zR~M-VR5%RkrSaeta53<EBEF&6%jc}lo#nJg<U89UqD!00jXs+|My(Ft0Cl?$3H!5P
zdSi)M84aP@qAX{5(s|Cfi0EE*C7IHV3!K$wBs+^!di7QfOPPG#gJg1)ZDKInLLTk|
ze)UqXT0$iikAZ&!|CyH4slaL~O1Bz|oc5$8s;cgPRJDh!T1NV70YzXm+3UbA;8*z+
z=~!UZ77U>Ui&S6Q|ETW+^3^w#IvI9+oCHa0p6U_HHNcs_#gwoAe<@!FAKuW=^)03T
z%3;PinmV=tpSLrZk7F5@;bN-!e^e@?q!xt6yS~g*`*lU3d$JzXpMJ#`V7OGbX`0j(
zWtf7V&>(4LxuJ?`E0{_~`pD;vY1hFLakV^Drh!?dKVPtd&!nEDro_Mjp!K(h)ik;k
zbF3h+ugH$*nQ5JA-ED+9FtWjpp7}p0YW1oHA&QMO(@^wQcCR(XrWK3GCwom){{@Ob
z;KQx<h&C0{K-7mXm!3FFY06NV4(5SlK`R&wQb8ZkwHw6LBmi-5!qyfAyTSbSm|Z!j
zR?KO&i~Ev){$SirT9t~k+_uR^BvgxUu$a=)kH>&5;7y<@^(#<k3cmo|dmB6f!e`C9
z{MPy>>K=y}LtdBp_p+_JVT1HM<7obcbN2ziOH{C)k)1Fhqhon$%EZb%udai=r<Ly{
z@N!`1Y<n29KDt?Ct5niQ6SCEnY*YSVJy+9YU-*3@4vs{>cx8(-p&GdSMmx$gYk4>l
z+zr%jzmTr#lh47cKw3n21=aH*!tRTL^1TBl07IY=)ml^G%^Lrnu0dl_5+L!RT)ZLn
z1wUq2P4H$81Lf>!OKmgrI;c)(mzfTdj(Ec>7-CYbyalMAM~oes6d%Q=q#`ddn#DYM
z*@EgqOxlGkb~n>oJE}&eR$jX72y1Rjk#*IDv#gI_Tlc#jtSvTt<jkeQAeSK~XEl`^
zoX&M6L!1xKOKTI4LYZm2#QdK?ogzrPi@!=lIpVD2YpwH7YOwzO!Oep(I%a??z&%)r
zPh$Z*i~aC42H#(}x8T#=>jz;uT0Y)<_G)kR=*XrqhSogl{dYS5d}1Ozv(bBKGS`>n
zFw_%j5zt1|7>|Vtum||XG{7f<-jl};v0iv=rDz@omVsU1m%xD&?8G`!`@suf`X_H}
z=)u)`=$3O$tu-ZsWmroOg-?}F`8~bC(;lXm>PoU?j!eF)&&aF<9&Q6Z8|v*j$d-lO
zXnpe52C-2Fo&>)+2SyDm`kK_mpwC_Fms*o649NwQ3SaMJKT5v@8=K{H49P8`A1v*S
zR6Ebk2AbuftN}W;z9i2U)lc6rRBNE|j&mTtH2+tI;=HHtThW7($B{Ff(ue$Rsn@Cy
zoVWF5Osw2etphv~GJ({K-^80p_rh|ts8-D@0dE7B-;P~cJnZAw*L`vEsV&!&CtUdU
zP_9uk0@Kd`X=eXhQ3olEO_5px{5Gi%MvD!sZjng`&j!i3+wN|2|N6iR$Q2CPyKAj`
z(J4)`dVLl(8JmniixebV3X!3qlNv&6YjzY_9s_=nHFc%g-8NjcP^7wpD}7Q=+<B2J
zLwiAMDP%8(<cMr-1n%0f)NL6v*e@@3^ML8d){5M~<`#S8m@;1<n0>J%N%^(Sl^*bW
zuoznZ)Gq6p2UZw5^qkYTvN)X{bzggCwW}=y2CK^M2lG_6Wo(8PO2jZ~f{c4#lS$jB
z&S@yHKHI&a8x?n`;ujuY72Fw^N(|EwaoIP!cW*qyvGa!}eDvClZu@DI!~5~NhSChD
zBeQr~m^f&R{6;@Sy4N%JU!qRSg3i1Dc<KuG^kb`hW|dET$rv*CW=tC4-gd(h7ZGvh
z-;y~<9U0vJ_;o%&-pGa$=k$ot+IBQwtg=CD<Z83Mwb-W4dhM@Q|8n;6wc0!R&!zcS
zfVto^V4h8zFwEWDagzJtt7{p&)Ir*&+`jfSHaMYrwIcKl(rg?N)w*0|gIJG3w)5h9
zTmN|K%B$2r%p(8UZ{%@6RK4dc(wzN3<-`-d3HOGT^IZ6aZc?J?GUv6i^2<MqjP`Su
zL=>r|(=SxXAnutkJf%BMhJlNY9QzCt#lNrFu^z+#%@{M0xK@GJfuSt1yte&l_x+vM
zLpff)2KSaVr}%Z~`Y4opiSlt~AK_J|#oEvGJn0m0HBFJs`S))n9S00?iA7Ky>31=B
z1sEp8^y-Udo91WM#vgXwienJ1&`@n6A3Fjw%<nuF)usk$3oJTX0&WJ{;`?+TCM|xv
zMzi;k73%-ynhKr<W_X&)a@=c|AMHvtXdZ{-gMS3vGZ)l^i}?i&C3bdT*ATl{<It8&
zHU1K<{uX>Twv)~Q#tvX1V7hxYneKsjAmh#C*GOM+-jObjBPqvDY-m=>TQReGr0Fio
zsJTrIB|T+^=4fuuk+mcB1-kQagI{sjRpWFxFyr8<(M}9$AG0YezkAuTBiwgiTqD6q
z5>sneE$|zs>uVsn!I`_YVoGh9zZ1!B<gPzD%BAknXj_ftK@At&o$4Ow12i#A*J(0b
zcuJEq^_3(h{04XDwkwR5(|z&?tC|jXCd7?%?yl`MiJ#Hn!Qi9!xK^nX%+di%b%w3r
z;Fo4c@Vp%ut4~#)bzDtg={h?pMXh7<xqmoon%~8u^)VR5X2)nvtF|PhqG#~nEx;n>
zb)mmlaZin6u9?m4nWVMino8x%LNmyH60lFS<Fh4eH(h<AoJ2+zl@VOhSe$EfwOWdX
zGPae@v3XHr(K*@q44QeMhYjoz%$0O)`4HV-1Wea!^2odMBDx%E4wEWd0>1g0lU(Vz
zu<qPWnL(zW;_SfG;dWK`A1uqU2gDE2-p*L1BIYgmv&m@IX%RSnYMEJB3;M+m)mXjy
z^lJBt^JfNI6B;j#e~Aca_BT7HMbx$3WKFUrOv=P)R%hi{wP7Y)qi3?TP{OQ%VpZ#@
z96zXXnzJzkmIfCW9}4SK_oO2$jD&=#Tv;OHMOlzo1pl1(2aI4_oHy4z^Co3A={>;I
zq3d}kHn<Pqt$OmViwqvzdX9VZwTs-#&O8EsN?hrzFde0G+dzqL9FfMU)X;HFB8nn%
zdOW`$1)=)=w490ZfXVgf+XymGf@`>+{|oZ30^U%0ZPIWp46HuYj_limN29<B@QO1z
zbx4ZVn>}DH7(*vYDHu)EP?E_yy-4MHp+Xp!LbHcb&03T$2U@JP1$q}~QtbxM0BIE&
zphJR33LybhrOT6+)|u_6=6Bc}uVoWK@AsnIVIYm=BpoD??#sf8X7@(Oc&fBYaJmvZ
z%U)hsCs8QQG+Z|Y)mtdDc@`{)aMn~LYJGEJ|DJkt{sP<CI3t3CCYQhV@#cC!4mN)7
zm$QxQPjb9*{W^HvD`y<Pw+FB7!K*xM+&^IT&~?9Maa?4)dNI1TTUG|w14z~ct~|Ed
zsTb#;ZMBiW?bl5N<^B@`dv(R5XRa`|UB6+}TwU*Kb8Y8#_uw`1|L3*sPz6Ou_jT<b
zcHJBNt!p~>#qfBpYN3B^3;uS!Yj<<qPIdbIHQ97Ef0mVJS@)k8KXl>%j^(UtK*&!y
z6+h*@_Wk+$x7bepf`1ljmpr*(u+`&~9#&&vuGP#ALzC6>g|MuYqIHXMt)}w9R_*9y
ztEn>8$z1TMv$MH3r(6Ap?Y5$%ZLtHh`e2~+tS=lA5=(#kP+y*HRaazF?(HTcnuw>j
zHkh?Sb7Lr&2RguQ;6AVwXgW*>X|<yz*4`X~9(-m|->#0k`}Y;SEN~fkPacfq6q&Lw
zgOe#DM>0jVLK=@5#h#a^G#a6n+O7qEb4IQjmiRNN+reO9_K!_PgRKb#8O*I6a^gAL
zPLAw3n};8hy)@<tQrRXe*_%p~?MXkIJzM_MSn=^WkSh2R{Nfy&k`S|%`4<c5Xc|?9
z@8~Z3A!mF<ln9uT31h{}{XpbK0+})e;3V)O@HLZvRsMxq4yn`GHK5$NCh5XX%p{Ee
zfh?CWwsc5vO*Z4K&e3>h=YqR{U!{M2hUbShlm=P{+xIzXXAJZ>tpA>@7va~IW}*2h
zrkeT@X{rj5F;yz9F49=|)#<8b(rCZBf*iW-w$7Y3tLh7bN{cF3Y3Zz1BvF4nGYB?T
z>9c_}Za9fQ))k=m%Co3`>p`xksA{Z8qYq6rQ^y=`b??^ARPFyOFB)}l?e*-Zuewx!
z3oY-7RotGmr8Dz!qHsQ7N_dPmVIxj$Od8U{sax=#Msp7cXZT)z_W^-#PO&#R8E3?L
z{cP$xk0CSl$s(wcn<Z(Od;yvX6cO@)L@m6^o9H`cm%4auXD$=JBkQ>!#O1`Ip-f6@
zjvv-1vWKa)u{52lv2!GLzjmp;T{U-P&TlrhkXaGDkuug8GFDZbCj;3NbKDU1@@FZZ
zI7a50Nc%48nv!%)MopUp!`wLtvMffeD@L5Ub+cg(g_UiM&Qc}8rWc#t#$UTIr%{j<
z!)c7x#u=@3<;hk{{z$_BYurIb#Ei%oWLe{phb~)%&~q{SJ4PjZ9;4JSdCXwTcuSHB
zn@WOyR*%3yvS|VDDyO^Xt#o7P6=z{?PIlS`L^ju!%JZiNvaK*ZYXnweGYK3AB*fBq
z(vZu+QXu1?9^}%PD46X*`e2Wq1r@_6cdh0EbZBXoGr#X)V?^NKd{t|;Z(I+$GP|F9
z%bHQ=T&+<@$*)o4>>Ls?ILn$?VeA<51h%8VXmXtf?gX-B{%e%;SjmyZ?|q=nq6mEg
z!X;N}DTy<whH2)RuQj6?%IlL7`}870Wf+>kmnDzk4bFkb5@H@{D9%b$2}u|NEfYRR
zhLKUW-1n|Vs{4{}G7y8G1vYN6E1b$zafu?l3>d;(t!5U#>Oyr^TK~>8HyWC6k*QD_
zTgpaovXv3oQEZP(mfT|A%4?=)tPnD`D!?6qedFwzhRzwV6QWZK9ox2{li`f8d-aSb
z?<P@*{(w|NBN~wT6sQ_!SEbB}OQr)P$6obhkgGv+`XiR7A+hRaZB(W9e*(WcBQHxg
zG?&7bM8mLEU4q6g(7aESc$bvK1c%T(76&&`Fd<H()zE~6AX(L{o>Gz#*fq)?KftRe
zs3?Yz?axlys`S=xNy*1>Gq?~O3z|VS(9ArR;X4h}xC8v1eZ#-G=Zk<w;Pl`o&ag9C
z5jaVK4{GdzrdKwLrvdMgt=`*8tFPgU4NgT|YeC$>Zoz^jS9u^U(N3TBG0C++YtJAG
z^n|uGt!kKsd&+W_A7fp8@llpsa@bMbUVrwQzAMk3mOX!RaRd8<OKA90gtDB<D$$MY
zopsK_TI-iD@3h<l_o?@ykV^4D)jkd*y+xe%7pHZN9xpr%v>tAcORPLD&gef4VZE90
z#u#}=Mnap+g#aj#RmGLVzAWqV^JZGO?X6FCU2lK#x^bJ2V;g%SxC;CkJj`bLF+5oJ
zk-qKqXRp5T{hfh1Y~9k|R~fnZcjKkqz25rpjZJt1H~4Fw8CNUBdmqyXHQ;75{O^#e
z<;XwSv>e1)>Z&rPDSwDn!-1|D|KjXoXWy!XVtEs^AFHNmW`(IO%&>m?;x0q*lh-!N
zZ#xPs2hW3j;5VmVL&{hZKZ4hQeD4{byiRM)!NdmZQ~b*xe|)>)xUMAGa10T#Bu4*a
zdRp5~+{fHCdeg~2XJV^7XA<sU<}|KP0$<wvt7eR(BNdpu@-oXw&rVmIXTiv&V2_;j
zi3dnM2d4O^6Q)yN-5B_=#*VYM8cXjDYN`s&P!znqrmA^iax6=qXOF^_?5Asi`poA<
z*WbW85DToz;$(|xAGld>ede8pOosLgfyq<sWT$V@@XW9Hc^0hn<tPVt^?JXtx+Z{I
z#L&Q3NsUv59&(U79D5UE>KWPA(P{iNk6N7%j!($Eg-lWaEJ0b;$8UH8L4QO->U8jh
zvvbXq_@7Cw2ED(0Z!=y7)5{6YzO~75n*9|zdGvdrxhNNzsj8pFX<hIHON@xd6Ck|x
zN^b|5z?2vLkB#`Q7ya|WchH|1`va*Zl8L&)Oey|b)zG+?Spv&d)>}Ta*u11^wW>x9
zTa6VVLu4L#q#eU)f5z`BiI9#K-+gHfW513rT`MR3DTeO08;*`*p6z{T>$%f$7dYRn
zO^kbyQcPC)0Wo<fNt6{78x##wKY)jicOjzzUx^vnovXEM{v^}9&)>L7@;(iG4vZ&~
z(R3B;BVYWkH7!y2$K4f6Tla~w{dip5b5y|cqkX=2K+{|_NR;Q`$zqZB=dAG!N-KxA
zbvIgVuo#e9|4gdIOt$rfT;Dp#fajmvaOFbdkcSx#1sWpd0a|nEv4PFk*oiU4s-aP_
zE}Csc=}zX=laCEfIv%N&*L5K-M%pVYAx>xSef378mmnGqwjLzD-nfU?Uva!~)hL!|
z>vgAaN^qmIV_nTKIltteol{>B?pagaZv*WNVJq93FiUpu)Z@aOBNCUFL3oG!liwvO
zqvm}2?iMSkfo8zZe|?^G0<)!Kkvnz#;f5w+Z#;XOR-a(p=<t;-hi3Z{ozi55*Z(th
z&sP1dlLirTGULRCGAU0p?Z$954nD4anFmQn>-qaHtnp3^cW;P=kB5C;biHHU>Fx~r
zMSS>Wm2RyZssVD}dua`QRTZhex^3+eXU8LP5o>VpbgOr+&YY=}sj}lJx8E-tytez|
z{N?LtUQaNNfZlhaDW@%NIj7^5B<JD>dqv9m`1bP-bSg7M=ebA!;1Vg>i6`oP77TDk
zo-=C_J~qGMf9OJ3cFQ!t%+EEAM(gy3s1`Uw`0+a~bU9ad?)`IW;Mh%eMDHBqF5mt4
z4&3FH*|^Q!B}Y%_+V>w&r3@4~!zByjrLKUCp)DZPccecD+Ea0Sm+Mc80?2=&c5nYn
zo6AwZv*YHtjPJ>`4}=#sM@Jg`*Z+Do43%ditnP|4riPzoDF1(e(NafF?=FTa%)(V_
zjQzX2)cF>_(*eh<OcZZ0P9cQyw`U)`)ID*=7^mv7xIC${cA(DFlHG-=Z1?;{4S2z?
z5L1C|EA4^NKai^y1UE`kjYl&d^F8F(_v?^4PgYJ@4KNUaGx$%64n6Id3F?VhiBAVp
zt#8l_st%;xV<$$QF>jKB2O(LY@K-nRhq-28oQrb~bFRysHrg!I=A2i;?vvAXH%J5K
zX!*NOZ##?=iI>kiv0miLq(3(@O9v{0(CGQ(D@Z>N!YeXTD4#rMpfI9?;SDDIvCHiI
z5v!q5bv0q`Ga&LF5AV&5d%9HkDZdX_M#SFQc-0A|1Tue#DeBBmi5vT89!R&Cr9how
z=8>m}M{xf!(1|;7al*86otBHc^lRFV>MFb6!dazkn#RE?;%vC~h9H8vL@&HPiB%<#
z4vWLZZA`doH6g{jtGzgV21l9!1Z#QLlIN`X3wgq8GkvE+fX8mXfb-{EPnegsb`@rI
z$tcy|V8RKf<{1vXkhCkh)cGsFk45YE;krgUoaQI!r)-s$-`T|OaMhoz<~qVj>c$vL
zUL&nm+zKQCAx_nY$8!At#GMy9yLM%!uyC6=)v#y-<&_0Ah(o1WImWRdc0JdlSPE4}
z`dS!T!A>Tj^#y*7)Hb7bbSjZ8-qK)r3;y#Cm3?iNBY9a3WWj}M6nn=_Ep?wZ0+?!4
zG0T>d`BGdodsfpEY%+&xY%`h<o^_Q`$yebOk^aKjmzNNymKfz>v{+H5HHrQFy%9;-
zOhN4!&Ia0Nhgi^|#@yy2ZyZZAhiDG`iIr4`u;KYgU(qm%n07{>wrH?8GVxpXK<%Qk
zrz^9xQI+R@^6U%Q9{%5?(F~Qu-B^>@US9m+36$xiDPi0_x?!|ST#p2+`v?EH!P#+V
zTrYo(^p0?1Vzgvy37=VLyo;-xi!V)Yl`^jfX6kDMG(zEj+O>zc7?UaY($U}x5NfVC
zP-w-yo6i&nW>gfe!l>BqIG1P6i&48KRfe3})y|TqlUrpZ%%~eRocg^{*ARsN;R7=K
zh<?q8B=IPftSQoowifN%*DeVZEVG9ibBdWS6%xG`mC-|LqqZcC0hnDnB|l^)$Q-yU
zyry7U(|%#&=q%g}Mm0b+EAZQ$cEZq*39ikzI<6BFip<v8<VRRkbb^tK9rrFjltm>H
zb-<c1E+z2cZT2xHaxN`7^mfS+Jp6AM0oj{N*#k%*jV<1opJj!+Tbs&~JvZjTh_NE_
zYO(3WB++7=fX{dLzOpv_h~DX2niRNuDIuuWy1WXZg&{^Or!kqDSP<f4`Z${}KWd4{
zOC&vk(WdH=APFtt=QGTa!Dno3I}1_^g49TWP*Zu(xm}Wt_BEDFCl+;p=v;D)OW*=p
zd}yTXbgVB~ThafbfLU1Ti-!cNdf5w4Y(zw+5I`B+a?K)xCdZ{f3dG|SuR!=8M?BWV
zae3C%v|&6qtr<+-CqWn|*?Kp_gme(k04Ia{uz`@}B-5|z*2G=`CZ<{&n3`cPI<7Te
zj>=A5Glz#Uz+(b6FgPVP#7AUA4{LUL7Gd0)l}K8tu}dBbXF_SI75pdeJ1<@b6S@6m
zILQuDNYAX=Q5ve~on$o2D3v%nUR#VQ8W9v;c__7cGk_JXSpJ_jq#^b^HsjfHCPrSo
zxW#3kZ0Je7X%SG|1jp{8XF_*dRZ@&grEvJq^jbVk+thkgdmYYAACrQSwxX(u+)|uo
z$^<E^gKhww)VvhR*$Zp+Iu1-^I%%UKqusyr>O|X;7M(DQi{2XN6BzgI&I<!3a8fg?
zuy$kuA||JAsLy4BT?u{xVS}6H%AR_8+vQZBl%PJ<nY>1K*N&^)O;?}b&YN5emBhGj
zD0mt&FYDG+Ou#yA?ZBq#dxR$d?L7LabN$)wsYi`-UwCYlIqz2}l<N1dqNmLdaifZ{
zGvdAw!v%dOnlZAP7kNh`MxYcHy%vHIGZ?VqOtFGX*TmI@+T_!h0d!5<9QV)HpQ=zd
z_rA?%x%X^Z=H7b4Vl(qsoY88+DyCNrGi6!MP?d>sFHu1=<7xKM(1uVBva~ju`<xRR
ztKrx{+Gsmvh(<>cNzD<>SY7EQb6<-zU|W&WTbgSl7|IJL%?#4KILSzDnTY|J#DhD)
zzi_oqNzry?JD7=#%A)byAjqzqWXqE_2dyqf!7PY5$}<6UfHyHQ#%E|zx(^%!;=Npw
ze7whau3JiE6>QDdOD_uJXsj8^cm^kInQ6Byr(?m5;6<PX>PPv*hV3UMNs!im09*jd
z=>yX{q}i&&7q!+GIoIsD&!{D{YH?cCJX$MgP$J37?!G%6eHas`fTEg6rvMom7lHG@
zQZN^2p+PleMKy7FOxjFef6@`Jq!@!g5(YAMrj|<Cd@Y<dm5;<ZV`gU9{1yYuOwRIv
zmkwu2i(M_+d3*^|h#nG><N9*U`$mQQ{(22ZFZpS<^A?`bCu*;O+79Y;x=fGCBy|7t
zr5yhLIeCVn8G5&&0=&a@{vR^EU4a9k1NcyWViU&u_lZwP_tV5E=#?W=C#U_P^j`0E
zBy)fJ!E~D<0f=Pq3UKw))Zgx>_gnUMKTUweUO)Y{)jxE9uhqZZyRR67bjwR`Cp|ux
zCTU&hr4>*?GzEFu%<EK^O;y~|YgN?mrMHug-0rokopgG;*J6^osh&`Ph800MKi$nT
zy=Ch6LM;@up}$Dw38obx;l*xHOZvedCL|*Gz-rU|y?{S6G<!|b{y&>;`~O~PJ5d)w
zChYA8)7``F(<Pxiykt$xiPxBvQ2J}D%%t1A*5`*k*h|_3e^@`Me&R`#=O?>8l-^GW
zjDP=tXwiwvqc|GIJ1pIH=rsHX^S2r1LWQ9lN<-JAHOS+GY2tW{q;gBKKFVV9=&C<+
z-%Bb@xQf*ZZUUi5mE-vl`n!L`{;gir3ZW}=?ZUBXX;#bVT&ooWs%2a>X%vL9#Wj(2
zoRVQp9-n4a=b^#0#Vt&~KXXBE+xQBMgSHTj!)X>;K(8$&4MZhc4b&)IB^5GeSc-G+
zslPU4TNQN#H*r_>>Zy6ZuNZ%YBB?x0IG$%Eq-Bi7){aWiUc)F8S)fv0#M+^dzG+fD
zGBX+>uRMeLuG2LKNOQ_^eH&;Q)p^*L;6v~fSP90!nP*93*%x%Pzu{EB_dpZdVl-@j
z@|+4@arR9a68ABwD^ZnMp1L$W<7|HKQwsHpF`IrkAdjeT3Z%Vlm&QF!a!ixfP&I&S
z6=$x*?Q|-_wnR4D<E(w-jg!Avxz$wZ?xAS|DY5HNC7yKpEl=+)d;4GDYaIut_j$tf
zqZS}%&m-rs&>nrLqEE=HpDI)9C2&5_-cNmA362BzJN+(7=yQP7Dy>ru&Xn9_LYy8r
zWNm?Mr`XB8){;59sWdI{+dw<fKAWvwLiGFGGhPga$mvL58+?QBV21@;|D>s+`D(Z~
zma>8y>I#EL{>YMXuz3B;e$0GdKxTp)2Jw1so#|){(W82>$SZ*8e~@ZjO?C}1ReL=>
zg@M<f?uB^_L^_UpPl9lAN<R(^yUi1lAouA1CfENe7Q}vJHx@u$u`_SWVWTva<l;Ax
z930W|SVIy{MdGSyAV-NG*c2I(Hox;UnkL@rO0pU%>aSyRG1kgB>5b1TE*u@+h2zL3
zD<+(hCPyir<VOzK2vLZUBjE~QD6o+Td~>3mi#ZyVB*~EwhF7THV*`^1+lQ2yC(XH%
zYP=lu1;&K1uB+w^vdm$1%xGLqW-xfx1SII;^?$_gJfLmYUH_BmIFa}xhz3USw3a71
z_g;|MU(?vU7b<s1S-R8r{KV+z(L9G4jaMe)esOC(JV=)reI_1FC0W*tqBxnOR&`J9
z)nz1m&$Rt)F3hneRw}q4=nSOH??#GQ6=aDLHK>NBqHMjAHjs*>)+$rXJBT7U+S#@^
zA^OJJ(##%GmbialZGQi{@)Q)alr!DLi`%h<cD!B}jnUiNCR~DQCR3fSn}R%;xo@Op
zmESFfdm^N@?+_0Z)W;KQ4u-L$JNuqV=&#MqTya;$DN|!1;aW$|Q;WUXiDze0Gz@Fh
zJl$U39IFQO0jXd#m<TkQM+C2xTnoVvnlON?-c42+zsH_%_8p%bx01V2x~uJL^GM84
zoO5vM^zYGg0NaRAD1cc*{$iwc2l)q?GH_Gen#vho%kj;~mA~EfUwrkbrJ+}{l)nzN
zfd|2>;4|<YkiJm|=&H%1RpmYK3<!V|z!YFOj=7AK;aGh;sSNdSeI{yze$g6+@y&A~
z!#QwGa*XPm)u0`#<c&bE`L&a?X_R8R%;4y%PVs!alSrdbvR~w2d5D5+dTL+tU+qww
z^M>{B4F%R*#n=Q#Q)_hHn2^gWL!+6f$s~RANAyr{pGq@@IM~fFF+M>PK<kiLr^6!1
zFY12^Y-{D+*2+~yiRzO}5ekj6x4#)XLMDH3d?I72$EW(O%_PtLj81aQ9n2bLTCiCq
zI?1kK5=R{7-SM87g)@uvmCllN$xy2wC~7NU)^qC6%7*d0>7V7rvZ(q8O!aq@N&_&Y
z37p}4_()9(fjQQ=35R2HctqHrXbUZIe4f4=mZYKm3dpf2&HFKsUi_LU^mNnEOAu2-
zT4LIS2V-hU9&c%yU>|j|<~#)i@$E5lCn=8^MZ*>6I+=g0Ni>}b|6(RMe<UyGm@ftV
zc6{`#H~Dp&?ttl_0t^STFNT6rP=j8Y2`&Rq@mm{Je+f}fEvJdSr07Ip60#MP3Fghg
zRfK%v^&xd!G~?n$Y*dfQ3VfJq7ZCKH*iy*HBzU*Bh6r9GC|(f6)qw+5cKY#OQ{-MS
z7i2>yQj?T4;d?_Y+#lABmmg<s={Sjan<K4^{yk;O$~oQdit~?5!@W|4Gx9td@HpW>
z7Y>TFB5>?m^QM%L?_2B9%`2?fm}tV4aAx(2QOK047AatOjuX!~1+px+fWbA^f&$g5
z7!?^(I0dmLf~AtV-oX(`a@!B29stC%WU&|+S+iilx@+AToRDp>K6{Ihp4Zp)!5efq
zATnkBnP3gL6+DRd<^eo8cW}Llm-4RVxOVoJ?`}@p^J+k`4V<(R=fL%!udSt?gP}p5
z86Ma^&F(?8m(=OZL0*T!O?F`8Ep~F8j2R6+?B-ZACZWWMz5DQyhPcL&41qep(+shs
zH)`ODUnjKy4D^QEbD)2<=Vo)hsJ$WqHEFQ55ZnVk06%yEFR7z?RejG-y)UeYoT2U~
z;+Wtj6RBffL-m+8<`FUr1I=3X#E2)6kHADiqS)RFjNY9n7ek@eK%-LPv<_*0XjCL7
z<hw*CLIsjo2~c5E@NMJz{8Ve(J#DZ|n3DK-V?zRbEe0=wpA|7wtcao4!SVF1LL975
z4?J&u^3G=KBl?=!3|dP<XAPP+kBZAU(c1!&OfL31TKATZDDJo>F7B+TNUNT+F)`Xw
zX8L-j4k?BPg-oog30XR`HNy*&1Ym8b<@e*@XToUea&@L30LkjY58vEEoY_I93|Znz
z1N|PhlM|)7H-QA*Zsz5II{FQ}0|{ohwXz}6X5}c!lD+ea+K{W&DMKY%MiTrmcBo+o
zf{JH~;<^;@Ucs7anZJ>G6pT_t)xM9Pw0J?&@1I<1c-)NKucX!?i$*8QB-Wm9O2Kfr
zXo+cpj#f>$=}EpT10zS;iR#ZhN$=#6bZf>0IAEkC@6hT8R)X)HZ8yw~SGS}B--?n!
z>scY9dIP&KRz}PXWTi=6ULbjCX|Arww<hKj3C}Yy7DzE`*$T%8{GQ<1{n}t<6JKU{
zP}r7w;tKFHd>j`miMfH#M)j^8ouQU{n~u0OG-9Ap-Ym^iany~=8-Rs1wZ2vcsMd-y
zv+f1D5Ec`^fMw%H9&Vc>GrCC4^sr7Z*%L#y{s)Mk6pfbnnlA=jgrD`G1$Hg-fGJG7
zk^I^*gLq5M91zaY9BCb=V+qstVy+*7@OCTx1V{wPOO78>Vtw?+jS5XX27CoNy?#mf
zqO;?M*-?6dj-V%fmP!X?i9b@wYT6p3p|8{MD}*gyaUC;^#fN^j3Ny^xA?@Vt%7_lB
zW=bd3^ZJ|g{(oKzg;k7!iTA@9p)1Vyk1i#I<B7X2BF1HQq+)%V%5%j`+)eaIKlMNj
zoj;=_(V9|`t5YXdtv<6fO`bgj2ai%<fC_2E6x%3qhiVMCvn%zNh_hIV<KG-32hZZ?
z-!fHEXgUngi|0C8h*`(sdk@XOBl1xR4GMXheOf*4(b|g8;Z+sP{HF^;n$wHDIh$kg
zmYvaL!O*9<Fe7bi#zh2Q;iSQPq1)?Ly4s!BQtUqXr*r%uwMd;3uzZTCo^McjhCUzE
zaZPmGs2Ms<2^k$rdG?#LZ)@TZEgTA5gp#OBe{K(_`o`Zn+>1|b4iwyD$43&R>)yHU
zbZ6<E4bHZ{5xK-7L0s`pVXq)+%)bLNayiLHaJC#X&CnM8QWJQ+nP**P167s7?kk7&
ze3xM<I6>#b&W~bAo$wAZMyt-5u467_Af7kNvs}JU=5D!mQK0GqyTKVZrdRi1kWjD7
znxrC&v&BL5gxt_j5DE24!tj+fILYO{@&ZkbQj!!r?9<}?aJPe_5zZ?D_BnQHU`fF4
z6{+{}b=F9<S)`^1hhI+B*0`QBCHoNKFs}(|@h7AVruVwERl4A4AkL7$ko;?9*rzt`
z`Ns_=N(Os}Gm+fD<duY4<(XTs6j-{!uIbK4#54z@pQEC9RW>%M%9s7I+9+w;5#Gc5
z_&r7$b@E`$jn~)7{J30kj%tS@{Rp_0=;UeT)8u&<gjZsYYxL%BNBbP}mNa2!=HMEk
z;7BL*wFke9nw}1<rm@LzH^*tcs&`QZH~!V7VkxZ=%1A6pP%o~JhqJ#a0`pJK$vQxd
zRjrQ!>Evqgy0hfL#7KQ5&5J-Qhn0;k(V^ybTr&7<=qejs%c9P9G(8m{S~QUx>X`71
z@B10~bR1%cWwCohDIN8NPRDp1T_<kw>h_UZ-Rp2Gk{$<k1}1MJ@Jaz_-Z^Bk;YUGp
zQ#eK^M>w=y90jysnt^K?(I;OzqANdQ++<vie%Srowc=;)gImx2g%3N5m(*QkDA&5A
z+JvB8t;JwFi*{n<IScE8XO{(rrAKc&-_^-J8N%@~idj1b6NVMkqr){?Uv<eSOTJPW
z6^4bCZgbds<$R+H6RUUgV1j2{B5ZV#GU_V-E@=(IeLyx~ICY~!&X_-mQ_z*1vW_sE
z>f3oO6~B|Kci>d-)LM<h(@f{R`&b|6ysVfcRj3V3E3hULL4Z(JBCv1Ecxje6*4OYv
z=7?E^v}$W}W!yJ1p-c~^k?$6uY0!nmEED1Qw}&osVjmuneG7-C7=@kkQ07JINl;x?
zGmCxpa<vcXstVKxX9AcoUXPc=X6q;1If4%->aJl`gX{lk=ifloM#*Z=1xa45?CXFU
z-iZ|{$3-*8I^R4!G*XI%FbT6V$cT=Tsv2%g7t!~eoR4>{f#2)k;&84{iMJR{-1)Ud
zdZ|XrobZ9R_{72~axvkXVg=;6kPqI{{OnGQivn#jox68L^t_(0X4XkvMmx0ydBz&5
zXQRt}#6(0yK$91?bR89RY7D>SW_eQHi@0w|EoBsYay5qU<Ppivh=>Gs?%r~0n2?dG
zmF8D)ur9t&qA^qCtb!!?&Wed<e*V#wuGTkoT3G)5q)!D#TelP&-4Q1~jSb;7b{@}v
zb{?uq*QfiA{+?eKAnd(VN>FZ&Li`a7UHx~Ig8BM!?Esy*g>!{;=oS38i1Q_+!we;_
z|0}|!zqEy!iaPJ;qj1)vOw?FUQ63h!`zU+ZtV>CHUY9V2LR^qAyV~H+mb{v+%CB-V
z_`<ux9NI5GZAwt(4vp0JLM}YHNpY|dFOk`N9OJ|oiGpSsx=2<1MZsfnTKQH3&yCB|
zmN6D@ug8z_x79q8P^srG0P4w3#P$1vlN%lT$q`WsG|>kVX4QB>EmtuhNTvLk3ND!+
zBZ)NTx+j&#<D5y3(Ujf*2FTC=&eWWwxMn{F#8U?ns-=OQy;0`Gm%2Mm;O+<li*9tU
zykM4=-I#xqWfHJv6&2E5GWh1lmDTa0qgvo0nd@_!G_&p`l`IEnL-`PEY05^EBYXh5
z*|wSNUP&fWh55F{JbsH(r#_H;^5q*vdP_}4svr0W6Tx$d(f85i{Y@n-DtwtyhJew#
zHHaVSWk3QQUg5+1&eBlLJD>jI;HhIC?|XWtnqky9j=fj*v`mMWHIwCp>0{id@4Li_
ztr!)ES!73a=kqaAGchs(X9BZp;h;(!aSYHuBZr%>g;lkUbe>{J^c_Za70!o`!vf}W
zhz)PUuO5Fptejy*{ei(}K0Xy&Q4pm!0A!wMv#z1KpHViWtpm1}LhYLt57tNCbkMdW
zrd(}2KUnGCxQ+y7%If9o;r3yL)noH4Nk|hjOxqrwR{$xa-}Qy;aTBmxS{$jxfmanw
zSA0q4T41#n;b@Q>A!%tkFXkAvsrx{^ax*BG219V2W1<I*Mrdl->o&1fqM^#BG1Wx-
z9c{&Q>eYbQvQd54Ye(Sz<)&pW->(%1#+h+7!yKuhHtSrW2IQ;+JVsP&&<z=lts9eN
za}Dfx#7-)Oj!|^8i-;Fg!O|S9-+w(6eSPcpPCnqI7iKyh91$fm7I&U+GxdCeLaBjm
z57}iLH#RHgEZ(OK5gIDgmgfXsF0&H~B)6tp)MhQn4;+f7KJ0>dsOTtyD2E!QfRD}P
zjY6m3mXx?RC^S}@TIUo3Us`acHeY;{7X7fGGo|%KmheAg7%&f{zNtpgO8aM^bvxAm
z5<qQ%WI$s`Ye8|+8hiCuAfmn;tjIBKR}>xg4h5^5jkAf0;b$5rO2jIaDio~=?cj}s
zAvTb_>p>?gMEfj#IwhblXA!tdIGTtJlot44XTW`mcO))9cZTV7;;EwFqk@*20<-lA
zv<&A2jIT)@t+q%BA9A^o9nY5&&1abuf#ye{`4MTdB(%>|lpnU5`Cu8}FG3NUPc<ow
zEBYT)Uei#mv#A_sSL{$me3b&y`p}idS<>&9;nGViRVdivIpYmIws4A-G+&OpbN%VA
z=Fhsz7ntpy`Vf29>@k9&Vgt3B+|FFV4o8k;xfKUmGx%BpZx8hB!NarA_!)fC=V0`i
zR?@D~XBs}Q%A6SKw+lfWfc31vH|uSE)S*32GK74J^Tl8%_=S`BIf=4`;Uar1uBGl=
zjk=|cPDkzxN*<r+Im8gJ(dK*Q>Eu}i9uFMYZs$4URt-s!H(pNM7SIov87Dz_D)vWx
z+=Xgx%B$6ChUZJ0Mw18a#b!E|v=qzL;6?Cn%%f2`5}7Z+)1V!cfhb@~*658xe61aO
zo^Mn1qrBc~UP#%JX4|e4Hsn2P9OYyHIp7iSGI$NV8HDtpC_e<Q2d98Cx+)I8lug>u
zG`>o+rqGIm;kAL(S@uOVuX)bc>U14#s!0&%-2<8_rc{Bh&Gaq`NZ}ueK*oPI$O5TA
zmR=t$hwgs&ke0hvqv2fSEP}?R38qezsCgL?hp8rZD;C}Jd$XMX?2SxlE|)&yrFtTc
zCzPe4FL<4h1FFmgzYS4c`Yo9Km6132(^Y%}UWL4W=|=_K30>>c=7r*T(Kd%no1iQ2
z`2iD{<)w+j!U^xC2^I_0vsbZV!TZ~ZDe}|p#2Wc&w3nZ5Q(%z)Ly<?3!Ay$s^3z{?
zAL=p0_F9qc{{8J<xSF}&Zl!Pc@56$hhw9sc^-v+PW+sm+x6Rjv+VoW+!k0`On+ZL#
zB25?@Ulro7|6aqK@>9QQjUwZy-=y~{P1Dul?MfSR=EFSZgF`O&b=x}E>p7FoH(w7j
z)f?u>VM4BWsF*fCogS7RPulQ6p0=>G7&iO_BgKMg6Dbx<n;@{ghOid|7EA~4x0xs5
znf`C4^P%R~f38WZHE<+m{Rd%bdpq|{=o+7b3QI?}AH1*7I4fN}@spJnmL3~Q@2C6u
z8?QY3z5X)k1NL4G9zDu~1Ezj2?RIZh0ay10)4QQGy&Foyb13bFx_SB2!|sm{OOrJD
p+r27Xs}cfxP20T(jB>i4$=xne-hGq!U3$gFnGbKAX<zlj{{tyYBZB|{

diff --git a/RustTools/MainWindow.xaml.cs b/RustTools/MainWindow.xaml.cs
index 4f1bd48..8b22a21 100644
--- a/RustTools/MainWindow.xaml.cs
+++ b/RustTools/MainWindow.xaml.cs
@@ -14,11 +14,11 @@ public sealed partial class MainWindow : WindowEx
     {
         InitializeComponent();
         gj.SetBackTheme(this);
-        AppWindow.SetIcon(Path.Combine(AppContext.BaseDirectory, "Assets/WindowIcon.ico"));
-        //AppWindow.SetIcon(Path.Combine(AppContext.BaseDirectory, "Assets/Icon.ico"));
         Content = null;
+        ExtendsContentIntoTitleBar = true;
+        this.SetIcon("Assets/WindowIcon.ico");
+        //AppWindow.SetIcon(Path.Combine(AppContext.BaseDirectory, "Assets/WindowIcon.ico"));
         Title = "AppDisplayName".GetLocalized();
-
         // Theme change code picked from https://github.com/microsoft/WinUI-Gallery/pull/1239
         dispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread();
         settings.ColorValuesChanged += Settings_ColorValuesChanged;
diff --git a/RustTools/RustTools.csproj b/RustTools/RustTools.csproj
index c018940..0e04d26 100644
--- a/RustTools/RustTools.csproj
+++ b/RustTools/RustTools.csproj
@@ -29,8 +29,22 @@
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <AppxBundle>Never</AppxBundle>
     <AppxPackageDir>D:\RustTools</AppxPackageDir>
-
   </PropertyGroup>
+  <ItemGroup>
+    <None Remove="RustTools_TemporaryKey.pfx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="RustTools_TemporaryKey.pfx" />
+  </ItemGroup>
+
+
+  <!--<Target Name="RemoveFoldersWithMuiFiles" AfterTargets="Build">
+    <ItemGroup>
+      <RemovingFiles Include="$(OutDir)*\*.mui" Exclude="$(OutDir)en-us\*.mui" />
+      <RemovingFolders Include="@(RemovingFiles->'%(RootDir)%(Directory)')" />
+    </ItemGroup>
+    <RemoveDir Directories="@(RemovingFolders)" />
+  </Target>-->
 
   <ItemGroup>
 
@@ -51,6 +65,8 @@
 
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
+  
+  <!--在vs code 中必须加上不然没有任何图标-->
   <ItemGroup>
     <Content Include="Assets\**">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -60,5 +76,5 @@
   <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
     <ProjectCapability Include="Msix" />
   </ItemGroup>
-  
+
 </Project>
\ No newline at end of file
diff --git a/RustTools/Themes/LoginPage.xaml b/RustTools/Themes/LoginPage.xaml
index a2e4ee4..6de3903 100644
--- a/RustTools/Themes/LoginPage.xaml
+++ b/RustTools/Themes/LoginPage.xaml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
+
 <UserControl
     x:Class="RustTools.Themes.LoginPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -16,6 +17,10 @@
         Background="{StaticResource CardStrokeColorDefault}"
         CornerRadius="13">
         <Grid MinWidth="290" HorizontalAlignment="Center">
+            <local:RediscoverPassGrid
+                x:Name="RediscoverPassGrid_view"
+                BackClick="Back_Click"
+                Visibility="Collapsed" />
             <StackPanel x:Name="login_view">
                 <TextBlock HorizontalAlignment="Center" Text="登陆" />
                 <StackPanel>
@@ -30,6 +35,11 @@
                         PlaceholderText="密码" />
                 </StackPanel>
                 <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                    <Button
+                        Margin="0,0,36,0"
+                        HorizontalAlignment="Right"
+                        Click="Back_Click"
+                        Content="找回密码" />
                     <Button
                         Name="loginButton"
                         Width="100"
@@ -40,7 +50,7 @@
                         Style="{StaticResource AccentButtonStyle}" />
                     <Button
                         Margin="0,0,0,0"
-                        Click="enroll_Click"
+                        Click="Back_Click"
                         Content="注册" />
                 </StackPanel>
                 <CheckBox x:Name="agreementCheck">
@@ -102,4 +112,4 @@
                 Subtitle="信息" />
         </Grid>
     </Border>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/RustTools/Themes/LoginPage.xaml.cs b/RustTools/Themes/LoginPage.xaml.cs
index 6ba94a5..1576f57 100644
--- a/RustTools/Themes/LoginPage.xaml.cs
+++ b/RustTools/Themes/LoginPage.xaml.cs
@@ -26,11 +26,11 @@ public sealed partial class LoginPage : UserControl
         ZpasswordBox.PasswordChanged += ZPasswordBox_PasswordChanged;
         ZpasswordyesBox.PasswordChanged += ZPasswordBox_PasswordChanged;
 
-        ZaccountBox.Text = "muqing1";
-        ZnameBox.Text = "muqing153";
-        ZpasswordBox.Password = "123456";
-        ZpasswordBox.Password= "123456";
-        ZemialBox.Text="123456@qq.com";
+        //ZaccountBox.Text = "muqing1";
+        //ZnameBox.Text = "muqing153";
+        //ZpasswordBox.Password = "123456";
+        //ZpasswordBox.Password= "123456";
+        //ZemialBox.Text="123456@qq.com";
 
     }
 
@@ -41,18 +41,26 @@ public sealed partial class LoginPage : UserControl
     /// <param name="e"></param>
     private void Back_Click(object sender, RoutedEventArgs e)
     {
-        var storyboard = CreateFadeTransitionStoryboard(enroll_view,login_view);
-        storyboard.Begin();
-    }
-    /// <summary>
-    /// �л���ע��
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void enroll_Click(object sender, RoutedEventArgs e)
-    {
-        var storyboard = CreateFadeTransitionStoryboard(login_view, enroll_view);
-        storyboard.Begin();
+        var frameworkElement = sender as Button;
+        if (frameworkElement == null)
+        {
+            return;
+        }
+        gj.sc(frameworkElement);
+        if (frameworkElement.Content.ToString()=="ע��")
+        {
+            CreateFadeTransitionStoryboard(login_view,enroll_view).Begin();
+        }else if (frameworkElement.Content.ToString() == "�һ�����")
+        {
+            CreateFadeTransitionStoryboard(login_view, RediscoverPassGrid_view).Begin();
+        }
+        else if(enroll_view.Visibility==Visibility.Visible)
+        {
+            CreateFadeTransitionStoryboard(enroll_view, login_view).Begin();
+        }else if (RediscoverPassGrid_view.Visibility == Visibility.Visible)
+        {
+            CreateFadeTransitionStoryboard(RediscoverPassGrid_view, login_view).Begin();
+        }
     }
 
     private Storyboard CreateFadeTransitionStoryboard(FrameworkElement fromElement, FrameworkElement toElement)
diff --git a/RustTools/Themes/RediscoverPassGrid.xaml b/RustTools/Themes/RediscoverPassGrid.xaml
new file mode 100644
index 0000000..3993edf
--- /dev/null
+++ b/RustTools/Themes/RediscoverPassGrid.xaml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="RustTools.Themes.RediscoverPassGrid"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:RustTools.Themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+
+    <Grid>
+
+
+
+        <StackPanel>
+            <local:ButtonIcon x:Name="BackButton" Glyph="&#xE72B;" />
+            <TextBlock HorizontalAlignment="Center" Text="找回密码" />
+            <StackPanel>
+                <TextBox
+                    Name="accountBox"
+                    Margin="0,16,0,16"
+                    InputScope="AlphanumericPin"
+                    PlaceholderText="账号" />
+                <PasswordBox
+                    Name="passwordBox"
+                    Margin="0,0,0,16"
+                    PlaceholderText="密码" />
+                <PasswordBox
+                    Name="passwordyesBox"
+                    Margin="0,0,0,16"
+                    PlaceholderText="确认密码" />
+                <StackPanel Orientation="Horizontal">
+                    <TextBox
+                        Name="codeBox"
+                        MinWidth="260"
+                        Margin="0,0,0,16"
+                        VerticalAlignment="Center"
+                        MaxLength="6"
+                        PlaceholderText="邮箱验证码" />
+                    <local:ButtonIcon
+                        Margin="6,0,0,16"
+                        VerticalAlignment="Center"
+                        Click="ButtonIcon_Click"
+                        Glyph="&#xE724;"
+                        ToolTipService.ToolTip="发送" />
+                </StackPanel>
+            </StackPanel>
+            <Button
+                x:Name="redisButton"
+                Margin="0,0,0,0"
+                Click="Button_Click"
+                Content="找回密码"
+                IsEnabled="False" />
+        </StackPanel>
+        <TeachingTip Name="Toast" CloseButtonContent="关闭" />
+    </Grid>
+</UserControl>
diff --git a/RustTools/Themes/RediscoverPassGrid.xaml.cs b/RustTools/Themes/RediscoverPassGrid.xaml.cs
new file mode 100644
index 0000000..5f85d53
--- /dev/null
+++ b/RustTools/Themes/RediscoverPassGrid.xaml.cs
@@ -0,0 +1,106 @@
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Newtonsoft.Json;
+using RustTools.DataList;
+using WinUIEx.Messaging;
+namespace RustTools.Themes;
+/// <summary>
+/// �һ�����
+/// </summary>
+public sealed partial class RediscoverPassGrid : UserControl
+{
+    public event RoutedEventHandler BackClick
+    {
+        add => BackButton.Click += value;
+        remove => BackButton.Click -= value;
+    }
+    public RediscoverPassGrid()
+    {
+        InitializeComponent();
+        accountBox.TextChanged += AccountBox_TextChanged;
+        codeBox.TextChanged += AccountBox_TextChanged;
+        passwordBox.PasswordChanged += PasswordBox_PasswordChanged;
+        passwordyesBox.PasswordChanged += PasswordBox_PasswordChanged;
+    }
+
+    private void AccountBox_TextChanged(object sender, TextChangedEventArgs e)
+    {
+        redisButton.IsEnabled = IsEnabledButton;
+    }
+    private void PasswordBox_PasswordChanged(object sender, RoutedEventArgs e)
+    {
+        redisButton.IsEnabled = IsEnabledButton;
+    }
+
+    /// <summary>
+    /// ������֤��
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private async void ButtonIcon_Click(object sender, RoutedEventArgs e)
+    {
+        Toast.IsOpen = false;
+        if (accountBox.Text == string.Empty) {
+
+            Toast.IsOpen = true;
+            Toast.Title = "��ʾ";
+            Toast.Subtitle = "�˺Ų���Ϊ��";
+            return;
+        }
+        try
+        {
+            var v = await ApiFox.user.requestChangePassword(accountBox.Text);
+            var message = JsonConvert.DeserializeObject<DataList.Message>(v);
+            Toast.IsOpen = true;
+            Toast.Title = "��ʾ";
+            Toast.Subtitle = message.message;
+            await Task.Delay(millisecondsDelay: 1000);
+            Toast.IsOpen = false;
+        }
+        catch (Exception ex) {
+            Toast.IsOpen = true;
+            Toast.Title = "��ʾ";
+            Toast.Subtitle = ex.Message;
+            await Task.Delay(millisecondsDelay: 1000);
+            Toast.IsOpen = false;
+        }
+    }
+
+    public bool IsEnabledButton =>!string.IsNullOrEmpty(accountBox.Text)&&
+        !string.IsNullOrEmpty(passwordBox.Password) &&
+        !string.IsNullOrEmpty(passwordyesBox.Password) &&
+        !string.IsNullOrEmpty(codeBox.Text);
+
+    /// <summary>
+    /// �һ�����
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private async void Button_Click(object sender, RoutedEventArgs e)
+    {
+        Toast.IsOpen = false;
+        try
+        {
+            var v = await ApiFox.user.changePassword(accountBox.Text, passwordBox.Password, codeBox.Text);
+            var message = JsonConvert.DeserializeObject<DataList.Message>(v);
+            Toast.IsOpen = true;
+            Toast.Title = "��ʾ";
+            Toast.Subtitle = message.message;
+            await Task.Delay(millisecondsDelay: 1000);
+            Toast.IsOpen = false;
+
+        }
+        catch (Exception ex)
+        {
+            Toast.IsOpen = true;
+            Toast.Title = "��ʾ";
+            Toast.Subtitle = ex.Message;
+            await Task.Delay(millisecondsDelay: 1000);
+            Toast.IsOpen = false;
+        }
+
+    }
+
+    private void RediscoverPassGrid_BackClick(object sender, RoutedEventArgs e) => throw new NotImplementedException();
+}
diff --git a/RustTools/ViewModels/CodeTableViewModel.cs b/RustTools/ViewModels/CodeTableViewModel.cs
new file mode 100644
index 0000000..e1e80cb
--- /dev/null
+++ b/RustTools/ViewModels/CodeTableViewModel.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace RustTools.ViewModels;
+
+public class CodeTableViewModel : ObservableRecipient
+{
+
+}
diff --git a/RustTools/Views/CodeTablePage.xaml b/RustTools/Views/CodeTablePage.xaml
new file mode 100644
index 0000000..6e48266
--- /dev/null
+++ b/RustTools/Views/CodeTablePage.xaml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Page
+    x:Class="RustTools.Views.CodeTablePage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:RustTools.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+    mc:Ignorable="d">
+
+    <Grid />
+</Page>
diff --git a/RustTools/Views/CodeTablePage.xaml.cs b/RustTools/Views/CodeTablePage.xaml.cs
new file mode 100644
index 0000000..9370ed2
--- /dev/null
+++ b/RustTools/Views/CodeTablePage.xaml.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace RustTools.Views;
+/// <summary>
+/// An empty page that can be used on its own or navigated to within a Frame.
+/// </summary>
+public sealed partial class CodeTablePage : Page
+{
+    public CodeTablePage()
+    {
+        this.InitializeComponent();
+    }
+}
diff --git a/RustTools/Views/ShellPage.xaml.cs b/RustTools/Views/ShellPage.xaml.cs
index fa3209a..03cdd76 100644
--- a/RustTools/Views/ShellPage.xaml.cs
+++ b/RustTools/Views/ShellPage.xaml.cs
@@ -37,10 +37,11 @@ public sealed partial class ShellPage : Page
         // TODO: Set the title bar icon by updating /Assets/WindowIcon.ico.
         // A custom title bar is required for full window theme and Mica support.
         // https://docs.microsoft.com/windows/apps/develop/title-bar?tabs=winui3#full-customization
-        App.MainWindow.ExtendsContentIntoTitleBar = true;
-        App.MainWindow.SetTitleBar(AppTitleBar);
-        App.MainWindow.Activated += MainWindow_Activated;
-        App.MainWindow.SetIcon(Path.Combine(AppContext.BaseDirectory, "Assets/WindowIcon.ico"));
+        if (App.MainWindow != null)
+        {
+            App.MainWindow.SetTitleBar(AppTitleBar);
+            App.MainWindow.Activated += MainWindow_Activated;
+        }
         AppTitleBarText.Text = "app_name".GetLocalized() + " " + "app_version".GetLocalized();
     }
 
@@ -55,7 +56,7 @@ public sealed partial class ShellPage : Page
 
     private void MainWindow_Activated(object sender, WindowActivatedEventArgs args)
     {
-        App.AppTitlebar = AppTitleBarText as UIElement;
+        App.AppTitlebar = AppTitleBarText;
     }
 
     private void NavigationViewControl_DisplayModeChanged(NavigationView sender, NavigationViewDisplayModeChangedEventArgs args)
diff --git a/RustTools/Views/UserPage.xaml.cs b/RustTools/Views/UserPage.xaml.cs
index cf4bab1..018e94a 100644
--- a/RustTools/Views/UserPage.xaml.cs
+++ b/RustTools/Views/UserPage.xaml.cs
@@ -53,10 +53,9 @@ public sealed partial class UserPage : Page
                 await login(account);
             }
         }
-        catch (Exception ex)
+        catch
         {
             nulllogin();
-            gj.sc(ex);
         }
     }
     private void nulllogin()
@@ -75,8 +74,7 @@ public sealed partial class UserPage : Page
         view.Children.Remove((LoginPage)sender);
         await login(account);
     }
-    public string aaa { get; set; } = "aaa";
-    
+
     private async Task login(string account)
     {
         var v = await ApiFox.user.SpaceInfo(account);
@@ -86,7 +84,6 @@ public sealed partial class UserPage : Page
             var data = userSpaceInfo.Data;
             if (data == null) { return; }
             data.HeadIcon=data.HeadIcon == string.Empty ? "/Assets/tool.png" : data.HeadIcon.Replace("..", wl.api);
-            gj.sc(data.HeadIcon);
             userInfo = data;
 
             DataContext = this;
diff --git a/RustTools/WindowUI/ModuleInfoWin.xaml b/RustTools/WindowUI/ModuleInfoWin.xaml
index 07d4dc0..5730dec 100644
--- a/RustTools/WindowUI/ModuleInfoWin.xaml
+++ b/RustTools/WindowUI/ModuleInfoWin.xaml
@@ -12,57 +12,50 @@
     Closed="WindowEx_Closed"
     SizeChanged="WindowEx_SizeChanged"
     mc:Ignorable="d">
-    <Grid x:Name="grid"
-          Padding="16,36,16,10">
+    <Grid x:Name="grid" Padding="16,36,16,10">
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions/>
-        <StackPanel Grid.Row="0"
-                    Orientation="Horizontal">
+        <Grid.ColumnDefinitions />
+        <StackPanel Grid.Row="0" Orientation="Horizontal">
             <Border
                 Width="106"
                 Height="106"
                 CornerRadius="9">
                 <Border.Background>
-                    <ImageBrush ImageSource="{Binding Mod.IconUrl}"
-                                Stretch="UniformToFill"/>
+                    <ImageBrush ImageSource="{Binding Mod.IconUrl}" Stretch="UniformToFill" />
                 </Border.Background>
             </Border>
-            <StackPanel Margin="16,3,9,3"
-                        Orientation="Vertical">
-                <TextBlock Style="{StaticResource TitleLargeTextBlockStyle}"
-                           Text="{Binding Mod.Name}"/>
+            <StackPanel Margin="16,3,9,3" Orientation="Vertical">
+                <TextBlock Style="{StaticResource TitleLargeTextBlockStyle}" Text="{Binding Mod.Name}" />
                 <TextBlock
                     x:Name="title_b"
                     Margin="0,3,0,0"
                     Style="{StaticResource BodyTextBlockStyle}"
-                    Text="加载中"/>
+                    Text="加载中" />
                 <TextBlock
                     x:Name="title_c"
                     Margin="0,9,0,0"
                     Style="{StaticResource BodyTextBlockStyle}"
-                    Text="加载中"/>
+                    Text="加载中" />
             </StackPanel>
         </StackPanel>
         <ScrollView Grid.Row="1">
-            <StackPanel Margin="0,26,0,0"
-                        Orientation="Vertical">
-                <TextBlock Style="{StaticResource SubtitleTextBlockStyle}"
-                           Text="介绍"/>
+            <StackPanel Margin="0,26,0,0" Orientation="Vertical">
+                <TextBlock Style="{StaticResource SubtitleTextBlockStyle}" Text="介绍" />
                 <TextBlock
                     x:Name="DescriptionText"
                     Padding="6,6,6,6"
                     Style="{StaticResource BodyTextBlockStyle}"
                     Text="{Binding Mod.Description}"
-                    TextWrapping="Wrap"/>
+                    TextWrapping="Wrap" />
                 <TextBlock
                     x:Name="fliptext"
                     Style="{StaticResource SubtitleTextBlockStyle}"
                     Text="截图"
-                    Visibility="Collapsed"/>
+                    Visibility="Collapsed" />
                 <FlipView
                     x:Name="flipview"
                     MaxWidth="600"
@@ -73,8 +66,7 @@
                     Visibility="Collapsed">
                     <FlipView.ItemTemplate>
                         <DataTemplate x:DataType="x:String">
-                            <Image Source="{x:Bind Mode=OneTime}"
-                                   Stretch="Uniform"/>
+                            <Image Source="{x:Bind Mode=OneTime}" Stretch="Uniform" />
                         </DataTemplate>
                     </FlipView.ItemTemplate>
                 </FlipView>
@@ -91,19 +83,19 @@
                     Name="ReportButton"
                     Click="AppBarButton_Click"
                     Icon="ReportHacked"
-                    Label="举报"/>
-                <AppBarSeparator/>
+                    Label="举报" />
+                <AppBarSeparator />
                 <AppBarButton
                     Name="LikeButton"
                     Click="AppBarButton_Click"
                     Icon="Like"
-                    Label="支持"/>
-                <AppBarSeparator/>
+                    Label="支持" />
+                <AppBarSeparator />
                 <AppBarButton
                     Name="DownLoadButton"
                     Click="AppBarButton_Click"
                     Icon="Download"
-                    Label="下载"/>
+                    Label="下载" />
             </CommandBar.PrimaryCommands>
         </CommandBar>
         <TeachingTip
@@ -115,18 +107,7 @@
             IsLightDismissEnabled="True"
             PlacementMargin="20"
             PreferredPlacement="Auto"
-            Subtitle="消息"/>
+            Subtitle="消息" />
 
-        <ContentDialog
-            x:Name="DownloadDialog"
-            Title="下载中"
-            SecondaryButtonText="取消">
-            <StackPanel>
-                <TextBlock Name="DownloadDialogText"
-                           Text="下载完成后会自动导入到你配置的模组路径，请勿取消"/>
-                <ProgressBar Margin="0,6,0,0"
-                             IsIndeterminate="True"/>
-            </StackPanel>
-        </ContentDialog>
     </Grid>
 </windowex:WindowEx>
diff --git a/RustTools/WindowUI/ModuleInfoWin.xaml.cs b/RustTools/WindowUI/ModuleInfoWin.xaml.cs
index 2aebb5f..6f5a2be 100644
--- a/RustTools/WindowUI/ModuleInfoWin.xaml.cs
+++ b/RustTools/WindowUI/ModuleInfoWin.xaml.cs
@@ -114,68 +114,104 @@ public sealed partial class ModuleInfoWin : WindowEx
 
                 break;
             case "DownLoadButton":
-                var iniHelper = new IniHelper();
-                iniHelper.Load(IniHelper.FILE.Config);
-                var v = iniHelper.GetValue(IniHelper.CODE.Rust, IniHelper.KEY.ModFileUrl);
-                if (v == string.Empty)
-                {
-                    var dialog = new ContentDialog()
-                    {
-                        XamlRoot = grid.XamlRoot,
-                        Title = "����",
-                        Content = "�������������ú�ģ��·������",
-                        SecondaryButtonText = "ȡ��"
-
-                    };
-                    await dialog.ShowAsync();
-                    return;
-                }
-
-                var cancellationTokenSource = new CancellationTokenSource();
-                gj.sc("���ش�ģ��:" + Mod.Link);
-                var downloader = new FileDownloader();
-                DownloadDialog.XamlRoot = grid.XamlRoot;
-                var asyncOperation = DownloadDialog.ShowAsync();
-                DownloadDialog.Closing += DownloadDialog_Closing;
-                DownloadDialog.SecondaryButtonClick += (a, b) =>
-                {
-                    gj.sc("ɾ��");
-                    cancellationTokenSource.Cancel();
-                    downloader.Delete();
-                };
-                try
-                {
-                    var PathMod = Path.Combine(v, Mod.Name);
-                    if (File.Exists(PathMod + ".rwmod"))
-                    {
-                        File.Delete(PathMod + ".rwmod");
-                    }
-                    //�������� �����ļ��ı���·��
-                    await downloader.DownloadFileAsync(Mod.Link, PathMod, (totalBytesRead, totalBytes) =>
-                    {
-                        DownloadDialogText.Text = $"Downloaded {totalBytesRead} of {totalBytes} bytes. {(totalBytes > 0 ? (double)totalBytesRead / totalBytes * 100 : 0):0.00}% complete.";
-                        //Debug.WriteLine($"Downloaded {totalBytesRead} of {totalBytes} bytes. {(totalBytes > 0 ? (double)totalBytesRead / totalBytes * 100 : 0):0.00}% complete.");
-                    }, cancellationTokenSource.Token);
-                    Debug.WriteLine("�ļ��������");
-                    File.Move(PathMod, PathMod + ".rwmod");
-                    DownloadDialog.Closing -= DownloadDialog_Closing;
-                    // �ֶ����ضԻ���
-                    DownloadDialog.Hide();
-
-                }
-                catch (Exception ex)
-                {
-                    Debug.WriteLine($"Error downloading file: {ex.Message}");
-                }
-                finally
-                {
-                    DownloadDialog.Closing -= DownloadDialog_Closing;
-                    DownloadDialog.Hide();
-                }
+                DownMod();
                 break;
         }
     }
 
+    private async void DownMod()
+    {
+        var iniHelper = new IniHelper();
+        iniHelper.Load(IniHelper.FILE.Config);
+        var v = iniHelper.GetValue(IniHelper.CODE.Rust, IniHelper.KEY.ModFileUrl);
+        if (v == string.Empty)
+        {
+            var dialog = new ContentDialog()
+            {
+                XamlRoot = grid.XamlRoot,
+                Title = "����",
+                Content = "�������������ú�ģ��·������",
+                SecondaryButtonText = "ȡ��"
+
+            };
+            await dialog.ShowAsync();
+            return;
+        }
+
+        var DownloadDialog = new ContentDialog()
+        {
+            XamlRoot = grid.XamlRoot,
+            Title = "����",
+            SecondaryButtonText = "ȡ��"
+
+        };
+        var stack = new StackPanel();
+        var textBlock = new TextBlock();
+        stack.Children.Add(textBlock);
+        stack.Children.Add(new ProgressBar
+        {
+            Margin = new Thickness(0, 6, 0, 0),
+            IsIndeterminate = true
+        });
+        DownloadDialog.Content =stack;
+        var cancellationTokenSource = new CancellationTokenSource();
+        gj.sc("���ش�ģ��:" + Mod.Link);
+        var downloader = new FileDownloader();
+        DownloadDialog.XamlRoot = grid.XamlRoot;
+        var asyncOperation = DownloadDialog.ShowAsync();
+        DownloadDialog.Closing += DownloadDialog_Closing;
+        DownloadDialog.SecondaryButtonClick += (a, b) =>
+        {
+            gj.sc("ɾ��");
+            cancellationTokenSource.Cancel();
+            downloader.Delete();
+        };
+        try
+        {
+            var name = Mod.Name;//�ѷǷ��ַ��滻��
+            var invalidChars = Path.GetInvalidFileNameChars();
+            foreach (var a in invalidChars)
+            {
+                name = name.Replace(a.ToString(), "_");//�ѷǷ��ַ��滻��
+            }
+            var PathMod = Path.Combine(v, name);
+            if (File.Exists(PathMod + ".rwmod"))
+            {
+                File.Delete(PathMod + ".rwmod");
+            }
+            //�������� �����ļ��ı���·��
+            await downloader.DownloadFileAsync(Mod.Link, PathMod, (totalBytesRead, totalBytes) =>
+            {
+                //DownloadDialogText.Text = $"Downloaded {totalBytesRead} of {totalBytes} bytes. {(totalBytes > 0 ? (double)totalBytesRead / totalBytes * 100 : 0):0.00}% complete.";
+                textBlock.Text = $"���ؽ���:{(totalBytes > 0 ? (double)totalBytesRead / totalBytes * 100 : 0):0.00}%";
+            }, cancellationTokenSource.Token);
+            Debug.WriteLine("�ļ��������");
+
+            File.Move(PathMod, PathMod + ".rwmod");
+            textBlock.Text = "�ļ��������";
+            DownloadDialog.Closing -= DownloadDialog_Closing;
+            DownloadDialog.IsSecondaryButtonEnabled = false;
+            await Task.Delay(1500);
+            // �ֶ����ضԻ���
+            DownloadDialog.Hide();
+
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"Error downloading file: {ex.Message}");
+        }
+        finally
+        {
+            DownloadDialog.Closing -= DownloadDialog_Closing;
+            DownloadDialog.Hide();
+        }
+    }
+
+    /// <summary>
+    /// �ײ���ʾȷ����ť
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="args"></param>
     private void Toast_ActionButtonClick(TeachingTip sender, object args)
     {
 
diff --git a/RustTools/muqing/wl.cs b/RustTools/muqing/wl.cs
index fbfbb14..0eacbc8 100644
--- a/RustTools/muqing/wl.cs
+++ b/RustTools/muqing/wl.cs
@@ -96,10 +96,10 @@ class wl
                 }
 
             }
-            //if (IsDelete)
-            //{
-            //    File.Delete(savePath);
-            //}
+            if (IsDelete)
+            {
+                File.Delete(savePath);
+            }
         }
     }