From 78ef7404aa7fb68879fcbc881537cc06739931e5 Mon Sep 17 00:00:00 2001 From: misygauziya Date: Tue, 29 Aug 2023 15:25:56 +0900 Subject: [PATCH] =?UTF-8?q?[Update]=20=E8=B5=B7=E5=8B=95=E6=99=82=E3=81=AB?= =?UTF-8?q?=E5=89=8D=E5=9B=9E=E3=81=AEtab=E3=82=92=E9=81=B8=E6=8A=9E?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.py | 14 +++++++------- main.py | 16 +++++++++++++--- vrct_gui/main_window/widgets/create_sidebar.py | 12 ++++++------ 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/config.py b/config.py index f90f5785..9d8d2ae0 100644 --- a/config.py +++ b/config.py @@ -493,16 +493,16 @@ class Config: ] self._MAX_MIC_ENERGY_THRESHOLD = 2000 self._MAX_SPEAKER_ENERGY_THRESHOLD = 4000 - self._SELECTED_TAB_NO = "tab_1" + self._SELECTED_TAB_NO = "1" self._SELECTED_TAB_YOUR_LANGUAGES = { - "tab_1":"Japanese\n(Japan)", - "tab_2":"Japanese\n(Japan)", - "tab_3":"Japanese\n(Japan)", + "1":"Japanese\n(Japan)", + "2":"Japanese\n(Japan)", + "3":"Japanese\n(Japan)", } self._SELECTED_TAB_TARGET_LANGUAGES = { - "tab_1":"English\n(United States)", - "tab_2":"English\n(United States)", - "tab_3":"English\n(United States)", + "1":"English\n(United States)", + "2":"English\n(United States)", + "3":"English\n(United States)", } def load_config(self): diff --git a/main.py b/main.py index 8ef83a7f..a1ca52b8 100644 --- a/main.py +++ b/main.py @@ -1,8 +1,10 @@ from threading import Thread import customtkinter +from customtkinter import StringVar from vrct_gui import vrct_gui from config import config from model import model +from vrct_gui.ui_utils import setDefaultActiveTab # func transcription send message def sendMicMessage(message): @@ -137,7 +139,7 @@ def setTargetLanguageAndCountry(select): config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE) def callbackSelectedTabNo1(): - config.SELECTED_TAB_NO = "tab_1" + config.SELECTED_TAB_NO = "1" vrct_gui.YOUR_LANGUAGE = config.SELECTED_TAB_YOUR_LANGUAGES[config.SELECTED_TAB_NO] vrct_gui.TARGET_LANGUAGE = config.SELECTED_TAB_TARGET_LANGUAGES[config.SELECTED_TAB_NO] languages = config.SELECTED_TAB_YOUR_LANGUAGES @@ -153,7 +155,7 @@ def callbackSelectedTabNo1(): config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE) def callbackSelectedTabNo2(): - config.SELECTED_TAB_NO = "tab_2" + config.SELECTED_TAB_NO = "2" vrct_gui.YOUR_LANGUAGE = config.SELECTED_TAB_YOUR_LANGUAGES[config.SELECTED_TAB_NO] vrct_gui.TARGET_LANGUAGE = config.SELECTED_TAB_TARGET_LANGUAGES[config.SELECTED_TAB_NO] languages = config.SELECTED_TAB_YOUR_LANGUAGES @@ -169,7 +171,7 @@ def callbackSelectedTabNo2(): config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE) def callbackSelectedTabNo3(): - config.SELECTED_TAB_NO = "tab_3" + config.SELECTED_TAB_NO = "3" vrct_gui.YOUR_LANGUAGE = config.SELECTED_TAB_YOUR_LANGUAGES[config.SELECTED_TAB_NO] vrct_gui.TARGET_LANGUAGE = config.SELECTED_TAB_TARGET_LANGUAGES[config.SELECTED_TAB_NO] languages = config.SELECTED_TAB_YOUR_LANGUAGES @@ -320,15 +322,23 @@ entry_message_box.bind("", foregroundOnForcefully) sqls__optionmenu_your_language = getattr(vrct_gui, "sqls__optionmenu_your_language") sqls__optionmenu_your_language.configure(values=model.getListLanguageAndCountry()) sqls__optionmenu_your_language.configure(command=setYourLanguageAndCountry) +sqls__optionmenu_your_language.configure(variable=StringVar(value=config.SELECTED_TAB_YOUR_LANGUAGES[config.SELECTED_TAB_NO])) sqls__optionmenu_target_language = getattr(vrct_gui, "sqls__optionmenu_target_language") sqls__optionmenu_target_language.configure(values=model.getListLanguageAndCountry()) sqls__optionmenu_target_language.configure(command=setTargetLanguageAndCountry) +sqls__optionmenu_target_language.configure(variable=StringVar(value=config.SELECTED_TAB_TARGET_LANGUAGES[config.SELECTED_TAB_NO])) vrct_gui.CALLBACK_SELECTED_TAB_NO_1 = callbackSelectedTabNo1 vrct_gui.CALLBACK_SELECTED_TAB_NO_2 = callbackSelectedTabNo2 vrct_gui.CALLBACK_SELECTED_TAB_NO_3 = callbackSelectedTabNo3 +vrct_gui.current_active_preset_tab = getattr(vrct_gui, f"sqls__presets_button_{config.SELECTED_TAB_NO}") +setDefaultActiveTab( + active_tab_widget=vrct_gui.current_active_preset_tab, + active_bg_color=vrct_gui.settings.main.ctm.SQLS__PRESETS_TAB_BG_ACTIVE_COLOR, + active_text_color=vrct_gui.settings.main.ctm.SQLS__PRESETS_TAB_ACTIVE_TEXT_COLOR +) if __name__ == "__main__": vrct_gui.startMainLoop() \ No newline at end of file diff --git a/vrct_gui/main_window/widgets/create_sidebar.py b/vrct_gui/main_window/widgets/create_sidebar.py index ed8fb9fb..1ac12a85 100644 --- a/vrct_gui/main_window/widgets/create_sidebar.py +++ b/vrct_gui/main_window/widgets/create_sidebar.py @@ -513,12 +513,12 @@ def createSidebar(settings, main_window): column+=1 # Set default active preset tab - main_window.current_active_preset_tab = getattr(main_window, "sqls__presets_button_1") - setDefaultActiveTab( - active_tab_widget=main_window.current_active_preset_tab, - active_bg_color=settings.ctm.SQLS__PRESETS_TAB_BG_ACTIVE_COLOR, - active_text_color=settings.ctm.SQLS__PRESETS_TAB_ACTIVE_TEXT_COLOR - ) + # main_window.current_active_preset_tab = getattr(main_window, "sqls__presets_button_1") + # setDefaultActiveTab( + # active_tab_widget=main_window.current_active_preset_tab, + # active_bg_color=settings.ctm.SQLS__PRESETS_TAB_BG_ACTIVE_COLOR, + # active_text_color=settings.ctm.SQLS__PRESETS_TAB_ACTIVE_TEXT_COLOR + # ) # Quick Language settings BOX