From 7336d014692ac924217b930665859d888a04e579 Mon Sep 17 00:00:00 2001 From: misyaguziya <53165965+misyaguziya@users.noreply.github.com> Date: Fri, 9 Jan 2026 19:35:55 +0900 Subject: [PATCH] =?UTF-8?q?[Update]=20=E3=82=AF=E3=83=AA=E3=83=83=E3=83=97?= =?UTF-8?q?=E3=83=9C=E3=83=BC=E3=83=89=E6=A9=9F=E8=83=BD=E3=81=AE=E7=B5=B1?= =?UTF-8?q?=E5=90=88:=20=E3=82=B3=E3=83=94=E3=83=BC=E3=81=8A=E3=82=88?= =?UTF-8?q?=E3=81=B3=E3=83=9A=E3=83=BC=E3=82=B9=E3=83=88=E3=81=AE=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E3=82=92=E4=B8=80=E3=81=A4=E3=81=AE=E3=83=97=E3=83=AD?= =?UTF-8?q?=E3=83=91=E3=83=86=E3=82=A3=E3=81=AB=E3=81=BE=E3=81=A8=E3=82=81?= =?UTF-8?q?=E3=80=81=E9=96=A2=E9=80=A3=E3=81=99=E3=82=8B=E3=83=A1=E3=82=BD?= =?UTF-8?q?=E3=83=83=E3=83=89=E3=82=92=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/config.py | 8 +++---- src-python/controller.py | 46 ++++++++++++---------------------------- src-python/mainloop.py | 9 +++----- 3 files changed, 21 insertions(+), 42 deletions(-) diff --git a/src-python/config.py b/src-python/config.py index e7420e36..f9602a67 100644 --- a/src-python/config.py +++ b/src-python/config.py @@ -757,8 +757,7 @@ class Config: SELECTED_TRANSCRIPTION_COMPUTE_DEVICE = ValidatedProperty('SELECTED_TRANSCRIPTION_COMPUTE_DEVICE', _compute_device_validator) # -- Clipboard control --- - ENABLE_COPY_TO_CLIPBOARD = ManagedProperty('ENABLE_COPY_TO_CLIPBOARD', type_=bool) - ENABLE_PASTE_FROM_CLIPBOARD = ManagedProperty('ENABLE_PASTE_FROM_CLIPBOARD', type_=bool) + ENABLE_CLIPBOARD = ManagedProperty('ENABLE_CLIPBOARD', type_=bool) def init_config(self): # Read Only @@ -1026,10 +1025,10 @@ class Config: self._WEBSOCKET_SERVER = False self._WEBSOCKET_HOST = "127.0.0.1" self._WEBSOCKET_PORT = 2231 - self._ENABLE_COPY_TO_CLIPBOARD = False - self._ENABLE_PASTE_FROM_CLIPBOARD = False + self._ENABLE_CLIPBOARD = False def load_config(self): + self._config_data = {} if os_path.isfile(self.PATH_CONFIG) is not False: with open(self.PATH_CONFIG, 'r', encoding="utf-8") as fp: if fp.readable() and fp.seek(0, 2) > 0: @@ -1054,6 +1053,7 @@ class Config: continue except Exception: errorLogging() + self.saveConfigToFile() def revalidate_selected_models(self): diff --git a/src-python/controller.py b/src-python/controller.py index 535653b6..d233c440 100644 --- a/src-python/controller.py +++ b/src-python/controller.py @@ -406,11 +406,10 @@ class Controller: ) model.updateOverlayLargeLog(overlay_image) - if config.ENABLE_COPY_TO_CLIPBOARD is True: + if config.ENABLE_CLIPBOARD is True: clipboard_message = self.messageFormatter("SEND", translation, message) model.setCopyToClipboard(clipboard_message) - if config.ENABLE_PASTE_FROM_CLIPBOARD is True: - model.setPasteFromClipboard() + model.setPasteFromClipboard() if model.checkWebSocketServerAlive() is True: model.websocketSendMessage( @@ -758,11 +757,10 @@ class Controller: ) model.updateOverlayLargeLog(overlay_image) - if config.ENABLE_COPY_TO_CLIPBOARD is True: + if config.ENABLE_CLIPBOARD is True: clipboard_message = self.messageFormatter("SEND", translation, message) model.setCopyToClipboard(clipboard_message) - if config.ENABLE_PASTE_FROM_CLIPBOARD is True: - model.setPasteFromClipboard() + model.setPasteFromClipboard() if model.checkWebSocketServerAlive() is True: model.websocketSendMessage( @@ -3042,36 +3040,20 @@ class Controller: # Clipboard control @staticmethod - def getCopyToClipboard(*args, **kwargs) -> dict: - return {"status":200, "result":config.ENABLE_COPY_TO_CLIPBOARD} + def getClipboard(*args, **kwargs) -> dict: + return {"status":200, "result":config.ENABLE_CLIPBOARD} @staticmethod - def setEnableCopyToClipboard(*args, **kwargs) -> dict: - if config.ENABLE_COPY_TO_CLIPBOARD is False: - config.ENABLE_COPY_TO_CLIPBOARD = True - return {"status":200, "result":config.ENABLE_COPY_TO_CLIPBOARD} + def setEnableClipboard(*args, **kwargs) -> dict: + if config.ENABLE_CLIPBOARD is False: + config.ENABLE_CLIPBOARD = True + return {"status":200, "result":config.ENABLE_CLIPBOARD} @staticmethod - def setDisableCopyToClipboard(*args, **kwargs) -> dict: - if config.ENABLE_COPY_TO_CLIPBOARD is True: - config.ENABLE_COPY_TO_CLIPBOARD = False - return {"status":200, "result":config.ENABLE_COPY_TO_CLIPBOARD} - - @staticmethod - def getPasteFromClipboard(*args, **kwargs) -> dict: - return {"status":200, "result":config.ENABLE_PASTE_FROM_CLIPBOARD} - - @staticmethod - def setEnablePasteFromClipboard(*args, **kwargs) -> dict: - if config.ENABLE_PASTE_FROM_CLIPBOARD is False: - config.ENABLE_PASTE_FROM_CLIPBOARD = True - return {"status":200, "result":config.ENABLE_PASTE_FROM_CLIPBOARD} - - @staticmethod - def setDisablePasteFromClipboard(*args, **kwargs) -> dict: - if config.ENABLE_PASTE_FROM_CLIPBOARD is True: - config.ENABLE_PASTE_FROM_CLIPBOARD = False - return {"status":200, "result":config.ENABLE_PASTE_FROM_CLIPBOARD} + def setDisableClipboard(*args, **kwargs) -> dict: + if config.ENABLE_CLIPBOARD is True: + config.ENABLE_CLIPBOARD = False + return {"status":200, "result":config.ENABLE_CLIPBOARD} def initializationProgress(self, progress): self.run(200, self.run_mapping["initialization_progress"], progress) diff --git a/src-python/mainloop.py b/src-python/mainloop.py index f922a1f1..856f727b 100644 --- a/src-python/mainloop.py +++ b/src-python/mainloop.py @@ -403,12 +403,9 @@ mapping = { "/set/disable/websocket_server": {"status": True, "variable":controller.setDisableWebSocketServer}, # Clipboard Settings - # "/get/data/copy_to_clipboard": {"status": True, "variable":controller.getCopyToClipboard}, - # "/set/enable/copy_to_clipboard": {"status": True, "variable":controller.setEnableCopyToClipboard}, - # "/set/disable/copy_to_clipboard": {"status": True, "variable":controller.setDisableCopyToClipboard}, - # "/get/data/paste_from_clipboard": {"status": True, "variable":controller.getPasteFromClipboard}, - # "/set/enable/paste_from_clipboard": {"status": True, "variable":controller.setEnablePasteFromClipboard}, - # "/set/disable/paste_from_clipboard": {"status": True, "variable":controller.setDisablePasteFromClipboard}, + "/get/data/clipboard": {"status": True, "variable":controller.getClipboard}, + "/set/enable/clipboard": {"status": True, "variable":controller.setEnableClipboard}, + "/set/disable/clipboard": {"status": True, "variable":controller.setDisableClipboard}, # Advanced Settings "/get/data/osc_ip_address": {"status": True, "variable":controller.getOscIpAddress},