From 6e64edb1c698f252774c1300a8f4ca869c8df831 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Wed, 17 Jan 2024 16:52:44 +0900 Subject: [PATCH] =?UTF-8?q?[Update]=20=E8=A8=AD=E5=AE=9A=E7=94=BB=E9=9D=A2?= =?UTF-8?q?=E3=81=AB=E3=81=A6=E3=80=8C=E7=BF=BB=E8=A8=B3=E6=A9=9F=E8=83=BD?= =?UTF-8?q?=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=99=E3=82=8B=E3=80=8D=E3=82=92?= =?UTF-8?q?=E3=82=AA=E3=83=95=E3=81=AB=E3=81=97=E3=81=9F=E6=99=82=E3=81=AB?= =?UTF-8?q?=E3=80=81=E3=83=A1=E3=82=A4=E3=83=B3=E7=94=BB=E9=9D=A2=E3=81=AE?= =?UTF-8?q?=E7=BF=BB=E8=A8=B3=E6=A9=9F=E8=83=BD=E3=82=92Disabled=E3=81=A8?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=95=E3=82=8F=E3=82=8C=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=99=E3=82=8B=E5=87=A6=E7=90=86?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=80=82=EF=BC=88=E3=81=9D=E3=81=AE=E9=80=86?= =?UTF-8?q?=E3=82=82=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller.py | 2 ++ view.py | 6 +++++- vrct_gui/_changeMainWindowWidgetsStatus.py | 18 +++++++++++------- vrct_gui/vrct_gui.py | 5 +++-- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/controller.py b/controller.py index 0c6d368f..b7ed3c2a 100644 --- a/controller.py +++ b/controller.py @@ -489,8 +489,10 @@ def callbackSetUseTranslationFeature(value): if config.USE_TRANSLATION_FEATURE is True: view.setLatestCTranslate2WeightType() view.openCtranslate2WeightTypeWidget() + view.setTranslationSwitchStatus("normal", release_locked_state=True) else: view.closeCtranslate2WeightTypeWidget() + view.setTranslationSwitchStatus("disabled", to_lock_state=True) def callbackSetCtranslate2WeightType(value): print("callbackSetCtranslate2WeightType", value) diff --git a/view.py b/view.py index a3c7c166..8159120b 100644 --- a/view.py +++ b/view.py @@ -652,6 +652,7 @@ class View(): if config.USE_TRANSLATION_FEATURE is True: self.openCtranslate2WeightTypeWidget() else: + self.setTranslationSwitchStatus("disabled", to_lock_state=True) self.closeCtranslate2WeightTypeWidget() if config.CHOICE_MIC_HOST == "NoHost": @@ -916,6 +917,9 @@ class View(): def setMainWindowAllWidgetsStatusToDisabled(): vrct_gui._changeMainWindowWidgetsStatus("disabled", "All") + @staticmethod + def setTranslationSwitchStatus(status:str, to_lock_state:bool=False, release_locked_state:bool=False): + vrct_gui._changeMainWindowWidgetsStatus(status, ["translation_switch"], to_lock_state, release_locked_state) def enableMainWindowSidebarCompactMode(self): self.view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE = True @@ -1263,7 +1267,7 @@ class View(): # vrct_gui.translation_frame.markToggleManually(False) # # disable translation feature. - # vrct_gui._changeMainWindowWidgetsStatus("disabled", ["translation_switch"], to_hold_state=True) + # vrct_gui._changeMainWindowWidgetsStatus("disabled", ["translation_switch"], to_lock_state=True) # # print system message that mention to stopped translation feature. # view.printToTextbox_TranslationEngineLimitError() diff --git a/vrct_gui/_changeMainWindowWidgetsStatus.py b/vrct_gui/_changeMainWindowWidgetsStatus.py index 95fc38dc..3a77cb32 100644 --- a/vrct_gui/_changeMainWindowWidgetsStatus.py +++ b/vrct_gui/_changeMainWindowWidgetsStatus.py @@ -1,12 +1,16 @@ from customtkinter import CTkImage -hold_state_list=[] -def _changeMainWindowWidgetsStatus(vrct_gui, settings, view_variable, status, target_names:list, to_hold_state:bool=False): - global hold_state_list +lock_state_list=[] +def _changeMainWindowWidgetsStatus(vrct_gui, settings, view_variable, status, target_names:list, to_lock_state:bool=False, release_locked_state:bool=False): + global lock_state_list if target_names == "All": target_names = ["translation_switch", "transcription_send_switch", "transcription_receive_switch", "foreground_switch", "quick_language_settings", "config_button", "minimize_sidebar_button", "entry_message_box", "send_message_button"] + if release_locked_state is True: + for item in target_names: + if item in lock_state_list: + lock_state_list.remove(item) - for item in hold_state_list: + for item in lock_state_list: if item in target_names: target_names.remove(item) @@ -158,9 +162,9 @@ def _changeMainWindowWidgetsStatus(vrct_gui, settings, view_variable, status, ta raise ValueError(f"No matching case for target_name: {target_name}") - if to_hold_state is True: + if to_lock_state is True: for item in target_names: - if item not in hold_state_list: - hold_state_list.append(item) + if item not in lock_state_list: + lock_state_list.append(item) vrct_gui.update() \ No newline at end of file diff --git a/vrct_gui/vrct_gui.py b/vrct_gui/vrct_gui.py index e59b332d..25369a6a 100644 --- a/vrct_gui/vrct_gui.py +++ b/vrct_gui/vrct_gui.py @@ -250,14 +250,15 @@ class VRCT_GUI(CTk): - def _changeMainWindowWidgetsStatus(self, status, target_names, to_hold_state:bool=False): + def _changeMainWindowWidgetsStatus(self, status, target_names, to_lock_state:bool=False, release_locked_state:bool=False): _changeMainWindowWidgetsStatus( vrct_gui=self, settings=self.settings.main, view_variable=self._view_variable, status=status, target_names=target_names, - to_hold_state=to_hold_state, + to_lock_state=to_lock_state, + release_locked_state=release_locked_state, ) def _changeConfigWindowWidgetsStatus(self, status, target_names):