From dfbc1f92e7084a5f9f2497e0f09d7ce6bc40c84f Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Sun, 1 Sep 2024 23:14:20 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=91=EF=B8=8F[Remove]=20Model=20:=20rem?= =?UTF-8?q?ove=20xsoverlay=20module?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/config.py | 12 ------------ src-python/model.py | 3 --- src-python/webui_controller.py | 14 -------------- src-python/webui_mainloop.py | 1 - 4 files changed, 30 deletions(-) diff --git a/src-python/config.py b/src-python/config.py index 64ba9166..ada54333 100644 --- a/src-python/config.py +++ b/src-python/config.py @@ -769,17 +769,6 @@ class Config: self._SEND_MESSAGE_BUTTON_TYPE = value saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) - @property - @json_serializable('ENABLE_NOTICE_XSOVERLAY') - def ENABLE_NOTICE_XSOVERLAY(self): - return self._ENABLE_NOTICE_XSOVERLAY - - @ENABLE_NOTICE_XSOVERLAY.setter - def ENABLE_NOTICE_XSOVERLAY(self, value): - if isinstance(value, bool): - self._ENABLE_NOTICE_XSOVERLAY = value - saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) - @property @json_serializable('OVERLAY_SETTINGS') def OVERLAY_SETTINGS(self): @@ -1116,7 +1105,6 @@ class Config: self._ENABLE_AUTO_CLEAR_MESSAGE_BOX = True self._ENABLE_SEND_ONLY_TRANSLATED_MESSAGES = False self._SEND_MESSAGE_BUTTON_TYPE = "show" - self._ENABLE_NOTICE_XSOVERLAY = False self._OVERLAY_SETTINGS = { "opacity": 1.0, "ui_scaling": 1.0, diff --git a/src-python/model.py b/src-python/model.py index d446b2c1..4f36f95a 100644 --- a/src-python/model.py +++ b/src-python/model.py @@ -672,9 +672,6 @@ class Model: self.speaker_energy_recorder.stop() self.speaker_energy_recorder = None - def notificationXSOverlay(self, message): - xsoverlayForVRCT(content=f"{message}") - def createOverlayImageShort(self, message, translation): your_language = config.TARGET_LANGUAGE target_language = config.SOURCE_LANGUAGE diff --git a/src-python/webui_controller.py b/src-python/webui_controller.py index a162ad97..3296be35 100644 --- a/src-python/webui_controller.py +++ b/src-python/webui_controller.py @@ -224,10 +224,6 @@ class SpeakerMessage: }) if config.ENABLE_TRANSCRIPTION_RECEIVE is True: - if config.ENABLE_NOTICE_XSOVERLAY is True: - xsoverlay_message = messageFormatter("RECEIVED", translation, message) - model.notificationXSOverlay(xsoverlay_message) - if config.ENABLE_OVERLAY_SMALL_LOG is True: if model.overlay.initialized is True: overlay_image = model.createOverlayImageShort(message, translation) @@ -1173,16 +1169,6 @@ def callbackSetSendMessageButtonType(data, *args, **kwargs) -> dict: config.SEND_MESSAGE_BUTTON_TYPE = data return {"status":200, "result":config.SEND_MESSAGE_BUTTON_TYPE} -def callbackEnableNoticeXsoverlay(*args, **kwargs) -> dict: - printLog("Enable Notice Xsoverlay") - config.ENABLE_NOTICE_XSOVERLAY = True - return {"status":200, "result":config.ENABLE_NOTICE_XSOVERLAY} - -def callbackDisableNoticeXsoverlay(*args, **kwargs) -> dict: - printLog("Disable Notice Xsoverlay") - config.ENABLE_NOTICE_XSOVERLAY = False - return {"status":200, "result":config.ENABLE_NOTICE_XSOVERLAY} - def callbackEnableAutoExportMessageLogs(*args, **kwargs) -> dict: printLog("Enable Auto Export Message Logs") config.ENABLE_LOGGER = True diff --git a/src-python/webui_mainloop.py b/src-python/webui_mainloop.py index 5d429f19..fabf397a 100644 --- a/src-python/webui_mainloop.py +++ b/src-python/webui_mainloop.py @@ -73,7 +73,6 @@ config_mapping = { "/config/enable_auto_clear_message_box": "ENABLE_AUTO_CLEAR_MESSAGE_BOX", "/config/enable_send_only_translated_messages": "ENABLE_SEND_ONLY_TRANSLATED_MESSAGES", "/config/send_message_button_type": "SEND_MESSAGE_BUTTON_TYPE", - "/config/enable_notice_xsoverlay": "ENABLE_NOTICE_XSOVERLAY", "/config/overlay_settings": "OVERLAY_SETTINGS", "/config/enable_overlay_small_log": "ENABLE_OVERLAY_SMALL_LOG", "/config/overlay_small_log_settings": "OVERLAY_SMALL_LOG_SETTINGS",