Merge branch 'HIllya51:main' into xx

.github/ISSUE_TEMPLATE/01_bug.yaml

@@ -32,10 +32,10 @@ body:
 
 - type: textarea
   attributes:
-    label: Log files 日志文件
+    label: Log file 日志文件
     description: >
-      View log files in the "logs" directory. Please upload the log file as an attachment instead of copying its contents.
+      Run LunaTranslator_debug.exe to reproduce the error, and then upload the generated log_*.txt file.
       
-      在"logs"目录中获取日志文件。请将日志文件以附件的形式上传，而不是将其中的内容复制。
+      运行LunaTranslator_debug.exe复现错误，然后上传产生的log_*.txt文件。
   validations:
     required: true

.gitignore

@@ -43,3 +43,4 @@ LunaTranslator/run3832.bat
 LunaTranslator/logs
 LunaTranslator/LunaTranslator/.vscode/settings.json
 .vscode/settings.json
+LunaTranslator/translation_record

LunaTranslator/LunaTranslator/LunaTranslator.py

@@ -310,16 +310,17 @@ def textgetmethod_1(
         currentsignature = uuid.uuid4()
         if not waitforresultcallback:
             self.currentsignature = currentsignature
-        try:
-            origin = text
-            text = POSTSOLVE(text)
-            self.settin_ui.showandsolvesig.emit(origin, text)
-        except Exception as e:
-            msg = str(type(e))[8:-2] + " " + str(e).replace("\n", "").replace("\r", "")
-            self.translation_ui.displaystatus.emit(msg, True, True)
-            return
-        if not text:
-            return
+            # 内嵌&文件翻译不要进行文本预处理
+            try:
+                origin = text
+                text = POSTSOLVE(text)
+                self.settin_ui.showandsolvesig.emit(origin, text)
+                if not text:
+                    return
+            except Exception as e:
+                self.translation_ui.displaystatus.emit(stringfyerror(e), True, True)
+                return
+
         if is_auto_run and (
             len(text) < globalconfig["minlength"]
             or len(text) > globalconfig["maxlength"]
@@ -368,7 +369,7 @@ def textgetmethod_1(
         self.transhis.getnewsentencesignal.emit(text)
         self.maybesetedittext(text)
 
-        if not globalconfig["showfanyi"]:
+        if not waitforresultcallback and not globalconfig["showfanyi"]:
             return _showrawfunction()
 
         text_solved, optimization_params = self.solvebeforetrans(text)

LunaTranslator/LunaTranslator/LunaTranslator_main.py

@@ -188,60 +188,16 @@ def switchdir():
         pass
 
 
-class Lockedfile:
-    def __init__(self) -> None:
-        self.collect = queue.Queue()
-        threading.Thread(target=self.__write).start()
-
-    def __write(self):
-        data = self.collect.get()
-        os.makedirs("logs", exist_ok=True)
-        file = open(
-            f"logs/{time.strftime('%Y-%m-%d-%H-%M-%S', time.localtime())}.txt",
-            "w",
-            encoding="utf8",
-            errors="ignore",
-        )
-        while True:
-            file.write(data)
-            file.flush()
-            data = self.collect.get()
-
-    def write(self, data):
-        self.collect.put(data)
-
-
-lockedfile = Lockedfile()
-
-
-class debugoutput(io.IOBase):
-    def __init__(self, file: io.TextIOBase) -> None:
-        super().__init__()
-        self.originfile = file
-
-    def write(self, data):
-        self.originfile.write(data)
-        lockedfile.write(data)
-
-    def flush(self):
-        self.originfile.flush()
-
-
-def savelogs():
-    sys.stderr = debugoutput(sys.stderr)
-    sys.stdout = debugoutput(sys.stdout)
-
-
 def urlprotocol():
     import argparse, gobject, sys
     from urllib.parse import urlsplit
     from traceback import print_exc
 
     parser = argparse.ArgumentParser()
     parser.add_argument("--URLProtocol", required=False)
-    args = parser.parse_args()
-    URLProtocol: str = args.URLProtocol
     try:
+        args = parser.parse_args()
+        URLProtocol: str = args.URLProtocol
         if URLProtocol:
             print(URLProtocol)
             result = urlsplit(URLProtocol)
@@ -266,7 +222,6 @@ def urlprotocol():
     checklang()
     checkintegrity()
     checkpermission()
-    savelogs()
     urlprotocol()
     loadmainui()
     app.exit(app.exec())

LunaTranslator/LunaTranslator/gui/selecthook.py

@@ -680,7 +680,7 @@ def setupUi(self):
         self.vboxlayout.addWidget(self.tabwidget)
         self.tabwidget.setTabPosition(QTabWidget.TabPosition.East)
         self.tabwidget.addTab(self.textOutput, ("文本"))
-        self.tabwidget.addTab(self.sysOutput, ("系统"))
+        self.tabwidget.addTab(self.sysOutput, ("日志"))
 
     def showmenu(self, p: QPoint):
         r = self.tttable.currentIndex().row()
@@ -729,14 +729,16 @@ def gethide(self, res):
 
         if self.checkfilt_notcontrol.isChecked():
             lres = list(res)
-
             for r in lres:
                 _ord = ord(r)
-                if _ord < 0x20 or (_ord > 0x80 and _ord < 0xA0):
-
+                if (
+                    (_ord >= 0x21 and _ord <= 0x2F)
+                    or (_ord >= 0x3A and _ord <= 0x40)
+                    or (_ord >= 0x5B and _ord <= 0x60)
+                    or (_ord >= 0x7B and _ord <= 0x7E)
+                ):
                     hide = True
                     break
-
         return hide
 
     def searchtextfunc2(self):

LunaTranslator/LunaTranslator/gui/setting_display_buttons.py

@@ -9,6 +9,7 @@
     getIconButton,
     makescrollgrid,
     D_getsimpleswitch,
+    getsmalllabel,
 )
 from gui.dynalang import LDialog
 
@@ -33,7 +34,7 @@ def __init__(self, parent, dict, key) -> None:
                 getIconButton(
                     functools.partial(self.selectcallback, "fa." + name),
                     qicon=qtawesome.icon(
-                        "fa." + name, color=globalconfig["buttoncolor"]
+                        "fa." + name, color=globalconfig["buttoncolor2"]
                     ),
                 ),
                 i // 30,
@@ -81,7 +82,7 @@ def changerank(item, up, sortlist, savelist, savelay):
 
 def createbuttonwidget(self, lay):
     # return table
-    grids = [["显示", "", "", "对齐", "图标", "图标2", "说明"]]
+    grids = [["显示", "", "", "对齐", "", "图标", "", "图标2", "", "说明"]]
     sortlist = globalconfig["toolbutton"]["rank2"]
     savelist = []
     savelay = []
@@ -116,6 +117,7 @@ def createbuttonwidget(self, lay):
                 callback=doadjust,
                 fixedsize=True,
             ),
+            getsmalllabel(),
             D_getIconButton(
                 functools.partial(
                     dialog_selecticon,
@@ -125,9 +127,10 @@ def createbuttonwidget(self, lay):
                 ),
                 qicon=qtawesome.icon(
                     globalconfig["toolbutton"]["buttons"][k]["icon"],
-                    color=globalconfig["buttoncolor"],
+                    color=globalconfig["buttoncolor2"],
                 ),
             ),
+            getsmalllabel(),
         ]
         if "icon2" in globalconfig["toolbutton"]["buttons"][k]:
             l.append(
@@ -140,12 +143,13 @@ def createbuttonwidget(self, lay):
                     ),
                     qicon=qtawesome.icon(
                         globalconfig["toolbutton"]["buttons"][k]["icon2"],
-                        color=globalconfig["buttoncolor"],
+                        color=globalconfig["buttoncolor2"],
                     ),
                 ),
             )
         else:
             l.append("")
+        l.append(getsmalllabel())
         if "belong" in globalconfig["toolbutton"]["buttons"][k]:
             belong = (
                 "_"

LunaTranslator/LunaTranslator/gui/setting_textinput_ocr.py

@@ -82,7 +82,7 @@ def __init__(self, parent) -> None:
         table.setSelectionMode((QAbstractItemView.SelectionMode.SingleSelection))
         table.setWordWrap(False)
         table.setModel(model)
-
+        table.getindexdata = self.__getindexwidgetdata
         table.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
         table.customContextMenuRequested.connect(self.showmenu)
         self.hctable = table
@@ -109,6 +109,9 @@ def __init__(self, parent) -> None:
         self.resize(600, self.sizeHint().height())
         self.show()
 
+    def __getindexwidgetdata(self, index: QModelIndex):
+        return self.hctable.indexWidgetX(index).currentIndex()
+
     def closeEvent(self, a0: QCloseEvent) -> None:
         rows = self.hcmodel.rowCount()
         self.list.clear()

LunaTranslator/LunaTranslator/gui/translatorUI.py

@@ -13,7 +13,13 @@
     makehtml,
     loadpostsettingwindowmethod_maybe,
 )
-from myutils.hwnd import mouseselectwindow, grabwindow, getExeIcon, getcurrexe
+from myutils.hwnd import (
+    mouseselectwindow,
+    grabwindow,
+    getExeIcon,
+    getcurrexe,
+    hwndratex,
+)
 from gui.setting_about import doupdate
 from gui.dialog_memory import dialog_memory
 from gui.textbrowser import Textbrowser
@@ -252,8 +258,8 @@ class TranslatorWindow(resizableframeless):
     move_signal = pyqtSignal(QPoint)
     closesignal = pyqtSignal()
     hotkeyuse_selectprocsignal = pyqtSignal()
-    changeshowhiderawsig=pyqtSignal()
-    changeshowhidetranssig=pyqtSignal()
+    changeshowhiderawsig = pyqtSignal()
+    changeshowhidetranssig = pyqtSignal()
 
     @threader
     def tracewindowposthread(self):
@@ -284,11 +290,12 @@ def tracewindowposthread(self):
             if not rect:
                 lastpos = None
                 continue
+            rate = hwndratex(hwnd)
             rect = QRect(
-                int(rect[0] / self.devicePixelRatioF()),
-                int(rect[1] / self.devicePixelRatioF()),
-                int((rect[2] - rect[0]) / self.devicePixelRatioF()),
-                int((rect[3] - rect[1]) / self.devicePixelRatioF()),
+                int(rect[0] / rate),
+                int(rect[1] / rate),
+                int((rect[2] - rect[0]) / rate),
+                int((rect[3] - rect[1]) / rate),
             )
             if not lastpos:
                 lastpos = rect

LunaTranslator/LunaTranslator/gui/usefulwidget.py

@@ -1016,7 +1016,7 @@ def __getsmalllabel(text):
     return __
 
 
-def getsmalllabel(text):
+def getsmalllabel(text=""):
     return lambda: __getsmalllabel(text)
 
 

LunaTranslator/LunaTranslator/myutils/commonbase.py

@@ -1,13 +1,13 @@
 from myutils.proxy import getproxy
-from myutils.utils import getlangtgt, getlangsrc
+from myutils.utils import getlangtgt, getlangsrc, getlanguagespace
 from myutils.config import _TR, static_data
 from myutils.wrapper import stripwrapper
 import requests
 
 
 class ArgsEmptyExc(Exception):
     def __init__(self, valuelist) -> None:
-        super().__init__(" , ".join(valuelist) + _TR("不能为空"))
+        super().__init__(" , ".join(valuelist) + getlanguagespace() + _TR("不能为空"))
 
 
 class proxysession(requests.Session):

LunaTranslator/LunaTranslator/myutils/hwnd.py

@@ -266,11 +266,16 @@ def safepixmap(bs):
     return pixmap
 
 
+def hwndratex(hwnd):
+    _dpi = windows.GetDpiForWindow(hwnd)
+    mdpi = winsharedutils.GetMonitorDpiScaling(hwnd)
+    return mdpi / _dpi
+
+
 def gdi_screenshot(x1, y1, x2, y2, hwnd=None):
     if hwnd:
-        _r = QApplication.instance().devicePixelRatio()
-        _dpi = windows.GetDpiForWindow(hwnd)
-        x1, y1, x2, y2 = (int(_ * _dpi / 96 / _r) for _ in (x1, y1, x2, y2))
+        rate = hwndratex(hwnd)
+        x1, y1, x2, y2 = (int(_ / rate) for _ in (x1, y1, x2, y2))
     bs = winsharedutils.gdi_screenshot(x1, y1, x2, y2, hwnd)
     return safepixmap(bs)
 

LunaTranslator/LunaTranslator/myutils/utils.py

@@ -87,7 +87,9 @@ def getlangtgt():
     return __internal__getlang("private_tgtlang_2", "tgtlang4")
 
 
-def getlanguagespace(lang):
+def getlanguagespace(lang=None):
+    if lang is None:
+        lang = getlanguse()
     return "" if (lang in ("zh", "ja", "cht")) else " "
 
 
@@ -917,11 +919,22 @@ def checkv1(api_url: str):
         return api_url + "/v1"
 
 
+def urlpathjoin(*argc):
+    urlx = []
+    for i, u in enumerate(argc):
+        if u.startswith("/") and i != 0:
+            u = u[1:]
+        if u.endswith("/") and i != len(argc) - 1:
+            u = u[:-1]
+        urlx.append(u)
+    return "/".join(urlx)
+
+
 def createurl(url: str):
     if url.endswith("/chat/completions"):
         pass
     else:
-        url = checkv1(url) + "/chat/completions"
+        url = urlpathjoin(checkv1(url), "/chat/completions")
     return url