up

keruiter · Feb 24, 2022 · 15b61b0 · 15b61b0
1 parent 562568d
commit 15b61b0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/app_data/conf_bak/conf.no5ix.json b/app_data/conf_bak/conf.no5ix.json
@@ -46,8 +46,8 @@
       "Bilibili": [
         "search.bilibili.com/all?keyword=REPLACEME"
       ],
-      "Jingdong": [
-        "https://search.jd.com/Search?keyword=REPLACEME&enc=utf-8"
+      "Google Translate": [
+        "https://translate.google.cn/?hl=zh-CN&tab=TT&sl=auto&tl=en&text=REPLACEME&op=translate"
       ],
       "Youdao": [
         "https://www.youdao.com/w/REPLACEME"
@@ -61,17 +61,17 @@
       "Youtube": [
         "https://www.youtube.com/results?search_query=REPLACEME"
       ],
-      "Pornhub": [
-        "https://www.pornhub.com/video/search?search=REPLACEME"
+      "Xvideos": [
+        "https://www.xvideos.com/?k=REPLACEME"
       ],
-      "Google Translate": [
-        "https://translate.google.cn/?hl=zh-CN&tab=TT&sl=auto&tl=en&text=REPLACEME&op=translate"
+      "Jingdong": [
+        "https://search.jd.com/Search?keyword=REPLACEME&enc=utf-8"
       ],
       "Youku": [
         "https://so.youku.com/search_video/q_REPLACEME?searchfrom=1"
       ],
-      "Xvideos": [
-        "https://www.xvideos.com/?k=REPLACEME"
+      "Pornhub": [
+        "https://www.pornhub.com/video/search?search=REPLACEME"
       ]
     },
     "custom": {}

diff --git a/source/common_const.ahk b/source/common_const.ahk
@@ -115,7 +115,8 @@ global auto_destory_quick_entry_gui_period := -28222  ; millisecond
 
 global tick_disable_win10_auto_interval := 66666
 
-global SEARCH_PLUS_SHORTCUT_KEY_INDEX_ARR := [" ", "q", "w", "a", "y", "d", "z", "b", "l", "t", "h", "j", "k", "x", "u", "i", "o", "p", "n", "m"]
+global SEARCH_PLUS_SHORTCUT_KEY_INDEX_ARR := [" ", "q", "w", "a", "y", "d", "z", "b", "l", "t", "h", "s", "k", "x", "j", "u", "i", "o", "p", "n", "m"]
+; global SEARCH_PLUS_SHORTCUT_KEY_INDEX_ARR := [" ", "a", "s", "d", "z", "x", "q", "w", "", "b", "l", "t", "h", "j", "k", "u", "i", "o", "p", "n", "m"]
 global CLIPBOARD_PLUS_SHORTCUT_KEY_INDEX_ARR := ["a", " ", "`t", "q", "w", "e", "r", "s", "f", "z", "x", "c", "g", "b", "t"]
 global SHORTCUT_KEY_INDEX_ARR_LEFT := ["q", "w", "e", "r", "a", "s", "d", "f", "z", "x", "c", "v", "b", "g", "t"]
 global SHORTCUT_KEY_INDEX_ARR_LEFT_HAS_SPACE_TAB := [" ", "`t", "q", "w", "r", "e", "a", "s", "d", "f", "z", "x", "c", "v", "b", "g", "t"]

diff --git a/source/quick_entry.ahk b/source/quick_entry.ahk
@@ -267,19 +267,23 @@ QuickEntry_ScreenShot_Suspend_Menu_Click:
 
 
 QuickEntry_Everything_Menu_Click:
+	st := current_selected_text
+	if (!current_selected_text) {
+		st := GetCurSelectedText()
+	}
 	Send, #!s
 	Sleep, 222
-	PasteContent(current_selected_text)
+	PasteContent(st)
 	Return
 
 
 QuickEntry_Translation_Menu_Click:
-	TranslateSeletedText(current_selected_text)
+	TranslateSeletedText(GetCurSelectedText())
 	Return
 
 
 QuickEntry_TransformText_Detail_Menu_click:
-	st := TransformText(current_selected_text, A_ThisMenuItemPos)
+	st := TransformText(GetCurSelectedText(), A_ThisMenuItemPos)
 	PasteContent(st)
 	Return