From 6ed71f1a4aad703e8f8edd638b38ee0eef2aad26 Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Mon, 22 Jan 2024 01:45:18 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B[bugfix]=20Controller=20:=20?= =?UTF-8?q?=E3=83=AA=E3=82=B9=E3=82=BF=E3=83=BC=E3=83=88=E3=83=9C=E3=82=BF?= =?UTF-8?q?=E3=83=B3=E3=81=AE=E8=A1=A8=E7=A4=BA=E3=82=BF=E3=82=A4=E3=83=9F?= =?UTF-8?q?=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 --- controller.py | 12 ++++-------- view.py | 3 +-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/controller.py b/controller.py index cf3aa39e..d8f9efac 100644 --- a/controller.py +++ b/controller.py @@ -489,40 +489,36 @@ def callbackSetUseTranslationFeature(value): if config.USE_TRANSLATION_FEATURE is True: view.useTranslationFeatureProcess("Normal") if model.checkCTranslatorCTranslate2ModelWeight(): + config.IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION = False 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") + view.showRestartButtonIfRequired() def callbackSetCtranslate2WeightType(value): print("callbackSetCtranslate2WeightType", value) config.WEIGHT_TYPE = str(value) view.updateSelectedCtranslate2WeightType(config.WEIGHT_TYPE) if model.checkCTranslatorCTranslate2ModelWeight(): + config.IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION = False def callback(): - config.IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION = False - view.showRestartButtonIfRequired() model.changeTranslatorCTranslate2Model() - view.showRestartButtonIfRequired() view.useTranslationFeatureProcess("Normal") 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") + view.showRestartButtonIfRequired() def callbackSetDeeplAuthkey(value): print("callbackSetDeeplAuthkey", str(value)) diff --git a/view.py b/view.py index 093d5e60..20b9678e 100644 --- a/view.py +++ b/view.py @@ -1013,8 +1013,7 @@ class View(): def _showRestartButton(self, locale:Union[None,str]=None): self.view_variable.VAR_CONFIG_WINDOW_RESTART_BUTTON_LABEL.set(i18n.t("config_window.restart_message", locale=locale)) - # This .after() func is for fixing bug that it can't be shown the label widget after changing the weight type. - vrct_gui.config_window.after(100, vrct_gui.config_window.restart_button_container.grid) + vrct_gui.config_window.restart_button_container.grid() def _hideRestartButton(self): vrct_gui.config_window.restart_button_container.grid_remove()