OCRC: Bump version to 2.0.2

1. Fix "Result of OCR is changed after translating" bug 2. Add "Quick Translate" support
pilgrimlyieu · Sep 5, 2023 · 2b4b3b5 · 2b4b3b5
1 parent 137e909
commit 2b4b3b5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/Project/OCRC/OCRC.ahk b/Project/OCRC/OCRC.ahk
@@ -3,7 +3,7 @@
  * @file OCRC.ahk
  * @author PilgrimLyieu
  * @date 2023/08/24
- * @version 2.0.1
+ * @version 2.0.2
  ***********************************************************************/
 
 ;@Ahk2Exe-SetMainIcon icon\OCRC.ico

diff --git a/Project/OCRC/lib/Baidu.ahk b/Project/OCRC/lib/Baidu.ahk
@@ -32,6 +32,7 @@
         this.ResultGUI.AddText("x+15 w42 h30", "翻译").SetFont("s16")
         this.ResultGUI.AddDropDownList("x+5 w90 vTranslationType AltSubmit Choose" this.config["translation_type"], ["自动检测", "英->中", "中->英", "繁->简", "日->中"]).SetFont("s12")
         this.ResultGUI["TranslationType"].OnEvent("Change", ObjBindMethod(this, "__Translate"))
+        this.ResultGUI["TranslationType"].OnEvent("ContextMenu", ObjBindMethod(this, "__Translate"))
         this.ResultGUI.AddText("x+15 w42 h30", "搜索").SetFont("s16")
         this.ResultGUI.AddDropDownList("x+5 w105 vSearchEngine AltSubmit Choose" this.config["search_engine"], Baidu_SearchEngines_key).SetFont("s12")
         this.ResultGUI["SearchEngine"].OnEvent("Change", ObjBindMethod(this, "__Search"))
@@ -187,10 +188,10 @@
         TranslationGUI.Title := "OCRC (BaiduOCR) 「" translation_engine "（" translation_type "）」翻译结果"
         TranslationGUI.BackColor := "EBEDF4"
         TranslationGUI.SetFont(, "Microsoft YaHei")
-        TranslationGUI.AddEdit("x20 y20 w600 h300 vResult").SetFont("s18")
-        TranslationGUI["Result"].Value := Baidu_TranslationEngines[translation_engine].Call(result, Baidu_TranslationTypes[translation_type][1], Baidu_TranslationTypes[translation_type][2], this.config["translation_proxy"])
-        TranslationGUI["Result"].OnEvent("Change", ObjBindMethod(this, "__Clip"))
-        this.__Clip(TranslationGUI["Result"])
+        TranslationGUI.AddEdit("x20 y20 w600 h300 vTranslation").SetFont("s18")
+        TranslationGUI["Translation"].Value := Baidu_TranslationEngines[translation_engine].Call(result, Baidu_TranslationTypes[translation_type][1], Baidu_TranslationTypes[translation_type][2], {proxy: this.config["translation_proxy"]})
+        TranslationGUI["Translation"].OnEvent("Change", (CtrlObj, *) => A_Clipboard := CtrlObj.Value)
+        A_Clipboard := TranslationGUI["Translation"].Value
         TranslationGUI.Show("w640 h340")
     }
 

diff --git a/Project/OCRC/lib/Common.ahk b/Project/OCRC/lib/Common.ahk
@@ -184,10 +184,10 @@ Img2Base(Front := False, Quality := 75) {
     return Front ? "data:image/jpg;base64," base64string : base64string
 }
 
-GoogleTranslate(text, from := "auto", to := "zh-CN", proxy := "") {
-    try result := JSON.Parse(Request("https://translate.google.com/translate_a/single?client=gtx&dt=t&dj=1&ie=UTF-8&sl=" from "&tl=" to "&q=" UrlEncode(text), , , , , proxy))["sentences"][1]["trans"]
+GoogleTranslate(text, from := "auto", to := "zh-CN", configs := {}) {
+    try result := JSON.Parse(Request("https://translate.google.com/translate_a/single?client=gtx&dt=t&dj=1&ie=UTF-8&sl=" from "&tl=" to "&q=" UrlEncode(text), , , , , configs.proxy))["sentences"][1]["trans"]
     if IsSet(result)
-        try result := JSON.Parse(Request("https://translate.googleapis.com/translate_a/single?client=gtx&dt=t&sl=" from "&tl=" to "&q=" UrlEncode(text), , , , , proxy))[1][1][1]
+        try result := JSON.Parse(Request("https://translate.googleapis.com/translate_a/single?client=gtx&dt=t&sl=" from "&tl=" to "&q=" UrlEncode(text), , , , , configs.proxy))[1][1][1]
     return IsSet(result) ? result : ""
 }