From c506a1f08febfb4aa70d48ea724e19ab7c708354 Mon Sep 17 00:00:00 2001 From: misyaguziya <53165965+misyaguziya@users.noreply.github.com> Date: Sat, 21 Dec 2024 00:57:50 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8D=EF=B8=8F[Update]=20Model=20:=20ove?= =?UTF-8?q?rlay=20large=20log=E3=81=AEsample=E3=82=A8=E3=83=B3=E3=83=89?= =?UTF-8?q?=E3=83=9D=E3=82=A4=E3=83=B3=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/model.py | 20 ++++++++++++++++++-- src-python/webui_controller.py | 10 +++++++++- src-python/webui_mainloop.py | 1 + 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src-python/model.py b/src-python/model.py index fa19b06c..c7f5f891 100644 --- a/src-python/model.py +++ b/src-python/model.py @@ -693,7 +693,7 @@ class Model: target_language = config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"] return self.overlay_image.createOverlayImageSmallLog(message, your_language, translation, target_language) - def createOverlayImageSystemMessage(self, message): + def createOverlayImageSmallMessage(self, message): ui_language = config.UI_LANGUAGE convert_languages = { "en": "Japanese", @@ -740,12 +740,28 @@ class Model: if (self.overlay.settings[size]["ui_scaling"] != config.OVERLAY_SMALL_LOG_SETTINGS["ui_scaling"]): self.overlay.updateUiScaling(config.OVERLAY_SMALL_LOG_SETTINGS["ui_scaling"], size) - def createOverlayImageLargeLog(self, message_type:str, message:str, translation:str): your_language = config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"] target_language = config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"] return self.overlay_image.createOverlayImageLargeLog(message_type, message, your_language, translation, target_language) + def createOverlayImageLargeMessage(self, message): + ui_language = config.UI_LANGUAGE + convert_languages = { + "en": "Japanese", + "jp": "Japanese", + "ko":"Korean", + "zh-Hans":"Chinese Simplified", + "zh-Hant":"Chinese Traditional", + } + language = convert_languages.get(ui_language, "Japanese") + overlay_image = OverlayImage() + + for _ in range(2): + overlay_image.createOverlayImageLargeLog("send", message, language) + overlay_image.createOverlayImageLargeLog("receive", message, language) + return overlay_image.createOverlayImageLargeLog("send", message, language) + def clearOverlayImageLargeLog(self): self.overlay.clearImage("large") diff --git a/src-python/webui_controller.py b/src-python/webui_controller.py index 1e7ba8dd..edec427f 100644 --- a/src-python/webui_controller.py +++ b/src-python/webui_controller.py @@ -1354,10 +1354,18 @@ class Controller: def sendTextOverlaySmallLog(data, *args, **kwargs) -> dict: if config.OVERLAY_SMALL_LOG is True: if model.overlay.initialized is True: - overlay_image = model.createOverlayImageSystemMessage(data) + overlay_image = model.createOverlayImageSmallMessage(data) model.updateOverlaySmallLog(overlay_image) return {"status":200, "result":data} + @staticmethod + def sendTextOverlayLargeLog(data, *args, **kwargs) -> dict: + if config.OVERLAY_LARGE_LOG is True: + if model.overlay.initialized is True: + overlay_image = model.createOverlayImageLargeMessage(data) + model.updateOverlayLargeLog(overlay_image) + return {"status":200, "result":data} + def swapYourLanguageAndTargetLanguage(self, *args, **kwargs) -> dict: your_languages = config.SELECTED_YOUR_LANGUAGES your_language_temp = your_languages[config.SELECTED_TAB_NO]["1"] diff --git a/src-python/webui_mainloop.py b/src-python/webui_mainloop.py index 18d1ff55..4850ccb2 100644 --- a/src-python/webui_mainloop.py +++ b/src-python/webui_mainloop.py @@ -89,6 +89,7 @@ mapping = { "/run/stop_typing_message_box": {"status": False, "variable":controller.stopTypingMessageBox}, "/run/send_text_overlay_small_log": {"status": True, "variable":controller.sendTextOverlaySmallLog}, + "/run/send_text_overlay_large_log": {"status": True, "variable":controller.sendTextOverlayLargeLog}, "/run/swap_your_language_and_target_language": {"status": True, "variable":controller.swapYourLanguageAndTargetLanguage},