From 3fc3ae02bbca2b5817e6ea984a5b863ec638e81d Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Sat, 20 Jan 2024 14:19:14 +0900 Subject: [PATCH] =?UTF-8?q?[WIP/TEST]=20Controller=20:=20Reset=E3=83=9C?= =?UTF-8?q?=E3=82=BF=E3=83=B3=E3=81=AE=E8=A1=A8=E7=A4=BA=E3=82=BF=E3=82=A4?= =?UTF-8?q?=E3=83=9F=E3=83=B3=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.py | 10 ++++++++++ controller.py | 8 ++++++++ view.py | 6 ++---- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/config.py b/config.py index 54b057a5..c1af4611 100644 --- a/config.py +++ b/config.py @@ -197,6 +197,15 @@ class Config: if value in list(translation_lang.keys()): self._CHOICE_OUTPUT_TRANSLATOR = value + @property + def IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION(self): + return self._IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION + + @IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION.setter + def IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION(self, value): + if isinstance(value, bool): + self._IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION = value + # Save Json Data ## Main Window @property @@ -761,6 +770,7 @@ class Config: self._SOURCE_COUNTRY = "Japan" self._TARGET_LANGUAGE = "English" self._TARGET_COUNTRY = "United States" + self._IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION = False # Save Json Data ## Main Window diff --git a/controller.py b/controller.py index a528db3b..cf3aa39e 100644 --- a/controller.py +++ b/controller.py @@ -490,14 +490,19 @@ def callbackSetUseTranslationFeature(value): view.useTranslationFeatureProcess("Normal") if model.checkCTranslatorCTranslate2ModelWeight(): def callback(): + config.IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION = False + view.showRestartButtonIfRequired() model.changeTranslatorCTranslate2Model() th_callback = Thread(target=callback) th_callback.daemon = True th_callback.start() else: + config.IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION = True view.showRestartButtonIfRequired() view.useTranslationFeatureProcess("Restart") else: + config.IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION = False + view.showRestartButtonIfRequired() view.useTranslationFeatureProcess("Disable") def callbackSetCtranslate2WeightType(value): @@ -506,6 +511,8 @@ def callbackSetCtranslate2WeightType(value): view.updateSelectedCtranslate2WeightType(config.WEIGHT_TYPE) if model.checkCTranslatorCTranslate2ModelWeight(): def callback(): + config.IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION = False + view.showRestartButtonIfRequired() model.changeTranslatorCTranslate2Model() view.showRestartButtonIfRequired() view.useTranslationFeatureProcess("Normal") @@ -513,6 +520,7 @@ def callbackSetCtranslate2WeightType(value): th_callback.daemon = True th_callback.start() else: + config.IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION = True view.showRestartButtonIfRequired() view.useTranslationFeatureProcess("Restart") diff --git a/view.py b/view.py index 02acb490..60365984 100644 --- a/view.py +++ b/view.py @@ -28,8 +28,7 @@ class View(): ui_scaling=config.UI_SCALING, font_family=config.FONT_FAMILY, ui_language=config.UI_LANGUAGE, - use_translation_feature=config.USE_TRANSLATION_FEATURE, - ctranslate2_weight_type=config.WEIGHT_TYPE, + is_reset_button_displayed_for_translation=config.IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION, ) if config.ENABLE_SPEAKER2CHATBOX is False: @@ -994,8 +993,7 @@ class View(): self.restart_required_configs_pre_data.ui_scaling == config.UI_SCALING and self.restart_required_configs_pre_data.font_family == config.FONT_FAMILY and self.restart_required_configs_pre_data.ui_language == config.UI_LANGUAGE and - self.restart_required_configs_pre_data.use_translation_feature == config.USE_TRANSLATION_FEATURE and - self.restart_required_configs_pre_data.ctranslate2_weight_type == config.WEIGHT_TYPE + self.restart_required_configs_pre_data.is_reset_button_displayed_for_translation == config.IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION ) if locale is None: