From 00953850b319e1aef4929017c89fb81646d5828c Mon Sep 17 00:00:00 2001 From: qianlifeng Date: Wed, 21 Jan 2015 23:00:56 +0800 Subject: [PATCH] Improve the update progress. --- Deploy/NAppUpdate/FeedBuilder.config | 14 ++-- Deploy/NAppUpdate/FeedBuilder.exe | Bin 128512 -> 128512 bytes Wox.Core/UI/ResourceMerger.cs | 2 +- Wox.Core/Updater/UpdaterManager.cs | 77 +++++++++---------- Wox.Core/UserSettings/UserSettingStorage.cs | 3 + Wox.Core/i18n/InternationalizationManager.cs | 2 +- Wox.CrashReporter/ReportWindow.xaml.cs | 6 +- Wox/ActionKeyword.xaml.cs | 8 +- Wox/CustomQueryHotkeySetting.xaml.cs | 12 +-- Wox/HotkeyControl.xaml.cs | 4 +- Wox/Languages/en.xaml | 5 ++ Wox/Languages/zh-cn.xaml | 6 ++ Wox/Languages/zh-tw.xaml | 5 ++ Wox/MainWindow.xaml.cs | 28 ++----- Wox/SettingWindow.xaml | 1 - Wox/SettingWindow.xaml.cs | 53 ++++--------- Wox/Update/NewVersionWindow.xaml | 23 ------ Wox/Update/NewVersionWindow.xaml.cs | 46 ----------- Wox/Update/Release.cs | 16 ---- Wox/Update/UpdateChecker.cs | 55 ------------- Wox/Wox.csproj | 9 --- appveyor.yml | 6 +- 22 files changed, 103 insertions(+), 278 deletions(-) delete mode 100644 Wox/Update/NewVersionWindow.xaml delete mode 100644 Wox/Update/NewVersionWindow.xaml.cs delete mode 100644 Wox/Update/Release.cs delete mode 100644 Wox/Update/UpdateChecker.cs diff --git a/Deploy/NAppUpdate/FeedBuilder.config b/Deploy/NAppUpdate/FeedBuilder.config index f06954dd29..4e99a397fd 100644 --- a/Deploy/NAppUpdate/FeedBuilder.config +++ b/Deploy/NAppUpdate/FeedBuilder.config @@ -1,18 +1,16 @@  - + http://127.0.0.1:8888 True False True - True + False <?xml version="1.0" encoding="utf-16"?> -<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" /> + <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" /> True - True - E:\github\Wox\Output\Debug + False + ..\..\Output\Release True False - E:\github\Wox\Output\Update\Update.xml - - http://127.0.0.1:8888 + ..\..\Output\Update\Update.xml diff --git a/Deploy/NAppUpdate/FeedBuilder.exe b/Deploy/NAppUpdate/FeedBuilder.exe index fae2128316308805edcafc2cec6e7f85565ceb9a..278eea2032764079524f266ed1994a142251d284 100644 GIT binary patch delta 12417 zcmaJ|3w#vS)xR^lncdkW3!5dodG73Hlg%a&2nnz743H3Fw8~3FlmZG8s~x`y_=D}}H zpL6a#bMCp1*@X>fTpP}~?!U{i*wVk)d&eUJTg>ohzrfb0TO$5~R*@9| zU${eH6~@L(M;S|mTH$?Tqo7Cj!k3fY7%0}a!jp-;Qy6oa{ap=P z)nX^7*yT31CB?3^v8^fgIvYD9#ol0J$EVneH8y%&ieAQ9<76Nte9QPEFayEP2$rC| zELc&pjUM(!H1Ye;G?a8hscCCYva!E>RM(SW zVp`0}Ziqic%1O6Nl(Nh+@JKzFKaaW#O+17q-(||9A^VGc#SH}@jENP~P#)_lBKfHi z)u)Z`RfMZ}*8#s2@Vf$jcfcC#KRAdht2SO8yO`TsmYj%f( zNytNiQYt)X#FXZFNqw)xZqN>+u>$aGM*)%n=L!HrF<)v>WYAn-#uG}@?2KN&u=kqp zO85Hzrom9c0mL{V+&m-MTNiw_RcKN%_L#jX{Hd}6@)fB+2BrSQ*comtq4KmQsG)(0 z$p_nId=egwVU$RTFknoItVYr7h_nh%?Kv6o2ukiEbNZYpYpOCi8uky+xDIFhr}P;p z2o|20Z(JEI74{mJM#E@tie7{E_tCNGN{sgz<<(`?KZ8esTYU~6LG|b4ZURZ&#{nw) zd1Fa+RCvKyUtOy22U(-t=Vmtq;s?0g2RUfTJ0O=>^5c+8EqOQOGE3eIx!jTuK(4Ul z!;mX2`55GoCI1exB3nTJ10j!vJ|vKDfxi+cu)x0v6j~rp2Jl*-kiakt6cZS30fm5% zgLD23m!f>n`M*XV?jlG07kJi|1T(hQ?94t~f~mu0VJzBykg{f9$uF8jJ1vLQdiErJ zpycP2`Vyr4By0RU)+FpQK8}soUj`qagWBqO1(IL#N$M{l`0`Y~j1EDLr8&N``9hJ4 zWZQzyWyUMtQ{*wtUPVW0mKjQVj+7+RhXKas;~XZJ*U+G*)z|UKd=hj=NU~)B(f!Ie zUE3_YVN}MO3XejK$8R;ahb!VSRQ~Pp`CY#TUnpx=Ik2?&IU;M*NPd*MlRf6ClJCN~ zLQ9Cszlvp^EnZ~FJX^wbQ}U0&?`v#>!PwM6iPa1OlMfyA3*x#7PcH_8+k*U~o9OU{ap5YA-j)(aF0`~j{jYsVH zEvaZH7khq3VmvL@rA3UMG#Hr{N0BJ@QpY_f$T`Mzvim*B{Fv;aJgrB-U{8|Rz{Ph- z9Gw=&q{YUx*ulmBBiqh2J2ov|kT$r`Vs#kLJ6exJlHF8+bUW-k7b#Bphn zj$pCp6tNT1;>5H#DQ(-57HJO`dw6HKbFN9sbf6@2b1|lR{WNaJyT_T6G^6XJOgzFuQg^^Cy^H;L{TUsUd#%TDzrZ8webd723S5(B9J zG>JO0IB2sVLb)WVrrOtz+0;Y?)qk1JI-#^Ntq$#XHe(`E#srj`lO5CY(N5WHi3pDp z(vi{gO4=ZqoWpQyzl$rc`h__#>EcX4!K;G6r=4dW+KOCsNV_i=t;pKGoV-W-K+mbj*Gda=M57dF z9X6h}C~X}PPBT@sQEB^#$g>eI5%HLrb#75v2tqO~{Iu`_$-?KW&}H}=m+5X(&((p9 zl|Yns3-w{uJrQBL11qH&MNfQCmD3%SsGpf(@GibVT^J@on`w#aF--~RlJ*ekdEI=U z>Lx#}j2A#w3)6(QhituRLJ2AXGnQd#QaeCa!_$O#PQp$o_4q)kMJ7*sIU>>1NYW1H zjD##RA|XOMWs8J}^CIC^f44Pz4K1gRtDk%gc&Ed_J6VhcwLWHJ}t(6lZ z&WnUwjUg*5Cqy6;oCA`ck(3T7g30M2AZb%_MnbxbNQlsu+9DxBnVK~_+)A}Y(t&-E zLcuX)OA2z*N&S7@)*lfS$-=WHo6cBC+mSOu(q%+Qgm%EzBN2*zMOKL1>}^|!L?A+( zi9 z2q*>Nx9GO<3H38*?xw_RAKF4B0v8%Qi9Hp>n)j7Yv+pZiwEj}tHBYV?3tc#qG1_Rl zeCD9(BASDyOKA?8E~rUbw{=dp)g*7D>E@b)#_pAirVDKjYr59vpr_OG=iq1LrdxB< zbPvwa3EhTs&~!6S(R_R}%B*CFA05GtUd9TrgI&1ROzpRry9sP!B(Ve$F40id$1{V-gYG zeEyikE5nmxa<_zSOd^76x%rR;u79&+`y95#L(4EV5`a!aQ3^6@gsimR*oGoP31pvQ$QAjmydW)7fNefB2weh zKARfX1lA0gz?uO9yw+?H=~VutC@n3uwx6@+X=oydo#VnGTf73jwTv zCAQ)ddx_Na5k=|Z<7QK`RsfM9d#_qOxmXWL2UKbp6Ikgtft7v&<_^0nbG>5?kWQO! z3xf#dnyh3KS(yxjyDU2|3~Q@vg=s1#6Id~sz>0}LSm#@CR#4^_nA!$gOk}KFofQ+2 zsh9|8kJ@4)A~pX6u>ImAwf*wlSI34-vt|_rp|C)&w&OGAig@jLTRhyYObKRG0FmX% z9C4R7ZSfG1iiZH=nSt+atbjshY0_mOU8scO3N&iisBevCR4eJut5zblZhyL_h{#o~ z#Fr&wrK?D4#t5KTCubypNKMym9domlS;b0Z>H^GtzC|upvC_>Zoohm7t}`#(#A|zP zBXKvLYaQD|@+&rCQ#V%bV^1~_sbmvCvaymfb4^#Obgl_mxi+VQ2<X@>$s?4$S^$LflF4An0)W5<*arTwsG^&4aVap=b)b?%s4S!xW7m}b&FpWKOy;x33XO~EsIYfIuM^qA3Y7|Gd|7uOIvjnER6 zSj%%NDlF?Ph zhH!uI0>bo+WK#Wnn7j@X$2W;mv!cUOQ6Fc`J~ns!$A`@i@P|FnLGhpHD4R;7ti>5( zjxrscjD(598sO5NwUq2RWaLF=H!P$H35oFzF!g&T&3)}i%kVH`(XTOf8$RF1i+*&$ zTCMx5*YqI6Y&pIenTuRU7cF2rmoYXRT(o0RC$=y4)4pjzVYb|bX>bDGIFJBz=#Nw~ z=4A&eHw#{NgtwpZHWJz_NNiImAMHNg9zYUbdU7-$C2U3L@k-DY97zvCAV} z5ih%*%Ly+32C|o(<*iahHZ!ZbA~&(?uoHRNb6~ve7;iu1+LCBjL}Fix=7V1q-7I`A z+#My$Bapr9Pf?vds;a4@<<&IUYRF!8A7`HD%x^ivYKR|;*28YD*(iJ1L%e;8x6kwT zP2Qg7tusbX8HmwS-WppOlh~FRW$5|Xnc*JxCbS;*VQgasj7HRwQDbc>+AiL%;_aq^ zRTaXZDBL)(SP{w{`h|D{WNafl>q@YCw$(ykaP(WeK#{J-{g_bC{%D~V_rt;{_KAh& z0*z+>u+Wu2jchnxh{*3+peFXLg>D8K$6m0|oj?=VtGWfZ0Zw9XTIg}0$t;dH80uyp z&{Ve0LPvn6vkeyd2&k34XrW1t1e?X&xW$m4M}9(>#oo7&UksnjzN!y%g&zEM#GXUMQEapIPV-bW7M97CH{y zh6W2o<5$>%- zc7$(Nf@cGjr}Bmz&lHVz2u|V!=i0vQqlBP-9L}=yj1WZoA-eN9^Fl*;vh(+XpB-nz zLnb3j$JywRA2u_<3_2EuysTTCIHE}Mi6i`_(oAtVv%Bt@Lt zL)FqeVP|NRSm)eX9GAARV_^ElKZnLhEzT#eEAiw-#Gz2B6cJzaUo9PSNXoU+JSRQP zJm*YBmzFp$#?M1bc!=|yS1E{H{9ft(QX9Kfyjg5xFOPT}^4-ca(jeQWB-oIHo>&l% zg*|Kt9ANZ!WP^?#ZT&LOCs@q*d&W@_PAuq1F zAMI^beJ&yI8&%s~$Jql_G{=wfb~jo<7^r;ACFhNa^t%M%-6}8h<+-A}UB0|f^rz@2 z9=#j#xaj?8DL7vqh2_hm;p_5l6<>h7H2MS)M0x%zI%ZPoXqonMVv$1s0$t;oBn z`k!dGS3BHe*)!E^Fa-yzJ?=rrYh3=Q+Slsd$RirdN@_}A6t8*7mEa80UZcSDV%}a^ zL!n$-lVB};rjMe0nxVb7FVZNCnOzqv5oK{|?2ua)m&J~_kD`lL9mmlon9QDz70Y|Y zS7POICstcTJ`KJ_?i9sZkE>J6uiXhb+GjKh@9Foj_2Of~S@}(zil58t#ep};EQ{1eMe^ztyFB|azyi-gcc-}2 zvmY(>+$qlXtQWhvwj0_(xm#SSL)~pD$SA>06WlGq`2=@Jz~OVbpY#2k@8^6!x9{iO z9pcO(u06#0L)_~S_d3nBr@8jD#e6R7>&4UDS$0r#vV-E49rOgUg94Hr6lopj>mV<5 z*Kx}_Zd1o?I=S4*`A%-xY4Q9iIp59sZf@DlwcY4Vn(Rq%D#6tWZkpig1RuDc^Zk6_ zey;83_Wh2}`#xwArU=Id@b}VAi^A=Fz6rux#n=* zk`-&$46I%#90?C!_v|mUzjpkxV`syuWr<(!nKIC}PPi+76#hv7uHm?i(6iyL=|tD;Hp+8|<_UyOOf{27jr>bWIuE3QLcc z411}CZO*Vg7IspGy~x5&%&^NctP$DefJ=^#;{3-smry&JlBwJDhCp*UoyE8SuZC@; zhnL5Lr92Pjpls5A5vVA;9mT7mk#B{jww&*6hf$Q<_1%F)V@9c@pc~|3Ce>wkkxrmD z>lJ0vB(w7+M(61#b}n?(hG?*Suc6g@%E|-%IKYM2iRm!eO22+@S?Ln0TW--|vK7jn zXJIkf278%>#bg`o6&4ng4cHv!}E%CGhB%7em#XthZXg~oUuGPG4pJ3mw|P#>H0o=|lq z&BuUYVoVQYsEi`M7mLWR==#&4SRk`Ra?r3f)>r=`R5SNsV3KOmPI~0+sBFAZ!0BgK zfJ;chTDX))pphfc6gmtU%FN{}^_JGUfzU6hn9kj<4^+eoGb1XG>Tgy=E2(S0Pw@L3 zexK9t6a7A%v^B|r@Z^$AH+eHUF7g&CTlD4OHPtjq?QvK2_uRmD57CKC?|9RS0_r_DEUmR^{PP?BA&eZdv z$poD;+)H$tIT3n`mH!4xc~XBnT33ek$yTVgmhkDBKB6aL5I_CyK+(Gk^^Nf$_dEUO zcof?0@e85#B_^2FDR0(KPn0KiK@Yc6`8|9Dl&7$}0R-h~3ZUAb(bp&9+_Uhn2nrea5`mk6?-3L+P#^;EFi?bG6a%FQMl&EG@KSKxw;E1Q`*Gh5_~9(J z$M^ zNXapSqV5pVq`B9_*mRs%u**JZpkS3(;gfg;(CtUbk^zYBH9aghaDUVn$n{09gBqr9 z99H@UISKp1puDj10PsbkdLEqE3Oy!7bvnxTqC3%rhsL+{SKt7B^qigK6!asq< z4R1iB9Mta|TRHws5NmDzaa?3^ST+P#Z1J^xaekyZ4tOTC9;E$#h2isMc3BvY(2#o1ImjJBO7JHZrB zF%3>-tOmw&sQg##S5L(cP@GG}4^eEO;@?ojQnjP1`0@#0{Kz zm^%0KLiXuzl=}-}?@SNsTwDT;(Ojl|`8YMcA=*1K& ze}~Rcpg2F}2*_E)KXM6XjVVYQVh)%rGc{I0K>674j6gXGa%ep~Lb_Nxq5Tt66H@+Z z0>9)=eF{+d%)+IHk@?(Y)UB`;DaUlJwp9B9bzhn~zBh@(ePuF!95)8WT*yCwtibyXt};yy2eMxc zxu6H1LkHA(`RFpWHy<5TwSjzmx%%gPbVw~I%rj<%+K`V9tIPAz5%pFJtz{-8iRv>J zg~_|rkMr_{YS5i08p*BBw(z+3s8=CjGg5^+kopV~b|4xdr<8dK8M;w3B3uMSfzbz_ zGk?0y=|d;zv+I^=4vX5KRrqM6UWYD@87qlI6mPOpFlDWIS@{Bk7eUBm2x4-irXaAooHKR5>i0&8?ksyQhgq+MwtYET!1Z3 zNR0+c@ftjC(h!MeB0=4kHxjhWiUbMuBTFPmoDd1M`q~l+5)cXOu$D+PSUfx=GD$%o zs5Vc&oS-f%5+qa!ZCOr`I3W^hbrM>!oFD;_zy>d9SxLb&Dv(|t1cEv(ZzQP8iUbMu zOiLt4NGIp44z*G&k<8Y>3_>|MD=Cl@JR;SfS^ObUkuE&8*m!sf>ejpwqAn{!B-H0E z9+8l=vvNYDW`DMXhy+A9JvYKrfDb6eM*ScV)MI%gL0wiPNT}gabk*R5huI<%{Tb}_ zIl)lNX=uq-4haYb&TdN$fdjlSWP(AUE;syB_ekXCZjRA|)juLZ?ZZANJc+2wiXRE} zL5qJRq{%t4Q>$H;*pYzP;R<4j9qZpb_I;2|zIQGdDkVl@b9MBf&(%rph~$Q2yA=8; z{+y0<$BMoI$5qy*g^uCehrKm@^YCYHe`uh-gz+EKpPQ6@%A+or-sDWfO{O#DA0R8n zd~g>`&xg*)@enLYsMnVGaD-gML>c~c`VV{nEjxMZQ zHL5bZGtH$D3tk-4AzEm>L^4|IweWbO%wvwX%RDsRH1p7S>&!#r4Kxp}!ETk0hn*uI z4UcO+8gH<9oa1da58Yy+HOutznw!TQFS~hYy!hs!+w#-x`RNYaD6L)s>9ZW;f(O8? z6etwr)E_K`!i><)S}8~ym9js#Qcx90mpFi0xIF}nM+;SIU^F}#tl+VF0!o>or9eO2 z7}TOw@X$p!W|c7nhX(36?0(FsVkDyLz)bRH6)WfiOW?Fg&mI-(Tb7}y zWi)3fqkDQN+UH}-Q21nLhC(2XlCI9GL?qR()5G8K_IV6;7?1J95PZvPQ6jGC>;dtL|=PYl_L>Q*gE4bm5B&J z6fU*7<07w~g!5pPt|22$$QhTC?)12{6MZ#f<06q67k9zTxCrPmkuzW9)n?1MNJ!%) zua;Fulr2n;OFPlmM>Z}JnQ?KO&5UaRwgLuVD}aC&TTVpC2ZKS4Z9ktIPav}D>6SQ= zkf!IPhmx*zn6wXl3ua*=kqHyGeW^&PFzNx3dOrGJ2+t$bp8lKZ?yNlkEg-J!uxPjA zmaveBcJr{lC0PkXUJ}!h;n|W&5dwG^mSoi-lIntzVzVHq*|eO80m+Eft6Gg+*nIJ< z$_zt+-ZLY;**==Pqo9F0!!jZg(uFxGMlzfpk#<>j!icQ!Tdczy01KfTvTGn#2?%H< zL{EqbRqAR>Oh`y8b7Dd=6BF%nAB{Sv9RajYOu9O6y@+`byC(EAg?}a z8Ju=2mjYQUi)1LB5ZdLSB_XZ2@R^!JHN*pHWATKI>ci`RS&N9|2xt^ZU)B=OszTJA zP=!dU-9EEckjPhs$d{*M#mh#fIuJk+PR&XHlB%Xz98TvX5#r^= z%rzn-*V$KS;S&ElAv zU7oWBNM^n|qQgw*_pm%y!X1T^;UWibNzsKixX%^y>351GWz_>IP)1C#QehKxfq#6L~7qet8;xq-w#Ze6lXL zCn}qPfS-8W&e}?%9)|qCUX=bNM1lK{E7huB-oApHr5|VyaBcdL_E6I-pdWY+7SlD3 z2-OP-uQrsD9@{UFQrd8UYT|>RWc&mO`a6p{3k;N5`t*(p@UgU`Jdckv|C5iD;p0*2 z1`HqJ*%-&v+2ui;%aySI8*`Zfb9n}RC~f*>vqLcJzS$KOIa8`OrgY43 z_55s1%c0r%(o*RE|Iz}54?jPt=hfGm_DY1rZy;o1l#su`+kbq~m1_6p7pBm{4d0H;f!xOzFCtyb2pJ7reD>l_ z*zm~8{>uW~Eb$ar7CXR826q9pX}5(5@sKCO>p2g3fwo6!TN+u<3FPWXA+$SaI|ywt z`BUUlyFk9643P>s7pagw_qs>|T7jG`E#PhZ{Scy!-v_OSd?TUfQBiCsLF*#(qiaNg zERAB{8#DkO@&Hx83T-bTG3-_oThB$vX|d**hb*V^Dk}dGWDog>w!TWVnN-;vyM~+# zdzXhi28@TiOxwd$>y9_a1Tr&T2>g=xdhT29hB#Wj0J4X?9oO)~pFl@l2^?%G$R2Vd zWuBnS>y-I|wpCR)gG;N{h%U08w)fEX3EJ+Z?K`yn7qkNWhKsYjJo%%fKz^3Q3_X!N zI@(3{Ceg#;#*;k^oeijtyv@+Xfa=L=cxOT{*8-YI zZeeI0pvh#j#^7dvjpQDN9t1R%e8JE&fKDc@@REaWUIR3PoXXHY0kx0~3^m&N$V_su z#jtdV4|6lg3^zGG+xShkaMXKIFWjQBX$PGl@;7-EvxM>;>0-hH_{y;8pc*v>bEQ;2UN5SVj5?q10b!FG{ zi0W66eks8PwJw8pp6B+Fh2&C(QtkktRTQluH@f@CBJxX$4Cjl;>r98vyU4o~Z6urB zWqcPIq3A|BR2Q+IhXd=*5qA=F^BF2CssVJN#$d3h9$*heo1N2(I{C%qCW_WMJBxf| zF?pDw#YF)?PcyW<$OZpi@Lh&3EAjyPf}!g`cLwpVr1N(6f$j`a!_Xa|`!P9fC0&Gd z&H+&Vn5<;VU7%b-)-f~$x+P=_Lx(`OlswDOQP3?V2O0VSbZ3&U7%K930J+aMh7Wms z&2A*sWe^fAHd#rf8jk6=q+0k+dx2NQBu9ZAp z-bZ#2^dQ>zgE!HBlnX$682o$fBjJ$((f%IiBZuIf&R|60kVYyaJ}_zkYS=a>;vwDq zl#*h>%a{0qLMz_|+CH*8@(K)jd1RukmDeH>A!gqgNeBzLEs+|2to@-yZB4{TgP)twEk!x@p4Z^Cpx^`ThXbGVKN-` zzzPLoEskCGc&x)QY?~aL=NN)+T_AVGmO2iAd@Vn0>y9l4=E_)r9AetFv5UaNEinc7 zyJKKOw!CvFD0F|h&Kjs%ng4D*#^dBG)#@1Wh7 zusJ7?ZHbFu2?i4`=df)zmH(RXwm8?&h$awsRT&snRK4WrqYR|IN&?eav|Uhzp)9NF zBTe+dH~?kU0NS4)hPzaUW=cK% z?P8mAhEsu=b~`(H^w!Bwb74En z^$ZL-*VX0hrhGTZ!(ul-O#^i|Rrdk)t=LC9^f3lq3{cYn$`4R}fVvo>_Cu5(qWlo$ zk5Kst<&V(5M<_4aFci^-1B*5cNVFXjwN?CB_`nvU8%vGGQgtV5=?rMMPHNdrZMuOG zT;0^BoAQ0E#R2-LO&`?`uonFfP=0_~5<6t8|B?o-f!jB@wSharbJz6uP3GPVHNzdy z_~YQ?7jVn{Y(IUWAP)~-H-+Pai3v@UIy$B_PN{8dXqZwvv2kKsZ4=K&4 z|KU3y@*(`&`wv%hWZ|N=Mf0C849&Zuzx~%2oFD(osQRYCpRD1WT#& ju4eGB^9P?=%Pr#c7Hz|z=cn8^3O~PY=LBscGB5laP1W_v diff --git a/Wox.Core/UI/ResourceMerger.cs b/Wox.Core/UI/ResourceMerger.cs index b2167a3cd3..6d7a892982 100644 --- a/Wox.Core/UI/ResourceMerger.cs +++ b/Wox.Core/UI/ResourceMerger.cs @@ -39,7 +39,7 @@ namespace Wox.Core.UI foreach (var pluginI18n in pluginI18ns) { - string languageFile = InternationalizationManager.Internationalization.GetLanguageFile( + string languageFile = InternationalizationManager.Instance.GetLanguageFile( ((IPluginI18n)Activator.CreateInstance(pluginI18n)).GetLanguagesFolder()); if (!string.IsNullOrEmpty(languageFile)) { diff --git a/Wox.Core/Updater/UpdaterManager.cs b/Wox.Core/Updater/UpdaterManager.cs index 7f07171606..c89d651db5 100644 --- a/Wox.Core/Updater/UpdaterManager.cs +++ b/Wox.Core/Updater/UpdaterManager.cs @@ -6,6 +6,8 @@ using System.Windows.Threading; using NAppUpdate.Framework; using NAppUpdate.Framework.Common; using NAppUpdate.Framework.Sources; +using Wox.Core.i18n; +using Wox.Core.UserSettings; using Wox.Infrastructure.Logger; namespace Wox.Core.Updater @@ -31,11 +33,14 @@ namespace Wox.Core.Updater UpdateManager.Instance.UpdateSource = GetUpdateSource(); } + public bool IsUpdateAvailable() + { + return UpdateManager.Instance.UpdatesAvailable > 0; + } + public void CheckUpdate() { - // Get a local pointer to the UpdateManager instance UpdateManager updManager = UpdateManager.Instance; - updManager.BeginCheckForUpdates(asyncResult => { if (asyncResult.IsCompleted) @@ -43,9 +48,9 @@ namespace Wox.Core.Updater // still need to check for caught exceptions if any and rethrow try { - ((UpdateProcessAsyncResult) asyncResult).EndInvoke(); + ((UpdateProcessAsyncResult)asyncResult).EndInvoke(); } - catch(System.Exception e) + catch (System.Exception e) { Log.Error(e); updManager.CleanUp(); @@ -55,7 +60,6 @@ namespace Wox.Core.Updater // No updates were found, or an error has occured. We might want to check that... if (updManager.UpdatesAvailable == 0) { - MessageBox.Show("All is up to date!"); return; } } @@ -63,53 +67,44 @@ namespace Wox.Core.Updater updManager.BeginPrepareUpdates(result => { ((UpdateProcessAsyncResult)result).EndInvoke(); + string updateReady = InternationalizationManager.Instance.GetTranslation("update_wox_update_ready"); + string updateInstall = InternationalizationManager.Instance.GetTranslation("update_wox_update_install"); + updateInstall = string.Format(updateInstall, updManager.UpdatesAvailable); + DialogResult dr = MessageBox.Show(updateInstall, updateReady, MessageBoxButtons.YesNo); - // ApplyUpdates is a synchronous method by design. Make sure to save all user work before calling - // it as it might restart your application - // get out of the way so the console window isn't obstructed - try + if (dr == DialogResult.Yes) { - updManager.ApplyUpdates(true,false,true); - } - catch - { - // this.WindowState = WindowState.Normal; - MessageBox.Show( - "An error occurred while trying to install software updates"); - } - updManager.CleanUp(); + // ApplyUpdates is a synchronous method by design. Make sure to save all user work before calling + // it as it might restart your application + // get out of the way so the console window isn't obstructed + try + { + updManager.ApplyUpdates(true, UserSettingStorage.Instance.EnableUpdateLog, false); + } + catch (System.Exception e) + { + string updateError = + InternationalizationManager.Instance.GetTranslation("update_wox_update_error"); + Log.Error(e); + MessageBox.Show(updateError); + } + + updManager.CleanUp(); + } + else + { + updManager.CleanUp(); + } }, null); }, null); } - public void Reinstall() - { - UpdateManager.Instance.ReinstateIfRestarted(); - } - - private void OnPrepareUpdatesCompleted(bool obj) - { - UpdateManager updManager = UpdateManager.Instance; - - DialogResult dr = MessageBox.Show( - "Updates are ready to install. Do you wish to install them now?", - "Software updates ready", - MessageBoxButtons.YesNo); - - if (dr == DialogResult.Yes) - { - // This is a synchronous method by design, make sure to save all user work before calling - // it as it might restart your application - updManager.ApplyUpdates(true,true,true); - } - } - private IUpdateSource GetUpdateSource() { // Normally this would be a web based source. // But for the demo app, we prepare an in-memory source. - var source = new NAppUpdate.Framework.Sources.SimpleWebSource("http://127.0.0.1:8888/Update.xml"); + var source = new SimpleWebSource("http://127.0.0.1:8888/Update.xml"); return source; } } diff --git a/Wox.Core/UserSettings/UserSettingStorage.cs b/Wox.Core/UserSettings/UserSettingStorage.cs index 9b1af13a61..5f7c243c74 100644 --- a/Wox.Core/UserSettings/UserSettingStorage.cs +++ b/Wox.Core/UserSettings/UserSettingStorage.cs @@ -14,6 +14,9 @@ namespace Wox.Core.UserSettings [JsonProperty] public bool DontPromptUpdateMsg { get; set; } + [JsonProperty] + public bool EnableUpdateLog { get; set; } + [JsonProperty] public string Hotkey { get; set; } diff --git a/Wox.Core/i18n/InternationalizationManager.cs b/Wox.Core/i18n/InternationalizationManager.cs index a1f0a9049c..cfe1ca7fc7 100644 --- a/Wox.Core/i18n/InternationalizationManager.cs +++ b/Wox.Core/i18n/InternationalizationManager.cs @@ -14,7 +14,7 @@ namespace Wox.Core.i18n private static Internationalization instance; private static object syncObject = new object(); - public static Internationalization Internationalization + public static Internationalization Instance { get { diff --git a/Wox.CrashReporter/ReportWindow.xaml.cs b/Wox.CrashReporter/ReportWindow.xaml.cs index 55ec0555b7..ec041fb7cd 100644 --- a/Wox.CrashReporter/ReportWindow.xaml.cs +++ b/Wox.CrashReporter/ReportWindow.xaml.cs @@ -45,7 +45,7 @@ namespace Wox.CrashReporter private void btnSend_Click(object sender, RoutedEventArgs e) { - string sendingMsg = InternationalizationManager.Internationalization.GetTranslation("reportWindow_sending"); + string sendingMsg = InternationalizationManager.Instance.GetTranslation("reportWindow_sending"); tbSendReport.Content = sendingMsg; btnSend.IsEnabled = false; ThreadPool.QueueUserWorkItem(o => SendReport()); @@ -57,11 +57,11 @@ namespace Wox.CrashReporter string response = HttpRequest.Post(APIServer.ErrorReportURL, error, HttpProxy.Instance); if (response.ToLower() == "ok") { - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("reportWindow_report_succeed")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("reportWindow_report_succeed")); } else { - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("reportWindow_report_failed")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("reportWindow_report_failed")); } Dispatcher.Invoke(new Action(Close)); } diff --git a/Wox/ActionKeyword.xaml.cs b/Wox/ActionKeyword.xaml.cs index e6832be527..96f5e9dcc3 100644 --- a/Wox/ActionKeyword.xaml.cs +++ b/Wox/ActionKeyword.xaml.cs @@ -29,7 +29,7 @@ namespace Wox PluginPair plugin = PluginManager.GetPlugin(pluginId); if (plugin == null) { - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("cannotFindSpecifiedPlugin")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("cannotFindSpecifiedPlugin")); Close(); return; } @@ -52,14 +52,14 @@ namespace Wox { if (string.IsNullOrEmpty(tbAction.Text)) { - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("newActionKeywordCannotBeEmpty")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("newActionKeywordCannotBeEmpty")); return; } //check new action keyword didn't used by other plugin if (PluginManager.AllPlugins.Exists(o => o.Metadata.ActionKeyword == tbAction.Text.Trim())) { - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("newActionKeywordHasBeenAssigned")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("newActionKeywordHasBeenAssigned")); return; } @@ -81,7 +81,7 @@ namespace Wox customizedPluginConfig.Actionword = tbAction.Text.Trim(); } UserSettingStorage.Instance.Save(); - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("succeed")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("succeed")); Close(); } } diff --git a/Wox/CustomQueryHotkeySetting.xaml.cs b/Wox/CustomQueryHotkeySetting.xaml.cs index 2c9bba0c1d..759defa29a 100644 --- a/Wox/CustomQueryHotkeySetting.xaml.cs +++ b/Wox/CustomQueryHotkeySetting.xaml.cs @@ -29,7 +29,7 @@ namespace Wox { if (!ctlHotkey.CurrentHotkeyAvailable) { - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("hotkeyIsNotUnavailable")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("hotkeyIsNotUnavailable")); return; } @@ -49,13 +49,13 @@ namespace Wox settingWidow.MainWindow.ChangeQuery(pluginHotkey.ActionKeyword); settingWidow.MainWindow.ShowApp(); }); - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("succeed")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("succeed")); } else { if (updateCustomHotkey.Hotkey != ctlHotkey.CurrentHotkey.ToString() && !ctlHotkey.CurrentHotkeyAvailable) { - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("hotkeyIsNotUnavailable")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("hotkeyIsNotUnavailable")); return; } var oldHotkey = updateCustomHotkey.Hotkey; @@ -68,7 +68,7 @@ namespace Wox settingWidow.MainWindow.ShowApp(); settingWidow.MainWindow.ChangeQuery(updateCustomHotkey.ActionKeyword); }); - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("succeed")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("succeed")); } UserSettingStorage.Instance.Save(); @@ -81,7 +81,7 @@ namespace Wox updateCustomHotkey = UserSettingStorage.Instance.CustomPluginHotkeys.FirstOrDefault(o => o.ActionKeyword == item.ActionKeyword && o.Hotkey == item.Hotkey); if (updateCustomHotkey == null) { - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("invalidPluginHotkey")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("invalidPluginHotkey")); Close(); return; } @@ -89,7 +89,7 @@ namespace Wox tbAction.Text = updateCustomHotkey.ActionKeyword; ctlHotkey.SetHotkey(updateCustomHotkey.Hotkey, false); update = true; - lblAdd.Text = InternationalizationManager.Internationalization.GetTranslation("update"); + lblAdd.Text = InternationalizationManager.Instance.GetTranslation("update"); } private void BtnTestActionKeyword_OnClick(object sender, RoutedEventArgs e) diff --git a/Wox/HotkeyControl.xaml.cs b/Wox/HotkeyControl.xaml.cs index 1725f64019..bc89336ac2 100644 --- a/Wox/HotkeyControl.xaml.cs +++ b/Wox/HotkeyControl.xaml.cs @@ -99,12 +99,12 @@ namespace Wox if (!CurrentHotkeyAvailable) { tbMsg.Foreground = new SolidColorBrush(Colors.Red); - tbMsg.Text = InternationalizationManager.Internationalization.GetTranslation("hotkeyUnavailable"); + tbMsg.Text = InternationalizationManager.Instance.GetTranslation("hotkeyUnavailable"); } else { tbMsg.Foreground = new SolidColorBrush(Colors.Green); - tbMsg.Text = InternationalizationManager.Internationalization.GetTranslation("succeed"); + tbMsg.Text = InternationalizationManager.Instance.GetTranslation("succeed"); } OnOnHotkeyChanged(); } diff --git a/Wox/Languages/en.xaml b/Wox/Languages/en.xaml index 4f1561034b..54d55f7490 100644 --- a/Wox/Languages/en.xaml +++ b/Wox/Languages/en.xaml @@ -98,4 +98,9 @@ Report failed Wox got an error + + Wox updates available + Wox updates are ready to install. {0} files will be added and replaced, this operation may restart Wox. Do you wish to install them now? + An error occurred while trying to install software updates + \ No newline at end of file diff --git a/Wox/Languages/zh-cn.xaml b/Wox/Languages/zh-cn.xaml index 5e06761f1c..1c341d32eb 100644 --- a/Wox/Languages/zh-cn.xaml +++ b/Wox/Languages/zh-cn.xaml @@ -97,4 +97,10 @@ 发送成功 发送失败 Wox出错啦 + + + Wox更新 + Wox更新啦！{0}个文件会被添加和替换，并且在此过程中可能会重启Wox。你确定需要更新吗？ + 更新Wox出错 + \ No newline at end of file diff --git a/Wox/Languages/zh-tw.xaml b/Wox/Languages/zh-tw.xaml index d3c8812995..825679f6e1 100644 --- a/Wox/Languages/zh-tw.xaml +++ b/Wox/Languages/zh-tw.xaml @@ -98,4 +98,9 @@ 發送失敗 Wox出錯啦 + + Wox更新 + Wox更新啦！{0}個文件會被添加和替換，並且在此過程中可能會重啟Wox。你確定需要更新嗎？ + 更新Wox出錯 + \ No newline at end of file diff --git a/Wox/MainWindow.xaml.cs b/Wox/MainWindow.xaml.cs index 7a4cd03db1..110faad2bc 100644 --- a/Wox/MainWindow.xaml.cs +++ b/Wox/MainWindow.xaml.cs @@ -24,7 +24,6 @@ using Wox.Infrastructure; using Wox.Infrastructure.Hotkey; using Wox.Plugin; using Wox.Storage; -using Wox.Update; using Brushes = System.Windows.Media.Brushes; using Color = System.Windows.Media.Color; using ContextMenu = System.Windows.Forms.ContextMenu; @@ -124,7 +123,7 @@ namespace Wox public string GetTranslation(string key) { - return InternationalizationManager.Internationalization.GetTranslation(key); + return InternationalizationManager.Instance.GetTranslation(key); } public List GetAllPlugins() @@ -175,7 +174,7 @@ namespace Wox pnlResult.RightMouseClickEvent += pnlResult_RightMouseClickEvent; ThemeManager.Theme.ChangeTheme(UserSettingStorage.Instance.Theme); - InternationalizationManager.Internationalization.ChangeLanguage(UserSettingStorage.Instance.Language); + InternationalizationManager.Instance.ChangeLanguage(UserSettingStorage.Instance.Language); SetHotkey(UserSettingStorage.Instance.Hotkey, OnHotkey); SetCustomPluginHotkey(); @@ -193,7 +192,6 @@ namespace Wox Thread.Sleep(50); PreLoadImages(); }); - CheckUpdate(); } private bool KListener_hookedKeyboardCallback(KeyEvent keyevent, int vkcode, SpecialKeyState state) @@ -215,22 +213,6 @@ namespace Wox ShowContextMenu(result); } - void CheckUpdate() - { - ThreadPool.QueueUserWorkItem(o => - { - Release release = new UpdateChecker().CheckUpgrade(); - if (release != null && !UserSettingStorage.Instance.DontPromptUpdateMsg) - { - Dispatcher.Invoke(new Action(() => - { - NewVersionWindow newVersinoWindow = new NewVersionWindow(); - newVersinoWindow.Show(); - })); - } - }); - } - void MainWindow_Closing(object sender, CancelEventArgs e) { UserSettingStorage.Instance.WindowLeft = Left; @@ -278,7 +260,7 @@ namespace Wox } catch (Exception) { - string errorMsg = string.Format(InternationalizationManager.Internationalization.GetTranslation("registerHotkeyFailed"), hotkeyStr); + string errorMsg = string.Format(InternationalizationManager.Instance.GetTranslation("registerHotkeyFailed"), hotkeyStr); MessageBox.Show(errorMsg); } } @@ -673,7 +655,7 @@ namespace Wox } catch (Exception ex) { - string errorMsg = string.Format(InternationalizationManager.Internationalization.GetTranslation("couldnotStartCmd"), cmd); + string errorMsg = string.Format(InternationalizationManager.Instance.GetTranslation("couldnotStartCmd"), cmd); ShowMsg(errorMsg, ex.Message, null); } return false; @@ -691,7 +673,7 @@ namespace Wox } else { - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("invalidWoxPluginFileFormat")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("invalidWoxPluginFileFormat")); } } } diff --git a/Wox/SettingWindow.xaml b/Wox/SettingWindow.xaml index 50e5341b9d..704f39936f 100644 --- a/Wox/SettingWindow.xaml +++ b/Wox/SettingWindow.xaml @@ -318,7 +318,6 @@ - diff --git a/Wox/SettingWindow.xaml.cs b/Wox/SettingWindow.xaml.cs index 56152f8c18..e4c43d99d7 100644 --- a/Wox/SettingWindow.xaml.cs +++ b/Wox/SettingWindow.xaml.cs @@ -13,7 +13,6 @@ using System.Windows.Media.Imaging; using Wox.Core.Plugin; using Wox.Plugin; using Wox.Helper; -using Wox.Update; using Application = System.Windows.Forms.Application; using File = System.IO.File; using MessageBox = System.Windows.MessageBox; @@ -218,15 +217,6 @@ namespace Wox #region About tbVersion.Text = ConfigurationManager.AppSettings["version"]; - Release newRelease = new UpdateChecker().CheckUpgrade(); - if (newRelease == null) - { - tbNewVersionAvailable.Visibility = Visibility.Collapsed; - } - else - { - tbNewVersionAvailable.Text = newRelease.version + " available"; - } #endregion @@ -235,7 +225,7 @@ namespace Wox private void LoadLanguages() { - cbLanguages.ItemsSource = InternationalizationManager.Internationalization.LoadAvailableLanguages(); + cbLanguages.ItemsSource = InternationalizationManager.Instance.LoadAvailableLanguages(); cbLanguages.DisplayMemberPath = "Display"; cbLanguages.SelectedValuePath = "LanguageCode"; cbLanguages.SelectedValue = UserSettingStorage.Instance.Language; @@ -244,7 +234,7 @@ namespace Wox void cbLanguages_SelectionChanged(object sender, SelectionChangedEventArgs e) { - InternationalizationManager.Internationalization.ChangeLanguage(cbLanguages.SelectedItem as Language); + InternationalizationManager.Instance.ChangeLanguage(cbLanguages.SelectedItem as Language); } private void EnableProxy() @@ -329,12 +319,12 @@ namespace Wox CustomPluginHotkey item = lvCustomHotkey.SelectedItem as CustomPluginHotkey; if (item == null) { - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("pleaseSelectAnItem")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("pleaseSelectAnItem")); return; } - string deleteWarning = string.Format(InternationalizationManager.Internationalization.GetTranslation("deleteCustomHotkeyWarning"), item.Hotkey); - if (MessageBox.Show(deleteWarning, InternationalizationManager.Internationalization.GetTranslation("delete"), MessageBoxButton.YesNo) == MessageBoxResult.Yes) + string deleteWarning = string.Format(InternationalizationManager.Instance.GetTranslation("deleteCustomHotkeyWarning"), item.Hotkey); + if (MessageBox.Show(deleteWarning, InternationalizationManager.Instance.GetTranslation("delete"), MessageBoxButton.YesNo) == MessageBoxResult.Yes) { UserSettingStorage.Instance.CustomPluginHotkeys.Remove(item); lvCustomHotkey.Items.Refresh(); @@ -354,7 +344,7 @@ namespace Wox } else { - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("pleaseSelectAnItem")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("pleaseSelectAnItem")); } } @@ -488,7 +478,7 @@ namespace Wox pluginTitle.Text = pair.Metadata.Name; pluginTitle.Cursor = Cursors.Hand; pluginActionKeyword.Text = pair.Metadata.ActionKeyword; - pluginAuthor.Text = InternationalizationManager.Internationalization.GetTranslation("author") + ": " + pair.Metadata.Author; + pluginAuthor.Text = InternationalizationManager.Instance.GetTranslation("author") + ": " + pair.Metadata.Author; pluginSubTitle.Text = pair.Metadata.Description; pluginId = pair.Metadata.ID; pluginIcon.Source = ImageLoader.ImageLoader.Load(pair.Metadata.FullIcoPath); @@ -627,17 +617,17 @@ namespace Wox { if (string.IsNullOrEmpty(tbProxyServer.Text)) { - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("serverCantBeEmpty")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("serverCantBeEmpty")); return; } if (string.IsNullOrEmpty(tbProxyPort.Text)) { - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("portCantBeEmpty")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("portCantBeEmpty")); return; } if (!int.TryParse(tbProxyPort.Text, out port)) { - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("invalidPortFormat")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("invalidPortFormat")); return; } } @@ -648,25 +638,25 @@ namespace Wox UserSettingStorage.Instance.ProxyPassword = tbProxyPassword.Password; UserSettingStorage.Instance.Save(); - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("saveProxySuccessfully")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("saveProxySuccessfully")); } private void btnTestProxy_Click(object sender, RoutedEventArgs e) { if (string.IsNullOrEmpty(tbProxyServer.Text)) { - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("serverCantBeEmpty")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("serverCantBeEmpty")); return; } if (string.IsNullOrEmpty(tbProxyPort.Text)) { - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("portCantBeEmpty")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("portCantBeEmpty")); return; } int port; if (!int.TryParse(tbProxyPort.Text, out port)) { - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("invalidPortFormat")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("invalidPortFormat")); return; } @@ -687,16 +677,16 @@ namespace Wox HttpWebResponse response = (HttpWebResponse)request.GetResponse(); if (response.StatusCode == HttpStatusCode.OK) { - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("proxyIsCorrect")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("proxyIsCorrect")); } else { - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("proxyConnectFailed")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("proxyConnectFailed")); } } catch { - MessageBox.Show(InternationalizationManager.Internationalization.GetTranslation("proxyConnectFailed")); + MessageBox.Show(InternationalizationManager.Instance.GetTranslation("proxyConnectFailed")); } } @@ -704,14 +694,5 @@ namespace Wox { Process.Start("http://www.getwox.com"); } - - private void tbNewVersionAvailable_MouseUp(object sender, MouseButtonEventArgs e) - { - Release newRelease = new UpdateChecker().CheckUpgrade(); - if (newRelease != null) - { - Process.Start("http://www.getwox.com/release/version/" + newRelease.version); - } - } } } diff --git a/Wox/Update/NewVersionWindow.xaml b/Wox/Update/NewVersionWindow.xaml deleted file mode 100644 index 924e61a202..0000000000 --- a/Wox/Update/NewVersionWindow.xaml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Wox/Update/NewVersionWindow.xaml.cs b/Wox/Update/NewVersionWindow.xaml.cs deleted file mode 100644 index 8ef0447828..0000000000 --- a/Wox/Update/NewVersionWindow.xaml.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; -using Wox.Core.Version; - -namespace Wox.Update -{ - public partial class NewVersionWindow : Window - { - public NewVersionWindow() - { - InitializeComponent(); - - tbCurrentVersion.Text = VersionManager.Instance.CurrentVersion.ToString(); - Release newRelease = new UpdateChecker().CheckUpgrade(); - if (newRelease == null) - { - tbNewVersion.Visibility = Visibility.Collapsed; - } - else - { - tbNewVersion.Text = newRelease.version; - } - } - - private void tbNewVersion_MouseUp(object sender, MouseButtonEventArgs e) - { - Release newRelease = new UpdateChecker().CheckUpgrade(); - if (newRelease != null) - { - Process.Start("http://www.getwox.com/release/version/" + newRelease.version); - } - } - } -} diff --git a/Wox/Update/Release.cs b/Wox/Update/Release.cs deleted file mode 100644 index 3664f5f2fa..0000000000 --- a/Wox/Update/Release.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Wox.Update -{ - public class Release - { - public string version { get; set; } - public string download_link { get; set; } - public string download_link1 { get; set; } - public string download_link2 { get; set; } - public string description { get; set; } - } -} diff --git a/Wox/Update/UpdateChecker.cs b/Wox/Update/UpdateChecker.cs deleted file mode 100644 index 65fb0c4d3f..0000000000 --- a/Wox/Update/UpdateChecker.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Configuration; -using System.IO; -using System.Linq; -using System.Net; -using System.Text; -using Newtonsoft.Json; -using Wox.Core; -using Wox.Core.UserSettings; -using Wox.Core.Version; -using Wox.Helper; -using Wox.Infrastructure; -using Wox.Infrastructure.Http; - -namespace Wox.Update -{ - public class UpdateChecker - { - private static Release newRelease; - private static bool checkedUpdate = false; - - /// - /// If new release is available, then return the new release - /// otherwise, return null - /// - /// - public Release CheckUpgrade(bool forceCheck = false) - { - if (checkedUpdate && !forceCheck) return newRelease; - string json = HttpRequest.Get(APIServer.LastestReleaseURL,HttpProxy.Instance); - if (string.IsNullOrEmpty(json)) return null; - - try - { - newRelease = JsonConvert.DeserializeObject(json); - if (!IsNewerThanCurrent(newRelease)) - { - newRelease = null; - } - checkedUpdate = true; - } - catch{} - - return newRelease; - } - - private bool IsNewerThanCurrent(Release release) - { - if (release == null) return false; - - return new SemanticVersion(release.version) > VersionManager.Instance.CurrentVersion; - } - } -} diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj index 7339787130..a71e300ffc 100644 --- a/Wox/Wox.csproj +++ b/Wox/Wox.csproj @@ -113,11 +113,6 @@ - - NewVersionWindow.xaml - - - MSBuild:Compile Designer @@ -235,10 +230,6 @@ Designer PreserveNewest - - Designer - MSBuild:Compile - diff --git a/appveyor.yml b/appveyor.yml index 67d04c4cd9..56829a53ff 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,7 +15,7 @@ build: after_test: - ps: .\deploy\nuget\pack.ps1 - - ps: .\deploy\Installer\pack.ps1 + - cmd: .\deploy\NAppUpdate\build.bat deploy: provider: NuGet @@ -32,5 +32,5 @@ artifacts: - path: '*.nupkg' name: nugetpackage - - path: Output\Wox-setup.exe - name: setup + - path: Output\Update + name: update-binary