diff --git a/main.py b/main.py index 58e3fd49..6fa4987e 100644 --- a/main.py +++ b/main.py @@ -122,8 +122,8 @@ def setTargetLanguageAndCountry(select): config.TARGET_COUNTRY = country config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE) -def callbackSelectedTabNo1(): - config.SELECTED_TAB_NO = "1" +def callbackSelectedLanguagePresetTab(selected_tab_no): + config.SELECTED_TAB_NO = selected_tab_no view.updateGuiVariableByPresetTabNo(config.SELECTED_TAB_NO) languages = config.SELECTED_TAB_YOUR_LANGUAGES select = languages[config.SELECTED_TAB_NO] @@ -137,37 +137,6 @@ def callbackSelectedTabNo1(): config.TARGET_COUNTRY = country config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE) -def callbackSelectedTabNo2(): - config.SELECTED_TAB_NO = "2" - view.updateGuiVariableByPresetTabNo(config.SELECTED_TAB_NO) - languages = config.SELECTED_TAB_YOUR_LANGUAGES - select = languages[config.SELECTED_TAB_NO] - language, country = model.getLanguageAndCountry(select) - config.SOURCE_LANGUAGE = language - config.SOURCE_COUNTRY = country - languages = config.SELECTED_TAB_TARGET_LANGUAGES - select = languages[config.SELECTED_TAB_NO] - language, country = model.getLanguageAndCountry(select) - config.TARGET_LANGUAGE = language - config.TARGET_COUNTRY = country - config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE) - -def callbackSelectedTabNo3(): - config.SELECTED_TAB_NO = "3" - view.updateGuiVariableByPresetTabNo(config.SELECTED_TAB_NO) - languages = config.SELECTED_TAB_YOUR_LANGUAGES - select = languages[config.SELECTED_TAB_NO] - language, country = model.getLanguageAndCountry(select) - config.SOURCE_LANGUAGE = language - config.SOURCE_COUNTRY = country - languages = config.SELECTED_TAB_TARGET_LANGUAGES - select = languages[config.SELECTED_TAB_NO] - language, country = model.getLanguageAndCountry(select) - config.TARGET_LANGUAGE = language - config.TARGET_COUNTRY = country - config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE) - - # command func def callbackToggleTranslation(is_turned_on): config.ENABLE_TRANSLATION = is_turned_on @@ -404,9 +373,7 @@ view.register( "callback_target_language": setTargetLanguageAndCountry, "values": model.getListLanguageAndCountry(), - "callback_selected_tab_no_1": callbackSelectedTabNo1, - "callback_selected_tab_no_2": callbackSelectedTabNo2, - "callback_selected_tab_no_3": callbackSelectedTabNo3, + "callback_selected_language_preset_tab": callbackSelectedLanguagePresetTab, }, entry_message_box_commands={ diff --git a/view.py b/view.py index 1c0c7abc..0f425c36 100644 --- a/view.py +++ b/view.py @@ -43,9 +43,8 @@ class View(): CALLBACK_TOGGLE_TRANSCRIPTION_SEND=None, CALLBACK_TOGGLE_TRANSCRIPTION_RECEIVE=None, CALLBACK_TOGGLE_FOREGROUND=None, - # CALLBACK_SELECTED_TAB_NO_1=None, - # CALLBACK_SELECTED_TAB_NO_2=None, - # CALLBACK_SELECTED_TAB_NO_3=None, + + CALLBACK_SELECTED_LANGUAGE_PRESET_TAB=None, @@ -215,9 +214,7 @@ class View(): vrct_gui.sqls__optionmenu_target_language.configure(command=language_presets["callback_target_language"]) vrct_gui.sqls__optionmenu_target_language.configure(variable=StringVar(value=config.SELECTED_TAB_TARGET_LANGUAGES[config.SELECTED_TAB_NO])) - vrct_gui.CALLBACK_SELECTED_TAB_NO_1 = language_presets["callback_selected_tab_no_1"] - vrct_gui.CALLBACK_SELECTED_TAB_NO_2 = language_presets["callback_selected_tab_no_2"] - vrct_gui.CALLBACK_SELECTED_TAB_NO_3 = language_presets["callback_selected_tab_no_3"] + vrct_gui.CALLBACK_SELECTED_LANGUAGE_PRESET_TAB = language_presets["callback_selected_language_preset_tab"] vrct_gui.setDefaultActiveLanguagePresetTab(tab_no=config.SELECTED_TAB_NO) diff --git a/vrct_gui/main_window/widgets/create_sidebar.py b/vrct_gui/main_window/widgets/create_sidebar.py index 9396d336..bbf3fb8d 100644 --- a/vrct_gui/main_window/widgets/create_sidebar.py +++ b/vrct_gui/main_window/widgets/create_sidebar.py @@ -99,34 +99,21 @@ def createSidebar(settings, main_window): - - - - def switchToPreset1(e): print("1") - if callable(main_window.CALLBACK_SELECTED_TAB_NO_1) is True: - main_window.CALLBACK_SELECTED_TAB_NO_1() - # main_window.YOUR_LANGUAGE = "Japanese\n(Japan)" - # main_window.TARGET_LANGUAGE = "English\n(United States)" + callFunctionIfCallable(main_window.CALLBACK_SELECTED_LANGUAGE_PRESET_TAB, "1") target_active_widget = getattr(main_window, "sqls__presets_button_1") switchPresetTabFunction(target_active_widget) def switchToPreset2(e): print("2") - if callable(main_window.CALLBACK_SELECTED_TAB_NO_2) is True: - main_window.CALLBACK_SELECTED_TAB_NO_2() - # main_window.YOUR_LANGUAGE = "English\n(United States)" - # main_window.TARGET_LANGUAGE = "Japanese\n(Japan)" + callFunctionIfCallable(main_window.CALLBACK_SELECTED_LANGUAGE_PRESET_TAB, "2") target_active_widget = getattr(main_window, "sqls__presets_button_2") switchPresetTabFunction(target_active_widget) def switchToPreset3(e): print("3") - if callable(main_window.CALLBACK_SELECTED_TAB_NO_3) is True: - main_window.CALLBACK_SELECTED_TAB_NO_3() - # main_window.YOUR_LANGUAGE = "Japanese\n(Japan)" - # main_window.TARGET_LANGUAGE = "Chinese, Cantonese\n(Traditional Hong Kong)" + callFunctionIfCallable(main_window.CALLBACK_SELECTED_LANGUAGE_PRESET_TAB, "3") target_active_widget = getattr(main_window, "sqls__presets_button_3") switchPresetTabFunction(target_active_widget) diff --git a/vrct_gui/vrct_gui.py b/vrct_gui/vrct_gui.py index 5874b318..f0871ace 100644 --- a/vrct_gui/vrct_gui.py +++ b/vrct_gui/vrct_gui.py @@ -20,14 +20,6 @@ class VRCT_GUI(CTk): self.YOUR_LANGUAGE = "Japanese\n(Japan)" self.TARGET_LANGUAGE = "English\n(United States)" - # self.CALLBACK_TOGGLE_TRANSLATION = None - # self.CALLBACK_TOGGLE_TRANSCRIPTION_SEND = None - # self.CALLBACK_TOGGLE_TRANSCRIPTION_RECEIVE = None - # self.CALLBACK_TOGGLE_FOREGROUND = None - self.CALLBACK_SELECTED_TAB_NO_1 = None - self.CALLBACK_SELECTED_TAB_NO_2 = None - self.CALLBACK_SELECTED_TAB_NO_3 = None - def createGUI(self, settings, view_variable): self.settings = settings