From ce65a36b8dc52b706bcb9c7b126799e8c5e97b74 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Sat, 2 Sep 2023 05:27:52 +0900 Subject: [PATCH] =?UTF-8?q?Main=20Window:=20Language=20Setting=E3=81=AE?= =?UTF-8?q?=E5=A4=89=E6=95=B0YOUR=5FLANGUAGE=E3=81=A8TARGET=5FLANGUAGE?= =?UTF-8?q?=E3=82=92view.py=E3=81=AB=E7=A7=BB=E5=8B=95=E3=80=82=20tab?= =?UTF-8?q?=E5=88=87=E3=82=8A=E6=9B=BF=E3=82=8F=E3=82=8A=E6=99=82=E3=81=AB?= =?UTF-8?q?=E3=80=81UI=E5=81=B4=E3=81=A7variable=E3=82=92=E3=81=AA?= =?UTF-8?q?=E3=81=9C=E3=81=8B=E6=96=B0=E3=81=9F=E3=81=AB=E3=82=BB=E3=83=83?= =?UTF-8?q?=E3=83=88=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=81=A7?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3(set=E9=96=A2=E6=95=B0=E3=82=92=E4=BD=BF?= =?UTF-8?q?=E3=81=A3=E3=81=A6)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view.py | 13 ++++++++----- vrct_gui/main_window/createMainWindowWidgets.py | 9 --------- vrct_gui/main_window/widgets/create_sidebar.py | 8 ++++---- vrct_gui/vrct_gui.py | 4 ---- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/view.py b/view.py index 0f425c36..5c113939 100644 --- a/view.py +++ b/view.py @@ -37,14 +37,17 @@ class View(): ) self.view_variable = SimpleNamespace( - # Main Window + # Sidebar Features CALLBACK_TOGGLE_TRANSLATION=None, CALLBACK_TOGGLE_TRANSCRIPTION_SEND=None, CALLBACK_TOGGLE_TRANSCRIPTION_RECEIVE=None, CALLBACK_TOGGLE_FOREGROUND=None, + # Language Settings CALLBACK_SELECTED_LANGUAGE_PRESET_TAB=None, + VAR_YOUR_LANGUAGE = StringVar(value="Japanese\n(Japan)"), + VAR_TARGET_LANGUAGE = StringVar(value="English\n(United States)"), @@ -241,6 +244,8 @@ class View(): self.view_variable.CALLBACK_SET_FONT_FAMILY = config_window["callback_set_font_family"] + + # vrct_gui.config_window.sb__optionmenu_font_family.configure(values=self.view_variable.LIST_FONT_FAMILY) # self.view_variable.VAR_FONT_FAMILY = StringVar(value=config.FONT_FAMILY) @@ -314,10 +319,8 @@ class View(): def updateGuiVariableByPresetTabNo(self, tab_no:str): - vrct_gui.YOUR_LANGUAGE = config.SELECTED_TAB_YOUR_LANGUAGES[tab_no] - vrct_gui.TARGET_LANGUAGE = config.SELECTED_TAB_TARGET_LANGUAGES[tab_no] - - + self.view_variable.VAR_YOUR_LANGUAGE.set(config.SELECTED_TAB_YOUR_LANGUAGES[tab_no]) + self.view_variable.VAR_TARGET_LANGUAGE.set(config.SELECTED_TAB_TARGET_LANGUAGES[tab_no]) def printToTextbox_enableTranslation(self): diff --git a/vrct_gui/main_window/createMainWindowWidgets.py b/vrct_gui/main_window/createMainWindowWidgets.py index 980a15be..536aba6c 100644 --- a/vrct_gui/main_window/createMainWindowWidgets.py +++ b/vrct_gui/main_window/createMainWindowWidgets.py @@ -8,14 +8,6 @@ from ..ui_utils import createButtonWithImage, getImagePath def createMainWindowWidgets(vrct_gui, settings): vrct_gui.protocol("WM_DELETE_WINDOW", vrct_gui.quitVRCT) - # self.IS_DEVELOPER_MODE = False - # self.IS_DEVELOPER_MODE = True - - - - - # self.YOUR_LANGUAGE = "Japanese\n(Japan)" - # self.TARGET_LANGUAGE = "English\n(United States)" vrct_gui.iconbitmap(getImagePath("app.ico")) vrct_gui.title("VRCT") @@ -27,7 +19,6 @@ def createMainWindowWidgets(vrct_gui, settings): vrct_gui.grid_columnconfigure(1, weight=1) vrct_gui.configure(fg_color="#ff7f50") - # return # Main Container diff --git a/vrct_gui/main_window/widgets/create_sidebar.py b/vrct_gui/main_window/widgets/create_sidebar.py index bbf3fb8d..d69632d5 100644 --- a/vrct_gui/main_window/widgets/create_sidebar.py +++ b/vrct_gui/main_window/widgets/create_sidebar.py @@ -93,8 +93,8 @@ def createSidebar(settings, main_window): switchActiveAndPassivePresetsTabsColor(target_active_widget) switchActiveTabAndPassiveTab(target_active_widget, main_window.current_active_preset_tab, main_window.current_active_preset_tab.passive_function, settings.ctm.SQLS__PRESETS_TAB_BG_HOVERED_COLOR, settings.ctm.SQLS__PRESETS_TAB_BG_CLICKED_COLOR, settings.ctm.SQLS__PRESETS_TAB_BG_PASSIVE_COLOR) - main_window.sqls__optionmenu_your_language.configure(variable=StringVar(value=main_window.YOUR_LANGUAGE)) - main_window.sqls__optionmenu_target_language.configure(variable=StringVar(value=main_window.TARGET_LANGUAGE)) + main_window.sqls__optionmenu_your_language.set(main_window.view_variable.VAR_YOUR_LANGUAGE.get()) + main_window.sqls__optionmenu_target_language.set(main_window.view_variable.VAR_TARGET_LANGUAGE.get()) main_window.current_active_preset_tab = target_active_widget @@ -499,7 +499,7 @@ def createSidebar(settings, main_window): optionmenu_attr_name="sqls__optionmenu_your_language", dropdown_menu_attr_name="sqls__dropdown_menu_your_language", dropdown_menu_values=["1""2","pppp\npppp"], - variable=StringVar(value=main_window.YOUR_LANGUAGE) + variable=main_window.view_variable.VAR_YOUR_LANGUAGE ) main_window.sqls__box_your_language.grid(row=2, column=0, padx=0, pady=(settings.uism.SQLS__BOX_TOP_PADY,0),sticky="ew") @@ -549,7 +549,7 @@ def createSidebar(settings, main_window): optionmenu_attr_name="sqls__optionmenu_target_language", dropdown_menu_attr_name="sqls__dropdown_menu_target_language", dropdown_menu_values=["1""2","pppp\npppp2"], - variable=StringVar(value=main_window.TARGET_LANGUAGE) + variable=main_window.view_variable.VAR_TARGET_LANGUAGE ) main_window.sqls__box_target_language.grid(row=4, column=0, padx=0, pady=(0,0),sticky="ew") diff --git a/vrct_gui/vrct_gui.py b/vrct_gui/vrct_gui.py index f0871ace..89e7804c 100644 --- a/vrct_gui/vrct_gui.py +++ b/vrct_gui/vrct_gui.py @@ -16,10 +16,6 @@ from .ui_utils import _setDefaultActiveTab class VRCT_GUI(CTk): def __init__(self): super().__init__() - # self.settings = SimpleNamespace() - self.YOUR_LANGUAGE = "Japanese\n(Japan)" - self.TARGET_LANGUAGE = "English\n(United States)" - def createGUI(self, settings, view_variable): self.settings = settings