From ce0967f79dce2d4436b5f1a17dd8e88aa635bf07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=81=8D=E5=85=AE=E6=83=9A=E5=85=AE?= <101191390+HIllya51@users.noreply.github.com> Date: Thu, 13 Jun 2024 23:19:21 +0800 Subject: [PATCH] . --- LunaTranslator/LunaTranslator/gui/setting_display.py | 4 ---- LunaTranslator/LunaTranslator/myutils/utils.py | 7 ------- LunaTranslator/files/defaultconfig/config.json | 1 - LunaTranslator/files/lang/ar.json | 1 - LunaTranslator/files/lang/cht.json | 1 - LunaTranslator/files/lang/en.json | 1 - LunaTranslator/files/lang/es.json | 1 - LunaTranslator/files/lang/fr.json | 1 - LunaTranslator/files/lang/it.json | 1 - LunaTranslator/files/lang/ja.json | 1 - LunaTranslator/files/lang/ko.json | 1 - LunaTranslator/files/lang/pl.json | 1 - LunaTranslator/files/lang/ru.json | 1 - LunaTranslator/files/lang/th.json | 1 - LunaTranslator/files/lang/tr.json | 1 - LunaTranslator/files/lang/uk.json | 1 - LunaTranslator/files/lang/vi.json | 1 - LunaTranslator/files/lang/zh.json | 1 - 18 files changed, 27 deletions(-) diff --git a/LunaTranslator/LunaTranslator/gui/setting_display.py b/LunaTranslator/LunaTranslator/gui/setting_display.py index 50d40943..eb23faeb 100644 --- a/LunaTranslator/LunaTranslator/gui/setting_display.py +++ b/LunaTranslator/LunaTranslator/gui/setting_display.py @@ -21,10 +21,6 @@ def _xingw(): ("游戏最小化时窗口隐藏", 6), (D_getsimpleswitch(globalconfig, "minifollow"), 1), ], - [ - ("游戏失去焦点时窗口隐藏", 6), - (D_getsimpleswitch(globalconfig, "focusfollow"), 1), - ], [ ("游戏失去焦点时取消置顶", 6), (D_getsimpleswitch(globalconfig, "focusnotop"), 1), diff --git a/LunaTranslator/LunaTranslator/myutils/utils.py b/LunaTranslator/LunaTranslator/myutils/utils.py index 5dad249c..3397cc2a 100644 --- a/LunaTranslator/LunaTranslator/myutils/utils.py +++ b/LunaTranslator/LunaTranslator/myutils/utils.py @@ -474,13 +474,6 @@ def minmaxmoveobservefunc(self): _focusp = windows.GetWindowThreadProcessId(hwnd) if event == windows.EVENT_SYSTEM_FOREGROUND: - if globalconfig["focusfollow"]: - if _focusp == os.getpid(): - pass - elif _focusp in gobject.baseobject.textsource.pids: - self.hookfollowsignal.emit(3, (hwnd,)) - else: - self.hookfollowsignal.emit(4, (0, 0)) if globalconfig["keepontop"] and globalconfig["focusnotop"]: if _focusp == os.getpid(): pass diff --git a/LunaTranslator/files/defaultconfig/config.json b/LunaTranslator/files/defaultconfig/config.json index 8aacebca..96902016 100644 --- a/LunaTranslator/files/defaultconfig/config.json +++ b/LunaTranslator/files/defaultconfig/config.json @@ -1712,7 +1712,6 @@ "magpiepath": "", "minifollow": false, "movefollow": false, - "focusfollow": false, "focusnotop": false, "autostarthook": true, "minlength": 0, diff --git a/LunaTranslator/files/lang/ar.json b/LunaTranslator/files/lang/ar.json index e5b56f35..7fca0fab 100644 --- a/LunaTranslator/files/lang/ar.json +++ b/LunaTranslator/files/lang/ar.json @@ -40,7 +40,6 @@ "添加游戏": "إضافة لعبة", "连接进程": "عملية الاتصال", "越南语(CP1258)": "الفيتنامية ( cp1258 ) .", - "游戏失去焦点时窗口隐藏": "لعبة نافذة مخفية عندما يفقد التركيز", "选择游戏": "اختيار اللعبة", "百度": "بايدو .", "東北イタコ/东北伊达子": "شمال شرق イコ / شمال شرق عدن", diff --git a/LunaTranslator/files/lang/cht.json b/LunaTranslator/files/lang/cht.json index 75c10663..8299d3a6 100644 --- a/LunaTranslator/files/lang/cht.json +++ b/LunaTranslator/files/lang/cht.json @@ -113,7 +113,6 @@ "显示保存的游戏按钮": "顯示保存的遊戲按鈕", "显示游戏静音按钮": "顯示遊戲靜音按鈕", "游戏最小化时窗口隐藏": "遊戲最小化時視窗隱藏", - "游戏失去焦点时窗口隐藏": "遊戲失去焦點時視窗隱藏", "游戏窗口移动时同步移动": "遊戲視窗移動時同步移動", "固定窗口尺寸": "固定視窗尺寸", "翻译结果繁简体显示": "翻譯結果繁簡體顯示", diff --git a/LunaTranslator/files/lang/en.json b/LunaTranslator/files/lang/en.json index 26c1c786..e9be9dd2 100644 --- a/LunaTranslator/files/lang/en.json +++ b/LunaTranslator/files/lang/en.json @@ -42,7 +42,6 @@ "缩放时禁用窗口大小调整": "Disable window resizing when zooming", "导出sqlite文件为json文件": "Export sqlite file as json file", "图标": "Icon", - "游戏失去焦点时窗口隐藏": "The window is hidden when the game loses focus", "指示詞": "Deictic word", "基本设置": "Basic settings", "搜索": "search", diff --git a/LunaTranslator/files/lang/es.json b/LunaTranslator/files/lang/es.json index 9f655e63..7597ffd2 100644 --- a/LunaTranslator/files/lang/es.json +++ b/LunaTranslator/files/lang/es.json @@ -113,7 +113,6 @@ "显示保存的游戏按钮": "Muestra el botón de juego guardado", "显示游戏静音按钮": "Muestra el botón de silencio del juego", "游戏最小化时窗口隐藏": "Ventanas ocultas al minimizar el juego", - "游戏失去焦点时窗口隐藏": "La ventana se oculta cuando el juego pierde el foco", "游戏窗口移动时同步移动": "La ventana del juego se mueve simultáneamente cuando se mueve", "固定窗口尺寸": "Tamaño de la ventana fija", "翻译结果繁简体显示": "Visualización simplificada de los resultados de la traducción", diff --git a/LunaTranslator/files/lang/fr.json b/LunaTranslator/files/lang/fr.json index 8a8632ae..790e26c5 100644 --- a/LunaTranslator/files/lang/fr.json +++ b/LunaTranslator/files/lang/fr.json @@ -113,7 +113,6 @@ "显示保存的游戏按钮": "Afficher les boutons de jeu enregistrés", "显示游戏静音按钮": "Afficher le bouton mute du jeu", "游戏最小化时窗口隐藏": "Fenêtre cachée lorsque le jeu est minimisé", - "游戏失去焦点时窗口隐藏": "Fenêtre cachée lorsque le jeu perd son focus", "游戏窗口移动时同步移动": "Synchroniser le mouvement lorsque la fenêtre de jeu se déplace", "固定窗口尺寸": "Taille fixe de la fenêtre", "翻译结果繁简体显示": "Affichage simplifié des résultats de la traduction", diff --git a/LunaTranslator/files/lang/it.json b/LunaTranslator/files/lang/it.json index 0a0478bc..a351b4c3 100644 --- a/LunaTranslator/files/lang/it.json +++ b/LunaTranslator/files/lang/it.json @@ -107,7 +107,6 @@ "空心线宽": "Larghezza della linea vuota", "描边宽度": "Larghezza tratto", "游戏最小化时窗口隐藏": "Nascondi finestra quando il gioco è minimizzato", - "游戏失去焦点时窗口隐藏": "Finestra nascosta quando il gioco perde fuoco", "游戏窗口移动时同步移动": "Sincronizza il movimento quando la finestra di gioco si muove", "固定窗口尺寸": "Dimensione finestra fissa", "翻译结果繁简体显示": "Visualizzazione tradizionale e semplificata dei risultati della traduzione", diff --git a/LunaTranslator/files/lang/ja.json b/LunaTranslator/files/lang/ja.json index 21dd06e6..9bf3c20f 100644 --- a/LunaTranslator/files/lang/ja.json +++ b/LunaTranslator/files/lang/ja.json @@ -113,7 +113,6 @@ "显示保存的游戏按钮": "保存したゲームボタンを表示", "显示游戏静音按钮": "ゲームミュートボタンを表示", "游戏最小化时窗口隐藏": "ゲーム最小化時にウィンドウを隠す", - "游戏失去焦点时窗口隐藏": "ゲームがフォーカスを失ったときにウィンドウを隠す", "游戏窗口移动时同步移动": "ゲームウィンドウ移動時に同期移動", "固定窗口尺寸": "固定ウィンドウサイズ", "翻译结果繁简体显示": "翻訳結果の簡体字表示", diff --git a/LunaTranslator/files/lang/ko.json b/LunaTranslator/files/lang/ko.json index 975aa128..cb3b21d3 100644 --- a/LunaTranslator/files/lang/ko.json +++ b/LunaTranslator/files/lang/ko.json @@ -113,7 +113,6 @@ "显示保存的游戏按钮": "저장된 게임 단추 보이기", "显示游戏静音按钮": "게임 무음 버튼 보이기", "游戏最小化时窗口隐藏": "게임을 최소화할 때 창 숨기기", - "游戏失去焦点时窗口隐藏": "게임이 포커스를 잃었을 때 창 숨기기", "游戏窗口移动时同步移动": "게임 창 이동 시 동기화", "固定窗口尺寸": "고정 창 크기", "翻译结果繁简体显示": "번역 결과 요약 표시", diff --git a/LunaTranslator/files/lang/pl.json b/LunaTranslator/files/lang/pl.json index 27437ad7..020b5594 100644 --- a/LunaTranslator/files/lang/pl.json +++ b/LunaTranslator/files/lang/pl.json @@ -113,7 +113,6 @@ "显示保存的游戏按钮": "Pokaż zapisane przyciski gry", "显示游戏静音按钮": "Pokaż przycisk wyciszenia gry", "游戏最小化时窗口隐藏": "Ukryj okno, gdy gra jest zminimalizowana", - "游戏失去焦点时窗口隐藏": "Okno ukryte, gdy gra traci skupienie", "游戏窗口移动时同步移动": "Synchronizuj ruch podczas poruszania się okna gry", "固定窗口尺寸": "Stały rozmiar okna", "翻译结果繁简体显示": "Tradycyjne i uproszczone wyświetlanie wyników tłumaczeń", diff --git a/LunaTranslator/files/lang/ru.json b/LunaTranslator/files/lang/ru.json index 3b96a8f3..3c320b8b 100644 --- a/LunaTranslator/files/lang/ru.json +++ b/LunaTranslator/files/lang/ru.json @@ -113,7 +113,6 @@ "显示保存的游戏按钮": "Кнопка сохраненные игры", "显示游戏静音按钮": "Кнопка звука в игре", "游戏最小化时窗口隐藏": "Скрыть окно при сворачивании игры", - "游戏失去焦点时窗口隐藏": "Игра не фокусируется при скрытии окна", "游戏窗口移动时同步移动": "Синхронизировать перемещение окна игры", "固定窗口尺寸": "Фиксированный размер окна", "翻译结果繁简体显示": "Отображение результатов перевода", diff --git a/LunaTranslator/files/lang/th.json b/LunaTranslator/files/lang/th.json index 34e3e8fa..4715dc92 100644 --- a/LunaTranslator/files/lang/th.json +++ b/LunaTranslator/files/lang/th.json @@ -511,7 +511,6 @@ "移动": "มือถือ", "类型": "ประเภท", "繁体中文": "ภาษาจีนดั้งเดิม", - "游戏失去焦点时窗口隐藏": "ซ่อนหน้าต่างเมื่อเกมเสียโฟกัส", "替换": "แทนที่", "绘制光标": "วาดเคอร์เซอร์", "颜色设置": "การตั้งค่าสี", diff --git a/LunaTranslator/files/lang/tr.json b/LunaTranslator/files/lang/tr.json index 2823bc37..9c58a49b 100644 --- a/LunaTranslator/files/lang/tr.json +++ b/LunaTranslator/files/lang/tr.json @@ -113,7 +113,6 @@ "显示保存的游戏按钮": "Kaydedilen oyun düğmelerini göster", "显示游戏静音按钮": "Oyun sessiz düğmesini göster", "游戏最小化时窗口隐藏": "Oyun azaltıldığında gizlenen pencere", - "游戏失去焦点时窗口隐藏": "Oyun fokus kaybettiğinde pencere gizlenmiştir.", "游戏窗口移动时同步移动": "Oyun penceresi hareket ettiğinde eşzamanlı hareket et", "固定窗口尺寸": "Tam pencere ölçüsi", "翻译结果繁简体显示": "Çeviri sonuçlarının geleneksel ve basitleştirilmesi", diff --git a/LunaTranslator/files/lang/uk.json b/LunaTranslator/files/lang/uk.json index 17fbbd5d..fa5624ec 100644 --- a/LunaTranslator/files/lang/uk.json +++ b/LunaTranslator/files/lang/uk.json @@ -107,7 +107,6 @@ "空心线宽": "Ширина порожніх ліній", "描边宽度": "Ширина", "游戏最小化时窗口隐藏": "Сховати вікно під час мінімізації гри", - "游戏失去焦点时窗口隐藏": "Вікно приховане, коли гра втрачає фокус", "游戏窗口移动时同步移动": "Синхронізувати рух під час пересування вікна гри", "固定窗口尺寸": "Визначений розмір вікна", "翻译结果繁简体显示": "Традиційний і спрощений показ результатів перекладу", diff --git a/LunaTranslator/files/lang/vi.json b/LunaTranslator/files/lang/vi.json index bcdfc2f0..3460a574 100644 --- a/LunaTranslator/files/lang/vi.json +++ b/LunaTranslator/files/lang/vi.json @@ -113,7 +113,6 @@ "显示保存的游戏按钮": "Hiển thị nút trò chơi đã lưu", "显示游戏静音按钮": "Hiện nút tắt tiếng trò chơi", "游戏最小化时窗口隐藏": "Cửa sổ ẩn khi trò chơi được thu nhỏ", - "游戏失去焦点时窗口隐藏": "Cửa sổ ẩn khi trò chơi mất tập trung", "游戏窗口移动时同步移动": "Đồng bộ di chuyển khi cửa sổ trò chơi di chuyển", "固定窗口尺寸": "Kích thước cửa sổ cố định", "翻译结果繁简体显示": "Kết quả phiên dịch Hiển thị đơn giản", diff --git a/LunaTranslator/files/lang/zh.json b/LunaTranslator/files/lang/zh.json index c94ee122..f5110ea3 100644 --- a/LunaTranslator/files/lang/zh.json +++ b/LunaTranslator/files/lang/zh.json @@ -508,7 +508,6 @@ "移动": "", "类型": "", "繁体中文": "", - "游戏失去焦点时窗口隐藏": "", "替换": "", "绘制光标": "", "颜色设置": "",