From 4a15460c7540c3ddad14b20f13dd6d531a675cc7 Mon Sep 17 00:00:00 2001 From: "DESKTOP-3BO4HSG\\ksat" Date: Mon, 19 Dec 2022 16:59:18 +0800 Subject: [PATCH] tmp update struct --- README.md | 7 ++- STranslate/Images/crossword.ico | Bin 0 -> 2837 bytes STranslate/Images/input.ico | Bin 0 -> 3053 bytes STranslate/Images/screenshot.ico | Bin 0 -> 5210 bytes STranslate/Images/window.ico | Bin 0 -> 2369 bytes STranslate/MainWindow.xaml | 10 ++-- STranslate/MainWindow.xaml.cs | 2 +- STranslate/Model/HotKeys.cs | 34 ------------ STranslate/Properties/Resources.Designer.cs | 40 ++++++++++++++ STranslate/Properties/Resources.resx | 12 +++++ STranslate/STranslate.csproj | 13 ++++- STranslate/Utils/HotKeysUtil.cs | 56 ++++++++++++++++---- STranslate/Utils/NativeMethod.cs | 16 +++--- 13 files changed, 126 insertions(+), 64 deletions(-) create mode 100644 STranslate/Images/crossword.ico create mode 100644 STranslate/Images/input.ico create mode 100644 STranslate/Images/screenshot.ico create mode 100644 STranslate/Images/window.ico delete mode 100644 STranslate/Model/HotKeys.cs diff --git a/README.md b/README.md index 9644224..f0f45d3 100644 --- a/README.md +++ b/README.md @@ -7,12 +7,13 @@ WPF 开发的一款即用即走的翻译工具 - [x] 添加百度翻译 API - [x] 实现基本翻译功能 - [x] 优化防止多开 +- [x] 添加划词翻译 - [ ] 优化 DeepL 服务并打包成库引入进项目 - [ ] 添加缓存功能 -- [ ] 添加划词翻译 - [ ] 添加 OCR 翻译 - [ ] 设置 UI 化 - [ ] 使用说明 UI 化 +- [ ] 优化划词翻译（未选中则取消翻译） - [ ] 软件层面识别语种（UI 提示识别语种） - [ ] 翻译制作成插件方式 - [ ] 优化软件发布方式(自动升级) @@ -21,6 +22,8 @@ WPF 开发的一款即用即走的翻译工具 首先在软件运行目录的 `STranslate.yml` 中添加自己的配置，这里推荐百度通用翻译 API 免费版 [申请教程（参照Bob WIKI）](https://bobtranslate.com/service/translate/baidu.html) -打开软件后会静默在后台，等待调用，全局监听快捷键（日后升级成自定义）`Alt` + `A` 即可打开软件主界面，输入需要翻译的内容，选择目标语言，如果识别语种不正确则手动指定即可，翻译结束后选择复制或点击一键复制即可 +打开软件后会静默在后台，等待调用，全局监听快捷键（日后升级成自定义） +- `Ctrl` + `A` 即可打开软件主界面，输入需要翻译的内容，选择目标语言，如果识别语种不正确则手动指定即可，翻译结束后选择复制或点击一键复制即可 +- `Ctrl` + `D` 即可复制当前鼠标选中内容并翻译 点击软件外部界面任意处或点击 ESC，Ctrl+Shift+Q 软件则会自动隐藏到后台，即用即走。 diff --git a/STranslate/Images/crossword.ico b/STranslate/Images/crossword.ico new file mode 100644 index 0000000000000000000000000000000000000000..e9111626eb50b1f4b829ccdefb7e6f4edbb09ce8 GIT binary patch literal 2837 zcmdT``8(A67yryyFUcB0jBJTW%90TwOc=6^kS(quOEb2SrJ2gjB?fn_*I2Tr8;WQs zTQVZ)S~7Ps*=NWyV;jc$)nD*^p6_#i`JVH;ShC5|BBv03n#Qh2u}}&%@7sB-n92%K#wI1GBj597A2E*@eg?s+Tpw6Y`^|o2mPU30l#_`~}@Y=I3u=J&;P$ zhtDi%5zcmKCWq&OKkMzwUQ!Lek2WBWiYdvQdVH(QBl5DN(-nR6D*aK+!@edkMaszI zQ@~Pf`~Y_a@0dkHof@;it>0Zr`CZQi`}r``D0Uk85N5f5GoVx==kPXmHe~CV4?9XB zLy7s76Wz8{#45OHFP{HF;c_`0iWx+!6yBvnLy^m-d&e&+_O$hYi@}O8eDTp?2qg*}oRCTZCJ5$W&xO9$f zzr^C{%P=3ZuW9E5sI& zIffolFPp)m4Mn=QDn?*@RT?Hlp%Sh$Vv(y#kw2O*jIKg9Z=Lb#>j(kX!?@?Ep=l{ljdTsk=0}Ah?lqwk#zf5V}DSR667Fs z$LikW_Vb&6htEF}g!(PP=1{h4B9@FJ1}ho9$(h{FXG z`Fnm!Rk2xKa2*cc3e@K$h%FJ^vi zYv&Ymb?-;b-ca(-Xtq%>n9T4xd=`~qjw{;$-PM)8my@&lTpMWy!5tfjx@b`}9QXOW z^gN~AmRs==G5M`C=HkV%UvZk;-1iVxS~?q2(vP{0Dy^F;y!60V>&^K)bt?$ux~(Z7 zU!4Ap>kUXt?cJSM{JAvKarq90ar1XUl#YHB^xAb;9YND9`SvFowNI~ZWn!zF=k$Wp zoZher>jE4kT?M2%0X^!#j06rX&|$#iLj<4yU#@LNl}y;m#yFL5$O33w)dd7>LNhi* z?ktI`66Cv;gW`hXh(oUkshm&8n_3G-upd>YWDT*i<{Eh*Hn#ue0~P0RjcJUA zY!yNiqqb^!d9r|5_xE9G1~0Y7y@??s&ON?U&A;BZdr{z+Q}stGt=XAp(ib-|8aTz% z)WZC5fUv`TQJ{NK&rCw zNQIv|Zg}snn!;9wg&l%@=e`6i36_N+U?E*;O1=hN63M-B5XZIm5WOII{yf#Q2eJB z2qZyq@Q1E-T7wE#7F-Gn`&p;s2wqmCq<3$vc^Qb%X#3%lCrvX~g+73@2_2&2XUr2t zb^T-XVhjmbgN3LpX<@=gKJ9hQ{NIz!9*+ldU^m?WVWo{BGn;N(+5NEE`)}K0bZqoX zl4{Fgn7QBw=?ZJKr2xO#+2Sw#)*MvPZ||2L$ZoWFW`ejwruYsrm$2J7VUod?LUvZ5 zpI>wXmWZT?MTi>E<4B;Sd>YsG%aU{r9ok>F`8@XHh_mg)5}$>8fA*W^koThHks2II zP~8_PJgF}Pm<`winA=u2Wp#t`%kjw>4pQ9eGbnEVni#j^B+R&JKxO<_?_VH^LHK%O zJ-~HS9Ha8$^Ny13MC?AV1Bv7`$xqfaRvxVu#iJ9uUU)_1soqE z2XE*SHmoan1Lhf*#`F&___7~Q1;K|OXzysO@EQf$#Wt?x8}(}(DA*dZ(Xs5L^%d#j zN-oz~iE~g}r&*f6n^%BA|Ki&pDVXnF?S4vI!yr_aFV)Q)f!Rd>gUZZRfx50P3`+8C zpHZLp0r{jJ%i%=x36*8l`8n5(tO*vgeMVb~`-}H?K?zd#y;t*PKK(SSz5IzaRi}Dv zC!MiE=7fV^Fe+=&g|P6Wq3qt9U`R$EZ!vkzhD$Ox+55)nt8pOvr-se6g!d*^8bW_n zUS)9i8(*Kd?Zh2&T3=@{3AEipqxTPksbzN$Ity$^_9P8cBMGCEhkA9zE*Q{4}9j^asyP z^VIO+bRPW#P>R8%LwBl9p8`loL!AE5vFvWCdWbXdY?{@XsNfelKuP<9D}GLu*+x0} vTyHDLCjkmg>#OTs)7eie=Tqwca0r6%NB+8AGe$jHYysFcxJ9j*&%^%!gsU1K literal 0 HcmV?d00001 diff --git a/STranslate/Images/input.ico b/STranslate/Images/input.ico new file mode 100644 index 0000000000000000000000000000000000000000..1b738427e101fe224fbab5ba5e6f2851005d8080 GIT binary patch literal 3053 zcmbVO2T+q+7XAZDq=~>2q=OVekSaxxAP6YJlM*Qbq(6F82rUvIN>h4~UV;>Z(u5!- z0f~r6lOj?AgeslH&=;gE?#}GIoj1EPyWgEN=ggd$@0_`J?spCVfKJXYfB<1&gc$(1 zPU7b#cW<#W@iLu+tOmDr&3PZS<*X2; zC*nCWFpd)l+i*R!10p%3pIQ|}h>M#$h^$1WXB;u^vjsULv0R08+$rTBE;^k1gf1zx z2>P9l5m_ddvt~G{LL!s$j*!)SVkGJ^b?fdcx4z9r(i;lI%{WkNP${@~SxNZf{{jES z!mws`QDGu48PfTMonv;C7q@*e$2F8!AP#Tlplz#LY>>%ZHe()eG|1ezSNLUq$qX8o zKC##kC9Ceo=kAoCpg-{%w^%X8f%_P@Jn~*aJD9CGfKS!uia_lrJ>BfK-#FuZUfieB z?@-_t~1?;&arB(C|^{04AToP8ka@5z6e=!<<)(K~%Rct-}vd!3Rki9wXouotoznzbC|2;Lq_zb)K#QlIgCm}b+ z?J%8Gg*$$@nuWvWv`XLB4*RsQaXGb~7j*qDal_LA!A}Vu&&gP$YaaN|vUN3So<)iJ zvf<8Hb6e@ap)n~bfIc9zT3_h7tzgddg-c#PQh!4;UVh}b^XzIWgr&8Z5cu^BdU9{^ z8Y>8S7evdYo4$6Mh+sl5{s#0(0r^niIu;1}w}fxSv5%v9^46iN)SAzX202_Tdx({#7tDPmcl~rIHz=Wi2ByL1j&a`SF#E@pvGCl zMwHiWxtMeoHnRRZtdWhk#%$kBPbB>#W#e`8$7a9tO8aEHk$Rs$gU1FXU1~^peGd+4 z-}H79bFxvjpZ8FQ*14f62kC?ChH?vl|vGdrTG-8|3b5F8aA5dV{5%AoOklygJ| zGOBvHWf^_?!yYRNBiO}Gk@R_CiOg4$TB-C=M95opsKPM&sk%dXE+cEe1({i|>q(D2 zvKh;25CH(cZJ+3bRx{Or>81ZyEe+soA_pi-nTcPrmALO958S_A^H;Sid;R z8YYy-i0*SRc?2mIFdI5lxln=vb^H{08>!5*Qd*O)muxcz%bKCoq!Aj_eY-CXyJoiX zzLoIoE&u3`FX8FcA$r8HwvhWQ_7q>@*JLHT8i;D&8!wA6l)Ge%ys$>JMm8D#;90UyHgA*VD!QW z-M>Dsv>8xyAeTp=cS(R5#WGE4C20X9*@#cnhdiE&`p%C#YQCA3ZNpZxVmwTDc5G)H z7Flnk&GBUO%M%+ruB7Jn(mY?&WQ&q*dKHppGUMhCR44Tf!%lXLrt_sUNicyw&|FT1&9a85bv}jViK#dlDmkgJp^N1VIr*Q^C$c-53M!IQY zDNRtQSmqr5TwTxpHrKuy17S3^F5g+V!n!6BG9jjcRP_(OIEDC$UA;zpDf3yGz_s)- z9v7XcR2wZ#5HvjcaSGRS6I&gvCAXSI*o1O7()DY(eaS4#UhvY~h8Bkc9>AYIp`PVp zf#tQ;#!P}hl4(>5DIf+De& z9mrICfbIa@o(#g%mxqf(dnk(YtVHwcoz2R1Y^Q}3%QtYfG)X=wbQ4JO5^B+*e${l( zkVg$K6>-qVAOTlRYbj5$e6|nzmumD+`1T3i1F~UhGfnI!KsJeIM=`64>2yI>-kif5 z{~^x~EiU1BMC+vEMf>x3`m0r@M+V1Xw>HgFQ~`rTL}P^J!4=GL^*{y%*4~nYOKAdS z&boi0gsYg~REN4Z&bm=`6MCmbj=B;l*r7n3)?8@cW+;PNH-i7AhOgD&g~fL?G<1(7 zvAk&eWe@Oa=a~`KAT8*pJ}~z9&VtTcSZwM_$z)^?&n-PH l6o>6KFg@G>AaR#_P zP9YBWM7nkJ0ASaj&iQ}K%jYQBP!Ok_p?7h8X};*2aJv%l&dMLlq+#4!y6l~l`ZJnX zyv4u~x|+{XNZ(1&{^t4J2GnHBb<1yT|5;WWb*k9<`Rl%o4ui#54@YpQ8mB5Y6F(6s z&8kOyDd%YBj1z`d;kD-%(*(IOaGC|D>SKKiJW?a3IBWR|^>nt9%>*URfDE6~4c(=& z*zjNP;jEpz*z&WUI-hzzBm`Y(!?jKRILJS3u@11QzCx+%*$WjcrGLg~gZrJy@s}}o z2S&h>?~CUQAvd>WFr_f9ux@_Szv})!2ZHqeKJY2S57p^bnm^C^4}J~aW0wNQQ6T&m zSMmuL9<4n&?LFa2zjlMhYv`Vc${TJxDQkC9mM&^Ec8IBgua29f9oQ3*fX^_tSlb50 zJXj!vdhyOZS{t88lf)D-4ud5X%Y0CWH-xMz{DBo1Bv0a3*BgTNlN+7??Kb~By*BT+ zqJ7MOuEDv;ka!47XDJ&nq905-Oo<97!1Qh89XFk>U20K#1OLEeV;x+jXo0X>zVaZv z*^5xx6TU|XRq*m}4iNJ4`eE*xYcbmrUK|d#l`GnG5CI>n)hEp>Ptm=(*OlwSF0h`~ zuV-15sJl|!+KG0&9RDEt>g~uG^vCDYdz~od_GBV_F{o%GcyTy9Ut8Vd;#rl^r~M zzTW!G*z0>i<8~fhpOxl)&5@Ibf7E=v>mlIa##55Rx8SfIDQFn zMe6$?E__1Zn?ni>w52_4)#mR?TI1xPstP9_OW9Z{0XcFck*^YfTkkim(Jk907Q$Am oy~!$Pi{pwQ2mAksEa)-)F)dI*9fB#0X2^e#bk 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 R{`(FBv>zbVt5t2o{{xLVd8q&Z literal 0 HcmV?d00001 diff --git a/STranslate/Images/window.ico b/STranslate/Images/window.ico new file mode 100644 index 0000000000000000000000000000000000000000..b19ddb805dca1764a8f880549315eeb20c6ec00d GIT binary patch literal 2369 zcmeHJ`#017AAfICWRs6vawk5?8k&%~_4$Ny3*RP}TyjgHvSqTF%LqlW#Y(i2Pn2$= z5OSF=+UCw&!emS?Wj-iu3|~IqU%uyjKi~8H2fmNjd7kIvJYVN|Ij`qA&({+GK$~X^ zAV3p9>;M3TO`iS_7dt6QWywt{e*xv&n`bqqO8g3%@Egt>$reO{b*4+_yZ>1g{c1%Cn_ z{)4S?f!W}raITrMKO5=?MT8Zfs!cMV$PMhtbah!pzj-eSop`XCZ|QtLYE|t*h*X=g z$EL4smZeb!lDkra#8rj`Qb#z_dSY{yK%2qHyXd9Y$q|RTZ!K}YzGNAG)P&SE4fLs) zNn^#lBnre`uUhMrr`M};;oj{0QjV;fC~0J2AL%J_D6LRh0`!)N4#(0so`iHi1WecTRW@FnGiz8jo-4a(kJBFn&4)xUCqJ zaq3~kB*OiNaoJVrt#)(c=&~Tbpdjvi$LOHmv`KCj|Fwb~o z5@l953wwqj8?CD?J1;er=EyZ7>64k=gtVUfb)=#D0Y0KyO9znem?}?+iyf4|JD#VcqpG`M}64!#)*NN4_=OvW+Un7qAL5y8Y z<2`$zgdC$j<><%0AUPX;x6kJc~|sKXs=Rr*9qu&A4Y@^9fiF9w=Xj?&{FjJovP;_kW(dXe`r zP^JW$XAL*4)=-;2e`A!$b26VGF<;d#QhKSURjX@qS|gT~=y@f#sy}Lycyj%kLUmRJ zqhmy#iJN_Hxw|T736PJO6Hd4KPw#V5$SwT6VTD~<@mH^~xsczJ&n=NiUwb)Pv?W0} zJn=fYPbl~{W!#C{7T}8pR%`>}oj3^&3}DF5lwKP{dDe5^K%MNr2c9TC(18qI83Hcr z2FR}tDALj0Dn|e|>>CEsqvi_nV^w9I#3_Gn)eiejxklTaV|LmZa3LKfOm~MBT#{_u z41W)dbO9+A0~v0>Cpf^9OZ=DF*Q6h8i3@Xeo3)qUfL<^GwN6E1)!v@Jlf1#CMA_K; zNqRLoS<2JV3lDCPGCkP|zeY0p%J;747Zd^QE1)t#SJ_HG1Ua?BgV>uxu|$69`Sc;z z;-r7i@n2H^-~6BL_#bbQW3E9*!4p0D$FM&iuOZK55drMQ7is!96KOJ+|TZh9-|%?2kj1PU~zfDEt!-)^t_^}puZ zY>~VlhWsf7<_I(Vq<3PF;`nSLEI`UfBDjBlb_cTgTMA(P=Fu8qJYN^7jLjUVnA`(r z;q##L%14&xCJLmCVoMUyeui(vi+po;XVImzd z3%NYACffLw7t$^Z<{!*kO!o%m_9s)5q%BxE9KDM(U8`|d2?;Z+55LQ%P-I5;DdAf_ z+aBV_u&xDN9}zrg-+6ZJ;Co!u==JseyNB1JI-gjG<)Avm7{mDF_2XS^JBj3|Ed8T@ z3fTr{)bz!OhF%XXalX8=4bU1c^`mx8!Pm&+ICt@s%k8qlCvC2tUcP}p)Ei}gnPSn!P+D55cI^DL ezXJ!c0m}QX`I!svJ+Qe10S-r9Y+qUjT=^&6fJ?Ig literal 0 HcmV?d00001 diff --git a/STranslate/MainWindow.xaml b/STranslate/MainWindow.xaml index 5b5223e..5b37bb9 100644 --- a/STranslate/MainWindow.xaml +++ b/STranslate/MainWindow.xaml @@ -38,12 +38,8 @@ Visibility="Visible" Icon="/Images/translate2.ico"> - - - - + @@ -55,7 +51,7 @@ Header="输入翻译" /> + Header="显示主界面" /> diff --git a/STranslate/MainWindow.xaml.cs b/STranslate/MainWindow.xaml.cs index 461474d..5ccaab2 100644 --- a/STranslate/MainWindow.xaml.cs +++ b/STranslate/MainWindow.xaml.cs @@ -17,7 +17,7 @@ namespace STranslate { InitializeComponent(); - vm = (MainVM)this.DataContext; + vm = (MainVM)DataContext; } /// diff --git a/STranslate/Model/HotKeys.cs b/STranslate/Model/HotKeys.cs deleted file mode 100644 index 739fd81..0000000 --- a/STranslate/Model/HotKeys.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using static STranslate.Utils.NativeMethod; - -namespace STranslate.Model -{ - public static class HotKeys - { - public static class InputTranslate - { - public static byte Modifiers = (byte)KeyModifiers.Alt; - public static int Key = 65; - public static String Text = "A"; - public static bool Conflict = false; - } - public static class CrosswordTranslate - { - public static byte Modifiers = (byte)KeyModifiers.Ctrl; - public static int Key = 68; - //public static String Text = "F2"; - public static bool Conflict = false; - } - public static class ScreenShotTranslate - { - public static byte Modifiers = (byte)KeyModifiers.Alt; - public static int Key = 83; - public static String Text = "S"; - public static bool Conflict = false; - } - } -} diff --git a/STranslate/Properties/Resources.Designer.cs b/STranslate/Properties/Resources.Designer.cs index 9008840..0224332 100644 --- a/STranslate/Properties/Resources.Designer.cs +++ b/STranslate/Properties/Resources.Designer.cs @@ -70,6 +70,36 @@ namespace STranslate.Properties { } } + /// + /// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。 + /// + internal static System.Drawing.Icon crossword { + get { + object obj = ResourceManager.GetObject("crossword", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。 + /// + internal static System.Drawing.Icon input { + get { + object obj = ResourceManager.GetObject("input", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。 + /// + internal static System.Drawing.Icon screenshot { + get { + object obj = ResourceManager.GetObject("screenshot", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + /// /// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。 /// @@ -79,5 +109,15 @@ namespace STranslate.Properties { return ((System.Drawing.Icon)(obj)); } } + + /// + /// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。 + /// + internal static System.Drawing.Icon window { + get { + object obj = ResourceManager.GetObject("window", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } } } diff --git a/STranslate/Properties/Resources.resx b/STranslate/Properties/Resources.resx index 56ccc9b..ee880f5 100644 --- a/STranslate/Properties/Resources.resx +++ b/STranslate/Properties/Resources.resx @@ -121,7 +121,19 @@ ..\images\copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\crossword.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\input.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\screenshot.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\images\translate2.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\window.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/STranslate/STranslate.csproj b/STranslate/STranslate.csproj index a69fdf9..c49f38a 100644 --- a/STranslate/STranslate.csproj +++ b/STranslate/STranslate.csproj @@ -85,7 +85,6 @@ MSBuild:Compile Designer - @@ -140,6 +139,18 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest diff --git a/STranslate/Utils/HotKeysUtil.cs b/STranslate/Utils/HotKeysUtil.cs index 671990e..2ff2823 100644 --- a/STranslate/Utils/HotKeysUtil.cs +++ b/STranslate/Utils/HotKeysUtil.cs @@ -1,8 +1,35 @@ using STranslate.Model; using System; +using static STranslate.Utils.NativeMethod; namespace STranslate.Utils { + public static class HotKeys + { + public static class InputTranslate + { + public static byte Modifiers = (byte)KeyModifiers.MOD_CTRL; + public static int Key = 65; + public static String Text = "A"; + public static bool Conflict = false; + } + public static class CrosswordTranslate + { + public static byte Modifiers = (byte)KeyModifiers.MOD_CTRL; + public static int Key = 68; + public static String Text = "D"; + public static bool Conflict = false; + } + public static class ScreenShotTranslate + { + public static byte Modifiers = (byte)KeyModifiers.MOD_CTRL; + public static int Key = 83; + public static String Text = "S"; + public static bool Conflict = false; + } + } + + internal class HotKeysUtil { public static IntPtr mainFormHandle; @@ -16,6 +43,11 @@ namespace STranslate.Utils public static int ScreenShotTranslateId = 856; public static byte ScreenShotTranslateModifiers; public static int ScreenShotTranslateKey; + + /// + /// 注册快捷键 + /// + /// public static void RegisterHotKey(IntPtr mainFormHandle) { HotKeysUtil.mainFormHandle = mainFormHandle; @@ -41,23 +73,29 @@ namespace STranslate.Utils } } + /// + /// 注销快捷键 + /// public static void UnRegisterHotKey() { - NativeMethod.UnregisterHotKey(mainFormHandle, InputTranslateId); - NativeMethod.UnregisterHotKey(mainFormHandle, CrosswordTranslateId); - NativeMethod.UnregisterHotKey(mainFormHandle, ScreenShotTranslateId); + UnregisterHotKey(mainFormHandle, InputTranslateId); + UnregisterHotKey(mainFormHandle, CrosswordTranslateId); + UnregisterHotKey(mainFormHandle, ScreenShotTranslateId); } + /// + /// 重新注册快捷键 + /// public static void ReRegisterHotKey() { if (HotKeys.InputTranslate.Key == 0) { - NativeMethod.UnregisterHotKey(mainFormHandle, InputTranslateId); + UnregisterHotKey(mainFormHandle, InputTranslateId); } else if (InputTranslateModifiers != HotKeys.InputTranslate.Modifiers || InputTranslateKey != HotKeys.InputTranslate.Key) { { - NativeMethod.UnregisterHotKey(mainFormHandle, InputTranslateId); + UnregisterHotKey(mainFormHandle, InputTranslateId); HotKeys.InputTranslate.Conflict = !NativeMethod.RegisterHotKey(mainFormHandle, InputTranslateId, HotKeys.InputTranslate.Modifiers, HotKeys.InputTranslate.Key); } } @@ -66,12 +104,12 @@ namespace STranslate.Utils if (HotKeys.CrosswordTranslate.Key == 0) { - NativeMethod.UnregisterHotKey(mainFormHandle, CrosswordTranslateId); + UnregisterHotKey(mainFormHandle, CrosswordTranslateId); } else if (CrosswordTranslateModifiers != HotKeys.CrosswordTranslate.Modifiers || CrosswordTranslateKey != HotKeys.CrosswordTranslate.Key) { { - NativeMethod.UnregisterHotKey(mainFormHandle, CrosswordTranslateId); + UnregisterHotKey(mainFormHandle, CrosswordTranslateId); HotKeys.CrosswordTranslate.Conflict = !NativeMethod.RegisterHotKey(mainFormHandle, CrosswordTranslateId, HotKeys.CrosswordTranslate.Modifiers, HotKeys.CrosswordTranslate.Key); } } @@ -80,11 +118,11 @@ namespace STranslate.Utils if (HotKeys.ScreenShotTranslate.Key == 0) { - NativeMethod.UnregisterHotKey(mainFormHandle, ScreenShotTranslateId); + UnregisterHotKey(mainFormHandle, ScreenShotTranslateId); } else if (ScreenShotTranslateModifiers != HotKeys.ScreenShotTranslate.Modifiers || ScreenShotTranslateKey != HotKeys.ScreenShotTranslate.Key) { - NativeMethod.UnregisterHotKey(mainFormHandle, ScreenShotTranslateId); + UnregisterHotKey(mainFormHandle, ScreenShotTranslateId); HotKeys.ScreenShotTranslate.Conflict = !NativeMethod.RegisterHotKey(mainFormHandle, ScreenShotTranslateId, HotKeys.ScreenShotTranslate.Modifiers, HotKeys.ScreenShotTranslate.Key); } ScreenShotTranslateModifiers = HotKeys.ScreenShotTranslate.Modifiers; diff --git a/STranslate/Utils/NativeMethod.cs b/STranslate/Utils/NativeMethod.cs index 917ad4d..15caf9e 100644 --- a/STranslate/Utils/NativeMethod.cs +++ b/STranslate/Utils/NativeMethod.cs @@ -206,17 +206,13 @@ namespace STranslate.Utils [DllImport("user32.dll")] public static extern bool SetWindowPos(IntPtr hWnd, IntPtr hPos, int x, int y, int cx, int cy, uint nflags); - /// - /// 定义了辅助键的名称（将数字转变为字符以便于记忆，也可去除此枚举而直接使用数值） - /// - [Flags()] - public enum KeyModifiers + internal enum KeyModifiers { - None = 0, - Alt = 1, - Ctrl = 2, - Shift = 4, - WindowsKey = 8 + MOD_NONE = 0x0, + MOD_ALT = 0x1, + MOD_CTRL = 0x2, + MOD_SHIFT = 0x4, + MOD_WIN = 0x8 } #region Clipboard