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")