From fe749a06cc302f43c52f0733f466fa528c192910 Mon Sep 17 00:00:00 2001 From: zggsong Date: Thu, 18 Jan 2024 22:59:26 +0800 Subject: [PATCH] feat: adapt to silent ocr and fix some bugs --- Attachments/iconfont/demo_index.html | 52 ++- Attachments/iconfont/iconfont.css | 14 +- Attachments/iconfont/iconfont.js | 2 +- Attachments/iconfont/iconfont.json | 14 + Attachments/iconfont/iconfont.ttf | Bin 15484 -> 16208 bytes Attachments/iconfont/iconfont.woff | Bin 9168 -> 9612 bytes Attachments/iconfont/iconfont.woff2 | Bin 7856 -> 8252 bytes STranslate.Model/ConstStr.cs | 1 + STranslate.Model/Hotkeys.cs | 6 +- STranslate.Style/Fonts/iconfont.ttf | Bin 15484 -> 16208 bytes STranslate/Helper/ConfigHelper.cs | 1 + STranslate/Helper/HotkeyHelper.cs | 59 ++- STranslate/STranslate_io3erein_wpftmp.csproj | 344 ++++++++++++++++++ STranslate/ViewModels/MainViewModel.cs | 16 +- STranslate/ViewModels/NotifyIconViewModel.cs | 52 ++- .../ViewModels/Preference/CommonViewModel.cs | 1 + STranslate/Views/NotifyIcon.xaml | 5 + STranslate/Views/NotifyIcon.xaml.cs | 7 +- STranslate/Views/Preference/HotkeyPage.xaml | 36 +- .../Views/Preference/HotkeyPage.xaml.cs | 59 ++- 20 files changed, 635 insertions(+), 34 deletions(-) create mode 100644 STranslate/STranslate_io3erein_wpftmp.csproj diff --git a/Attachments/iconfont/demo_index.html b/Attachments/iconfont/demo_index.html index d3a4d713..89cf3067 100644 --- a/Attachments/iconfont/demo_index.html +++ b/Attachments/iconfont/demo_index.html @@ -54,6 +54,18 @@

    +
  • + +
    OCR识别
    +
    
    +
    • + +
  • + +
    OCR
    +
    
    +
    • +
  • 密码显示隐藏-02
    @@ -378,9 +390,9 @@

    第一步：拷贝项目下面生成的 @font-face@font-face { font-family: 'iconfont'; - src: url('iconfont.woff2?t=1705480740490') format('woff2'), - url('iconfont.woff?t=1705480740490') format('woff'), - url('iconfont.ttf?t=1705480740490') format('truetype'); + src: url('iconfont.woff2?t=1705574336968') format('woff2'), + url('iconfont.woff?t=1705574336968') format('woff'), + url('iconfont.ttf?t=1705574336968') format('truetype'); }

    第二步：定义使用 iconfont 的样式

    @@ -406,6 +418,24 @@

    第三步：挑选相应图标并获取字体编码，应用于页面
      +
    • + +
      + OCR识别 +
      +
      .icon-OCRshibie +
      +
      • + +
    • + +
      + OCR +
      +
      .icon-OCR +
      +
      • +
    • @@ -892,6 +922,22 @@

      第二步：挑选相应图标并获取类名，应用于页面：
        +
      • + +
        OCR识别
        +
        #icon-OCRshibie
        +
        • + +
      • + +
        OCR
        +
        #icon-OCR
        +
        • +
      • 3Pdo>U ztZ6=qA8T&;a4&=}nw7M)PxrETg@L0z^ElxaEduQ%+OihX!w3B%$D(FW3m-bZZiX$t@OtUBX}@+GOJ>_y zqU%8@0+y-Ni^65SxkW^Y)-}Ruh=Is4&A_PVqQ0Yg0>?D*o}LxFdG2{SIMS`$(;Do* zWPq6XlRABsW34}U)!)!@BW*3D4PKvLh)uzN+Q^Qn;UedWqX{~+faWMLzt_|!DT}kg zG1{Q%ENx&2af^4zZd&qSwm#)^gvsuI#t*aaOgiUqE>{H2odQL!3=PBU`$IGg6jDP; zi1kWCGzhd8cFf-)>_3jeKfD3Ln@=ipV0j3n=6y5?!v_FLj?sLKeqzB}3iJM0Ja9v{K|K`&KMbbvzcyf2=FH-oeURajxv_CTC%->$HI z+Lcg2j~^e*q6an}MAo)VP(5qj4?4C|PXsgQ7#QO|H`Hn{ z(}1{rGgJd9@tii!;W#_lH3HafzD*nZO&v0MHkP1fUlhS;Kl2D`ucj-UHq4G$p6?fwft~>qQlV&Jt1bDfrF7} zM8nW{Uc{%u)tYoQxTxR7uwo&zXc>kCr#8$iScqYRrTZyQj_LAYk>~ZeA-3%7><`H? z;(b>_gKye9%5s=ogC^pd2-B8pQL>NW5F~!2K`{# z@qGs!OZ&|OhYl_GokNu1kmGZ$?+a%j7W5##rEj>C+soa=eH7lbHYW^pzo~^yOElPz z1I{;ONwK^3JNi<8_$glFyU=v}-LL2>L@PYOJLFFa{EIF2F;e^<2IepZYSa-G_$ zmCSyY{Dkb`+Br^U`F~1=H|oIkhRiAlB^l8}l+bK&AlB0nL-z#-6iG5Ou7d7E_r-cU zV!;7uJ9=a28?^0#K9FQwOOg~y&88?R+|9Ml;K$@4l3_NR6Xp{%Z!T#=i%pJCNb_v> zR5x6ISY&PUI~_ee9ay9=)4jF_3q5PQp>6&aTKtoqj^=L}fzZ*@st0XBk8@FoFy{-} zRF5C0!JkTVE0uCZ1k<7vIEXUK>MsmrC@J{^r@wmfB95_>pq{o5JbsYs;&|^qf<5p}clRv9RO12w+ zGtHQ5mm>Pvd}b6|Op7YpmgSf(Ze;O9WYyKjC3(=^#&;!$aoBbAOkrT!b zx^}R_cB7&!K=ziUVL}#t721pbXE2g&C!Y;1n^Z zMc$MXZsZ5A$ZkS@Q`X;z{5%5KcfU(Ve@=v!{Lb(Q&ZG^ZL=J@p&}OkjE1GE3Yb_&a z(b_b{s?0P(P+?2Ef{O^$?QmRj*k&g#&A=(L#X zEiRWVPT^~azQ{N$#gC)&zYPsb@lqH#fhlZ#Pi5u&(!Y1W0LWAojxIdrHz;MY!?n?A z+YQbZzzm3;8NZ^KqN?7s%#WIX@toCNNLV@{Msm}jYDHw_g0ZglVnl)|v*&jR#qyE0 z^x3Cj@K)P#tzbE$H`R!o^eu#SqS_|uC?qdyOU7kQmE>f?mbHk*M{J94kK5%gHt}Bm zUiAm!FZ(HjAAZL)7Ji1OCh+&=>%0AVF{`#lB=Pr_wR8D)w;is0o2AEPUKBMwo^Z2% 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 ug%R)9jWik7wF`ULg}RZN@Y-LgwmDNB!yJd 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 T t, KeyModifiers modifiers, KeyCodes key, string? text, bool conflict = false) where T : HotkeyBase { - t.Modifiers = modifiers; t.Key = key; + t.Modifiers = modifiers; t.Text = text; t.Conflict = conflict; return t; diff --git a/STranslate.Style/Fonts/iconfont.ttf b/STranslate.Style/Fonts/iconfont.ttf index fec9fa9c45933c0c683ab9b6bb39fa8844f62807..63d5a6b4c161c05ec8404c1be1179b78581bb22b 100644 GIT binary patch delta 1968 zcmY+DUu;uV9LK+>?b?oZYq#EeyFc!B+_F1xe{{E{Q#N7D#LNM6lV(IwamZkUZIG}K zrbxl?;Dd?a-~khfi6o*Xh6rLb3r50|CdiW^#6(TtzydEm=!1dP@97yRJ^kE!&hPyD z{l357y|@4B!J{38nawu=-({d|aL2^V_D|>kc^e2H0XhzhjgD+{=T38s-$`zahR|>R z3+&I4Wn+`m`>&x`1jJpAuTAWJV`O6YmTB%cIG&mu*}q3@5Q6hH95+slOpeAs={^gr z;?TEa&+fg`(UWbTodmkaXpqO|(ra?ydc}#Gp-fJZybRr5hiY4~?UA+rc&2`&N%(bp6nM+{N4z(75cs6#6nT|5B?k1_H% zs!_q9nvsT$73e@amZAYBT z^lRuYBvYWE?hG9X5H4G3kQcw?WUe0$+!>A$Snvz2a_6e1Mr1J`D z0-4lM9mqwf6J(u6WmPt4s2yadhAKjKX;4_k&KeD+h3wH#WXQD|$_?48q41D>8dWZ` zU&CZTZqP6-kOLYf2y#%vR6!1Dm^8>?pr9ViALM2YGYL7WVNM};X_#HeeH!K&az=wj zzFDsdrXF%u!ykEI>a5$-#O0wvm|l%ltvXNe{YKQ;=C{D z8}<(ba)DE2`LbVv2SZM1E*uDN3%^^wzWmIR!N~c@^{5*?RS~FIU2&$;t=w68HFhL+ zH*UqJ<5#N&sy?rNs`|^saN?5DZyYh^jB93{`I>pjykTXn8_AtDM$JXWud-YG-v5Jt zEsLrZy?BY0=D5#@>}t^^Jj)2S2&Yms2qP%cj+@QVxLR;J=UFsXilu3%{lBrjxJi_b zXcye9_t>Q)w#Ti^a3&wKtXSU8rmTYR{e0ZA;`vl2Wu+`{(?ZS0%qEXr8a8sq*Bw_~ zy-3aYBHYR|)RL^tlkR{0u&ZYtxgcfv`jhG|JDJi~v#6jx%Hp8_{Dng-z7<%5JYL0i zyn|!-5NI+P*F(>9I@mHs&z|c98FnemT-Fs{X_lIB@IWYwLIn*=smG;OX-T`FfJzF_ z3aK-cIqA5CY%b#^tz@U$>~d2mXe4cs@j9D>P04g~+DuoeY10TctK-d#m-82G&%Uk% ziJIyBVR($O)T$z(b1w!pDQ!dc9@yolvborDgsidaiukHPNpvc416RTo}jq^wS0B|$&UfDL&CI{` z_wfBnn-z)#|lnieuYCO*?x=UHDH zpPZhj*@S3W^ZApfUa1}!8PQ(mcgFyLh8-?+`j4c>cqUGcUCb|4BZn1^D^feOLbPo6TlD871D)JWCu_ zRl;{ev%OIzYV3*Md-&$c0?{0amC$L7hA<+|E zYHUhet-pZRBZT@gNAIe~@mk~V3fmZDJ8g8ZiVR8J+E0NUtfoRIX}0np>*!;>0#7OY z9tLPpWDiiHn|8X`L@!&`v6g#irAS`kZ{U8`u#tz@%zfNTS+1DM#UBX-5yi{zFf~vW^~y^FyDPR*)0c&@p2iECG8LZopMp%y{wXmIzbi*EXq#(A}q28y#s3Tdi$DH5{ z+viAX>1l!oNj?#oZ=O|&=i%<`Za)*sM$|ClfqkLjh zjxvj#c9di6U572|8;;VBU2|;k(z&>?k3hZk~_NcS4ffa($7nFv8Jj234NA6*< z>c~edUU%dumULM_-ePIak;_=R<;ZXRru~4N$MXA5@SsYKxnof-j^jItL& keymap = new(); @@ -125,15 +129,8 @@ private static void RegisterHotKey(IntPtr handle) OCRModifiers = Hotkeys!.OCR.Modifiers; OCRKey = Hotkeys!.OCR.Key; - if (Hotkeys!.ScreenShotTranslate.Key != 0) - { - Hotkeys!.ScreenShotTranslate.Conflict = !CommonUtil.RegisterHotKey( - handle, - ScreenShotTranslateId, - (byte)Hotkeys!.ScreenShotTranslate.Modifiers, - (int)Hotkeys!.ScreenShotTranslate.Key - ); - } + SilentOCRModifiers = Hotkeys!.SilentOCR.Modifiers; + SilentOCRKey = Hotkeys!.SilentOCR.Key; if (Hotkeys!.InputTranslate.Key != 0) { @@ -144,6 +141,7 @@ private static void RegisterHotKey(IntPtr handle) (int)Hotkeys!.InputTranslate.Key ); } + if (Hotkeys!.CrosswordTranslate.Key != 0) { Hotkeys!.CrosswordTranslate.Conflict = !CommonUtil.RegisterHotKey( @@ -153,6 +151,17 @@ private static void RegisterHotKey(IntPtr handle) (int)Hotkeys!.CrosswordTranslate.Key ); } + + if (Hotkeys!.ScreenShotTranslate.Key != 0) + { + Hotkeys!.ScreenShotTranslate.Conflict = !CommonUtil.RegisterHotKey( + handle, + ScreenShotTranslateId, + (byte)Hotkeys!.ScreenShotTranslate.Modifiers, + (int)Hotkeys!.ScreenShotTranslate.Key + ); + } + if (Hotkeys!.OpenMainWindow.Key != 0) { Hotkeys!.OpenMainWindow.Conflict = !CommonUtil.RegisterHotKey( @@ -162,6 +171,7 @@ private static void RegisterHotKey(IntPtr handle) (int)Hotkeys!.OpenMainWindow.Key ); } + if (Hotkeys!.MousehookTranslate.Key != 0) { Hotkeys!.MousehookTranslate.Conflict = !CommonUtil.RegisterHotKey( @@ -171,6 +181,7 @@ private static void RegisterHotKey(IntPtr handle) (int)Hotkeys!.MousehookTranslate.Key ); } + if (Hotkeys!.OCR.Key != 0) { Hotkeys!.OCR.Conflict = !CommonUtil.RegisterHotKey( @@ -180,6 +191,15 @@ private static void RegisterHotKey(IntPtr handle) (int)Hotkeys!.OCR.Key ); } + if (Hotkeys!.SilentOCR.Key != 0) + { + Hotkeys!.SilentOCR.Conflict = !CommonUtil.RegisterHotKey( + handle, + SilentOCRId, + (byte)Hotkeys!.SilentOCR.Modifiers, + (int)Hotkeys!.SilentOCR.Key + ); + } } /// @@ -310,6 +330,26 @@ public static void ReRegisterHotKey() } OCRModifiers = Hotkeys!.OCR.Modifiers; OCRKey = Hotkeys!.OCR.Key; + + if (Hotkeys!.SilentOCR.Key == 0) + { + CommonUtil.UnregisterHotKey(MainIntPtr, SilentOCRId); + } + else if ( + SilentOCRModifiers != Hotkeys!.SilentOCR.Modifiers + || SilentOCRKey != Hotkeys!.SilentOCR.Key + ) + { + CommonUtil.UnregisterHotKey(MainIntPtr, SilentOCRId); + Hotkeys!.SilentOCR.Conflict = !CommonUtil.RegisterHotKey( + MainIntPtr, + SilentOCRId, + (byte)Hotkeys!.SilentOCR.Modifiers, + (int)Hotkeys!.SilentOCR.Key + ); + } + SilentOCRModifiers = Hotkeys!.SilentOCR.Modifiers; + SilentOCRKey = Hotkeys!.SilentOCR.Key; } /// @@ -323,6 +363,7 @@ public static void UnRegisterHotKey(Window window) CommonUtil.UnregisterHotKey(MainIntPtr, OpenMainWindowId); CommonUtil.UnregisterHotKey(MainIntPtr, MousehookTranslateId); CommonUtil.UnregisterHotKey(MainIntPtr, OCRId); + CommonUtil.UnregisterHotKey(MainIntPtr, SilentOCRId); var hwnd = new WindowInteropHelper(window).Handle; _hwndSource = HwndSource.FromHwnd(hwnd); _hwndSource.RemoveHook(WndProc); diff --git a/STranslate/STranslate_io3erein_wpftmp.csproj b/STranslate/STranslate_io3erein_wpftmp.csproj new file mode 100644 index 00000000..321efbe8 --- /dev/null +++ b/STranslate/STranslate_io3erein_wpftmp.csproj @@ -0,0 +1,344 @@ + + + STranslate + obj\Debug\ + obj\ + D:\CodeHub\self\STranslate\STranslate\obj\ + <_TargetAssemblyProjectName>STranslate + + + + WinExe + net8.0-windows + enable + true + ..\STranslate.Style\Resources\favicon.ico + true + app.manifest + x64 + README.md + 1.0.2.0118 + 1.0.2.0118 + + + none + + + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + Code + + + Code + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/STranslate/ViewModels/MainViewModel.cs b/STranslate/ViewModels/MainViewModel.cs index 2748564e..58462923 100644 --- a/STranslate/ViewModels/MainViewModel.cs +++ b/STranslate/ViewModels/MainViewModel.cs @@ -126,28 +126,36 @@ private void Register(Window view) NotifyIconVM.OCRCommand.Execute(null); }); + HotkeyHelper.Register(HotkeyHelper.SilentOCRId, () => + { + NotifyIconVM.SilentOCRCommand.Execute(null); + }); + if (HotkeyHelper.Hotkeys!.InputTranslate.Conflict || HotkeyHelper.Hotkeys!.CrosswordTranslate.Conflict || HotkeyHelper.Hotkeys!.ScreenShotTranslate.Conflict || HotkeyHelper.Hotkeys!.OpenMainWindow.Conflict || HotkeyHelper.Hotkeys!.MousehookTranslate.Conflict - || HotkeyHelper.Hotkeys!.OCR.Conflict) + || HotkeyHelper.Hotkeys!.OCR.Conflict + || HotkeyHelper.Hotkeys!.SilentOCR.Conflict) { - MessageBox_S.Show("全局快捷键有冲突，请前往软件首选项中修改..."); + MessageBox_S.Show("全局热键冲突，请前往软件首选项中修改..."); } var msg = ""; if (!HotkeyHelper.Hotkeys!.InputTranslate.Conflict) msg += $"输入: {HotkeyHelper.Hotkeys.InputTranslate.Text}\n"; if (!HotkeyHelper.Hotkeys!.CrosswordTranslate.Conflict) msg += $"划词: {HotkeyHelper.Hotkeys.CrosswordTranslate.Text}\n"; - if (!HotkeyHelper.Hotkeys!.MousehookTranslate.Conflict) - msg += $"鼠标: {HotkeyHelper.Hotkeys.MousehookTranslate.Text}\n"; if (!HotkeyHelper.Hotkeys!.ScreenShotTranslate.Conflict) msg += $"截图: {HotkeyHelper.Hotkeys.ScreenShotTranslate.Text}\n"; if (!HotkeyHelper.Hotkeys!.OpenMainWindow.Conflict) msg += $"显示: {HotkeyHelper.Hotkeys.OpenMainWindow.Text}\n"; + if (!HotkeyHelper.Hotkeys!.MousehookTranslate.Conflict) + msg += $"鼠标: {HotkeyHelper.Hotkeys.MousehookTranslate.Text}\n"; if (!HotkeyHelper.Hotkeys!.OCR.Conflict) msg += $"识字: {HotkeyHelper.Hotkeys.OCR.Text}\n"; + if (!HotkeyHelper.Hotkeys!.SilentOCR.Conflict) + msg += $"静默: {HotkeyHelper.Hotkeys.SilentOCR.Text}\n"; NotifyIconVM.UpdateToolTip(msg.TrimEnd('\n')); } catch (Exception) diff --git a/STranslate/ViewModels/NotifyIconViewModel.cs b/STranslate/ViewModels/NotifyIconViewModel.cs index 581052c5..86a588c4 100644 --- a/STranslate/ViewModels/NotifyIconViewModel.cs +++ b/STranslate/ViewModels/NotifyIconViewModel.cs @@ -22,6 +22,8 @@ public partial class NotifyIconViewModel : ObservableObject public event Action? OnExit; + public event Action? OnShowBalloonTip; + [ObservableProperty] private bool _isForbiddenShortcuts = false; @@ -168,7 +170,7 @@ private void OCR(object obj) }); } - private void OCRHandler() + internal void OCRHandler() { ScreenshotView view = new(); ShowAndActive(view, false); @@ -191,6 +193,52 @@ private void OCRHandler() ); } + [RelayCommand] + private void SilentOCR(object obj) + { + if (obj == null) + { + SilentOCRHandler(); + return; + } + System.Threading.Tasks.Task + .Delay(200) + .ContinueWith(_ => + { + CommonUtil.InvokeOnUIThread(() => + { + SilentOCRHandler(); + }); + }); + } + + internal void SilentOCRHandler() + { + ScreenshotView view = new(); + ShowAndActive(view, false); + + view.BitmapCallback += ( + bitmap => + { + var bytes = BitmapUtil.ConvertBitmap2Bytes(bitmap); + + var getText = Singleton.Instance.Execute(bytes).Trim(); + + //取词前移除换行 + getText = + Singleton.Instance.CurrentConfig?.IsRemoveLineBreakGettingWords ?? false && !string.IsNullOrEmpty(getText) + ? StringUtil.RemoveLineBreaks(getText) + : getText; + + //写入剪贴板 + Clipboard.SetDataObject(getText, true); + + var tmp = getText.Length >= 9 ? getText[..9] + "..." : getText; + OnShowBalloonTip?.Invoke($"OCR识别成功: {tmp}"); + } + ); + } + [RelayCommand] private void ScreenShotTranslate(object obj) { @@ -210,7 +258,7 @@ private void ScreenShotTranslate(object obj) }); } - private void ScreenShotHandler() + internal void ScreenShotHandler() { ScreenshotView view = new(); ShowAndActive(view, false); diff --git a/STranslate/ViewModels/Preference/CommonViewModel.cs b/STranslate/ViewModels/Preference/CommonViewModel.cs index b26c7cb6..173eac8c 100644 --- a/STranslate/ViewModels/Preference/CommonViewModel.cs +++ b/STranslate/ViewModels/Preference/CommonViewModel.cs @@ -54,6 +54,7 @@ private void Reset() IsAdjustContentTranslate = Singleton.Instance.CurrentConfig?.IsAdjustContentTranslate ?? false; IsRemoveLineBreakGettingWords = Singleton.Instance.CurrentConfig?.IsRemoveLineBreakGettingWords ?? false; DoubleTapTrayFunc = Singleton.Instance.CurrentConfig?.DoubleTapTrayFunc ?? DoubleTapFuncEnum.InputFunc; + CustomFont = Singleton.Instance.CurrentConfig?.CustomFont ?? ConstStr.DEFAULTFONTNAME; ToastHelper.Show("重置配置", WindowType.Preference); if (IsStartup) diff --git a/STranslate/Views/NotifyIcon.xaml b/STranslate/Views/NotifyIcon.xaml index dbd35d67..918a2683 100644 --- a/STranslate/Views/NotifyIcon.xaml +++ b/STranslate/Views/NotifyIcon.xaml @@ -50,6 +50,11 @@ + + diff --git a/STranslate/Views/NotifyIcon.xaml.cs b/STranslate/Views/NotifyIcon.xaml.cs index f86bd602..b772f775 100644 --- a/STranslate/Views/NotifyIcon.xaml.cs +++ b/STranslate/Views/NotifyIcon.xaml.cs @@ -1,4 +1,6 @@ -using System.Windows; +using STranslate.Util; +using STranslate.ViewModels; +using System.Windows; using System.Windows.Controls; namespace STranslate.Views @@ -11,6 +13,9 @@ public partial class NotifyIcon : UserControl public NotifyIcon() { InitializeComponent(); + + Singleton.Instance.OnShowBalloonTip += (msg) + => TrayIcon.ShowBalloonTip("", msg, Hardcodet.Wpf.TaskbarNotification.BalloonIcon.None); } /// diff --git a/STranslate/Views/Preference/HotkeyPage.xaml b/STranslate/Views/Preference/HotkeyPage.xaml index 499555a0..c197378d 100644 --- a/STranslate/Views/Preference/HotkeyPage.xaml +++ b/STranslate/Views/Preference/HotkeyPage.xaml @@ -220,7 +220,41 @@ Visibility="Hidden" /> - + + + + + + + + + diff --git a/STranslate/Views/Preference/HotkeyPage.xaml.cs b/STranslate/Views/Preference/HotkeyPage.xaml.cs index 8f2e3dc2..a27ab9b5 100644 --- a/STranslate/Views/Preference/HotkeyPage.xaml.cs +++ b/STranslate/Views/Preference/HotkeyPage.xaml.cs @@ -38,6 +38,7 @@ private void UserControl_Loaded(object sender, RoutedEventArgs e) OpenMainWindowTextBox.Text = conf.CurrentConfig!.Hotkeys!.OpenMainWindow.Text; MousehookTextBox.Text = conf.CurrentConfig!.Hotkeys!.MousehookTranslate.Text; OCRTextBox.Text = conf.CurrentConfig!.Hotkeys!.OCR.Text; + SilentOCRTextBox.Text = conf.CurrentConfig!.Hotkeys!.SilentOCR.Text; HotKeyConflictCheck(); } @@ -67,16 +68,16 @@ private void HotKeyTextBox_PreviewKeyDown(object sender, KeyEventArgs e) _hotkeysModifiers += 2; shortcutText.Append("Ctrl + "); } - if ((Keyboard.Modifiers & ModifierKeys.Shift) != 0) - { - _hotkeysModifiers += 4; - shortcutText.Append("Shift + "); - } if ((Keyboard.Modifiers & ModifierKeys.Alt) != 0) { _hotkeysModifiers += 1; shortcutText.Append("Alt + "); } + if ((Keyboard.Modifiers & ModifierKeys.Shift) != 0) + { + _hotkeysModifiers += 4; + shortcutText.Append("Shift + "); + } if (_hotkeysModifiers == 0 && (key < Key.F1 || key > Key.F12)) { _hotkeysKey = 0; @@ -233,18 +234,51 @@ private void OCR_KeyUp(object sender, KeyEventArgs e) RefreshNotifyToolTip(); } + private void SilentOCR_KeyUp(object sender, KeyEventArgs e) + { + Key key = (e.Key == Key.System ? e.SystemKey : e.Key); + if ( + key == Key.LeftShift + || key == Key.RightShift + || key == Key.LeftCtrl + || key == Key.RightCtrl + || key == Key.LeftAlt + || key == Key.RightAlt + || key == Key.LWin + || key == Key.RWin + ) + { + return; + } + conf.CurrentConfig!.Hotkeys!.SilentOCR.Modifiers = _hotkeysModifiers; + conf.CurrentConfig!.Hotkeys!.SilentOCR.Key = _hotkeysKey; + conf.CurrentConfig!.Hotkeys!.SilentOCR.Text = _hotkeysText.ToString(); + HotkeyHelper.ReRegisterHotKey(); + HotKeyConflictCheck(); + RefreshNotifyToolTip(); + } + private void HotKeyConflictCheck() { + InputHotKeyConflictLabel.Visibility = conf.CurrentConfig!.Hotkeys!.InputTranslate.Conflict + ? Visibility.Visible + : Visibility.Hidden; CrossWordHotKeyConflictLabel.Visibility = conf.CurrentConfig!.Hotkeys!.CrosswordTranslate.Conflict ? Visibility.Visible : Visibility.Hidden; ScreenshotHotKeyConflictLabel.Visibility = conf.CurrentConfig!.Hotkeys!.ScreenShotTranslate.Conflict ? Visibility.Visible : Visibility.Hidden; - InputHotKeyConflictLabel.Visibility = conf.CurrentConfig!.Hotkeys!.InputTranslate.Conflict + ShowMainwinHotKeyConflictLabel.Visibility = conf.CurrentConfig!.Hotkeys!.OpenMainWindow.Conflict ? Visibility.Visible : Visibility.Hidden; - ShowMainwinHotKeyConflictLabel.Visibility = conf.CurrentConfig!.Hotkeys!.OpenMainWindow.Conflict + MousehookHotKeyConflictLabel.Visibility = conf.CurrentConfig!.Hotkeys!.MousehookTranslate.Conflict + ? Visibility.Visible + : Visibility.Hidden; + OCRHotKeyConflictLabel.Visibility = conf.CurrentConfig!.Hotkeys!.OCR.Conflict + ? Visibility.Visible + : Visibility.Hidden; + SilentOCRHotKeyConflictLabel.Visibility = conf.CurrentConfig!.Hotkeys!.SilentOCR.Conflict ? Visibility.Visible : Visibility.Hidden; } @@ -256,14 +290,16 @@ private void RefreshNotifyToolTip() msg += $"输入: {conf.CurrentConfig!.Hotkeys!.InputTranslate.Text}\r\n"; if (!conf.CurrentConfig!.Hotkeys!.CrosswordTranslate.Conflict) msg += $"划词: {conf.CurrentConfig!.Hotkeys!.CrosswordTranslate.Text}\r\n"; - if (!conf.CurrentConfig!.Hotkeys!.MousehookTranslate.Conflict) - msg += $"鼠标: {conf.CurrentConfig!.Hotkeys!.MousehookTranslate.Text}\r\n"; if (!conf.CurrentConfig!.Hotkeys!.ScreenShotTranslate.Conflict) msg += $"截图: {conf.CurrentConfig!.Hotkeys!.ScreenShotTranslate.Text}\r\n"; if (!conf.CurrentConfig!.Hotkeys!.OpenMainWindow.Conflict) msg += $"显示: {conf.CurrentConfig!.Hotkeys!.OpenMainWindow.Text}\r\n"; + if (!conf.CurrentConfig!.Hotkeys!.MousehookTranslate.Conflict) + msg += $"鼠标: {conf.CurrentConfig!.Hotkeys!.MousehookTranslate.Text}\r\n"; if (!conf.CurrentConfig!.Hotkeys!.OCR.Conflict) msg += $"识字: {conf.CurrentConfig!.Hotkeys!.OCR.Text}\r\n"; + if (!conf.CurrentConfig!.Hotkeys!.SilentOCR.Conflict) + msg += $"静默: {conf.CurrentConfig!.Hotkeys!.SilentOCR.Text}\r\n"; Singleton.Instance.UpdateToolTip(msg.TrimEnd(['\r', '\n'])); } @@ -277,6 +313,7 @@ private void ResetHoskeys(object sender, RoutedEventArgs e) OpenMainWindowTextBox.Text = cHotkeys.OpenMainWindow.Text; MousehookTextBox.Text = cHotkeys.MousehookTranslate.Text; OCRTextBox.Text = cHotkeys.OCR.Text; + SilentOCRTextBox.Text = cHotkeys.SilentOCR.Text; conf.CurrentConfig!.Hotkeys!.CrosswordTranslate.Modifiers = cHotkeys.CrosswordTranslate.Modifiers; conf.CurrentConfig!.Hotkeys!.CrosswordTranslate.Key = cHotkeys.CrosswordTranslate.Key; @@ -302,6 +339,10 @@ private void ResetHoskeys(object sender, RoutedEventArgs e) conf.CurrentConfig!.Hotkeys!.OCR.Key = cHotkeys.OCR.Key; conf.CurrentConfig!.Hotkeys!.OCR.Text = cHotkeys.OCR.Text; + conf.CurrentConfig!.Hotkeys!.SilentOCR.Modifiers = cHotkeys.SilentOCR.Modifiers; + conf.CurrentConfig!.Hotkeys!.SilentOCR.Key = cHotkeys.SilentOCR.Key; + conf.CurrentConfig!.Hotkeys!.SilentOCR.Text = cHotkeys.SilentOCR.Text; + HotkeyHelper.ReRegisterHotKey(); HotKeyConflictCheck();