From 4f8bad129ba86fb18cff8961325ff2a912500ff3 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Mon, 9 Oct 2023 05:50:04 +0900 Subject: [PATCH] =?UTF-8?q?[Update]=20Update=20Software=E9=96=A2=E6=95=B0?= =?UTF-8?q?=E3=81=AE=E5=8F=97=E3=81=91=E5=8F=A3=E8=BF=BD=E5=8A=A0=E3=80=82?= =?UTF-8?q?update=20available=E3=83=9C=E3=82=BF=E3=83=B3=E3=82=92=E6=8A=BC?= =?UTF-8?q?=E3=81=95=E3=82=8C=E3=82=8B=E3=81=A8=E3=82=B3=E3=83=BC=E3=83=AB?= =?UTF-8?q?=E3=83=90=E3=83=83=E3=82=AF=E9=96=A2=E6=95=B0=E3=81=8C=E5=91=BC?= =?UTF-8?q?=E3=81=B0=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=80=82?= =?UTF-8?q?=E5=AE=9F=E9=9A=9B=E3=81=AB=E3=82=A2=E3=83=83=E3=83=97=E3=83=87?= =?UTF-8?q?=E3=83=BC=E3=83=88=E3=82=82=E5=8F=AF=E8=83=BD=E7=8A=B6=E6=85=8B?= =?UTF-8?q?=E3=80=82=20Restart=20Software=E9=96=A2=E6=95=B0=E3=81=AE?= =?UTF-8?q?=E5=8F=97=E3=81=91=E5=8F=A3=E8=BF=BD=E5=8A=A0=E3=80=82=20[bugfi?= =?UTF-8?q?x]=20update=20available=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=A8help?= =?UTF-8?q?=20and=20info=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AE=E3=82=B3?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=83=90=E3=83=83=E3=82=AF=E9=96=A2=E6=95=B0?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E3=81=8C=E9=80=86=E3=81=A0=E3=81=A3=E3=81=9F?= =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82(=E4=BB=8A?= =?UTF-8?q?=E3=81=BE=E3=81=A7=E5=A5=87=E8=B7=A1=E7=9A=84=E3=81=ABview?= =?UTF-8?q?=E5=81=B4=E3=82=82UI=E3=83=9C=E3=82=BF=E3=83=B3=E5=81=B4?= =?UTF-8?q?=E3=82=82=E5=8F=8D=E5=AF=BE=E3=81=AE=E6=8C=87=E5=AE=9A=E3=82=92?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=84=E3=81=A6=E7=B5=90=E6=9E=9C=E7=9A=84?= =?UTF-8?q?=E3=81=AB=E6=A9=9F=E8=83=BD=E3=81=97=E3=81=A6=E3=81=84=E3=81=BE?= =?UTF-8?q?=E3=81=97=E3=81=9F=E2=80=A6=E2=80=A6=E3=80=82)=20=E3=81=9D?= =?UTF-8?q?=E3=81=AE=E4=BB=96=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=81=AA?= =?UTF-8?q?=E3=81=A9=E3=82=B3=E3=83=BC=E3=83=89=E6=95=B4=E5=BD=A2=E3=81=82?= =?UTF-8?q?=E3=82=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 13 +++++++++++++ view.py | 18 +++++++++++------- .../main_window/createMainWindowWidgets.py | 4 ++-- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/main.py b/main.py index 5cefaa00..c35708d2 100644 --- a/main.py +++ b/main.py @@ -6,6 +6,14 @@ from view import view from utils import get_key_by_value from languages import selectable_languages +# Common +def callbackUpdateSoftware(): + model.updateSoftware() + +def callbackRestartSoftware(): + print("callbackRestartSoftware") + # model.updateSoftware(restart=True) + # func transcription send message def sendMicMessage(message): if len(message) > 0: @@ -622,6 +630,11 @@ if config.ENABLE_LOGGER is True: # set UI and callback view.register( + common_registers={ + "callback_update_software": callbackUpdateSoftware, + "callback_restart_software": callbackRestartSoftware, + }, + window_action_registers={ "callback_open_config_window": callbackOpenConfigWindow, "callback_close_config_window": callbackCloseConfigWindow, diff --git a/view.py b/view.py index 9d256518..0e65f432 100644 --- a/view.py +++ b/view.py @@ -65,10 +65,10 @@ class View(): CALLBACK_CLOSE_CONFIG_WINDOW=None, # Open Help and Information Page - CALLBACK_CLICKED_HELP_AND_INFO=self.openWebPage_Booth, + CALLBACK_CLICKED_HELP_AND_INFO=self.openWebPage_VrctDocuments, # Open Update Page - CALLBACK_CLICKED_UPDATE_AVAILABLE=self.openWebPage_VrctDocuments, + CALLBACK_CLICKED_UPDATE_AVAILABLE=None, # Main Window @@ -324,20 +324,22 @@ class View(): def register( self, + common_registers=None, window_action_registers=None, main_window_registers=None, config_window_registers=None ): - # Open Config Window + if common_registers is not None: + self.view_variable.CALLBACK_CLICKED_UPDATE_AVAILABLE=common_registers.get("callback_update_software", None) + + if window_action_registers is not None: self.view_variable.CALLBACK_OPEN_CONFIG_WINDOW=window_action_registers.get("callback_open_config_window", None) self.view_variable.CALLBACK_CLOSE_CONFIG_WINDOW=window_action_registers.get("callback_close_config_window", None) - - if main_window_registers is not None: self.view_variable.CALLBACK_ENABLE_MAIN_WINDOW_SIDEBAR_COMPACT_MODE = main_window_registers.get("callback_enable_main_window_sidebar_compact_mode", None) self.view_variable.CALLBACK_DISABLE_MAIN_WINDOW_SIDEBAR_COMPACT_MODE = main_window_registers.get("callback_disable_main_window_sidebar_compact_mode", None) @@ -363,18 +365,20 @@ class View(): entry_message_box.bind("", self._foregroundOffForcefully) entry_message_box.bind("", self._foregroundOnForcefully) + self.updateGuiVariableByPresetTabNo(config.SELECTED_TAB_NO) vrct_gui.setDefaultActiveLanguagePresetTab(tab_no=config.SELECTED_TAB_NO) self.view_variable.CALLBACK_OPEN_SELECTABLE_YOUR_LANGUAGE_WINDOW = self.openSelectableLanguagesWindow_YourLanguage self.view_variable.CALLBACK_OPEN_SELECTABLE_TARGET_LANGUAGE_WINDOW = self.openSelectableLanguagesWindow_TargetLanguage + # Config Window self.view_variable.CALLBACK_SELECTED_SETTING_BOX_TAB=self._updateActiveSettingBoxTabNo - # Compact Mode Switch - if config_window_registers is not None: + if config_window_registers is not None: + # Compact Mode Switch self.view_variable.CALLBACK_ENABLE_CONFIG_WINDOW_COMPACT_MODE = config_window_registers.get("callback_disable_config_window_compact_mode", None) self.view_variable.CALLBACK_DISABLE_CONFIG_WINDOW_COMPACT_MODE = config_window_registers.get("callback_enable_config_window_compact_mode", None) diff --git a/vrct_gui/main_window/createMainWindowWidgets.py b/vrct_gui/main_window/createMainWindowWidgets.py index f926c9de..0a323b89 100644 --- a/vrct_gui/main_window/createMainWindowWidgets.py +++ b/vrct_gui/main_window/createMainWindowWidgets.py @@ -86,7 +86,7 @@ def createMainWindowWidgets(vrct_gui, settings, view_variable): enter_color=settings.ctm.UPDATE_AVAILABLE_BUTTON_HOVERED_BG_COLOR, leave_color=settings.ctm.UPDATE_AVAILABLE_BUTTON_BG_COLOR, clicked_color=settings.ctm.UPDATE_AVAILABLE_BUTTON_CLICKED_BG_COLOR, - buttonReleasedFunction=lambda e: callFunctionIfCallable(view_variable.CALLBACK_CLICKED_HELP_AND_INFO), + buttonReleasedFunction=lambda e: callFunctionIfCallable(view_variable.CALLBACK_CLICKED_UPDATE_AVAILABLE), ) @@ -102,7 +102,7 @@ def createMainWindowWidgets(vrct_gui, settings, view_variable): button_image_file=settings.image_file.HELP_ICON, button_image_size=settings.uism.HELP_AND_INFO_BUTTON_SIZE, button_ipadxy=settings.uism.HELP_AND_INFO_BUTTON_IPADXY, - button_command=lambda e: callFunctionIfCallable(view_variable.CALLBACK_CLICKED_UPDATE_AVAILABLE), + button_command=lambda e: callFunctionIfCallable(view_variable.CALLBACK_CLICKED_HELP_AND_INFO), corner_radius=settings.uism.HELP_AND_INFO_BUTTON_CORNER_RADIUS, ) vrct_gui.help_and_info_button_container.grid(row=0, column=4, padx=settings.uism.HELP_AND_INFO_BUTTON_PADX, pady=settings.uism.TOP_BAR_BUTTON_PADY, sticky="e")