diff --git a/view.py b/view.py index 905c936f..4fd3d85e 100644 --- a/view.py +++ b/view.py @@ -1,3 +1,5 @@ +from types import SimpleNamespace + from customtkinter import StringVar, END as CTK_END from vrct_gui import vrct_gui @@ -5,6 +7,11 @@ from config import config class View(): def __init__(self): + self.settings = SimpleNamespace() + self.settings.config_window = SimpleNamespace() + self.settings.config_window = SimpleNamespace( + is_config_window_compact_mode=config.IS_CONFIG_WINDOW_COMPACT_MODE + ) pass @@ -43,8 +50,7 @@ class View(): vrct_gui.config_window.CALLBACK_DISABLE_CONFIG_WINDOW_COMPACT_MODE = config_window["callback_enable_config_window_compact_mode"] - # Config Window - vrct_gui.config_window.settings.IS_CONFIG_WINDOW_COMPACT_MODE = config.IS_CONFIG_WINDOW_COMPACT_MODE + @@ -151,7 +157,7 @@ class View(): def createGUI(self): - vrct_gui.createGUI() + vrct_gui.createGUI(settings=self.settings) def startMainLoop(self): vrct_gui.startMainLoop() diff --git a/vrct_gui/vrct_gui.py b/vrct_gui/vrct_gui.py index 4f6dbe32..87e0eb9a 100644 --- a/vrct_gui/vrct_gui.py +++ b/vrct_gui/vrct_gui.py @@ -18,6 +18,19 @@ from config import config class VRCT_GUI(CTk): def __init__(self): super().__init__() + 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): self.settings = SimpleNamespace() theme = get_appearance_mode() if config.APPEARANCE_THEME == "System" else config.APPEARANCE_THEME all_ctm = ColorThemeManager(theme) @@ -40,28 +53,14 @@ class VRCT_GUI(CTk): self.settings.config_window = SimpleNamespace( ctm=all_ctm.config_window, uism=all_uism.config_window, - IS_CONFIG_WINDOW_COMPACT_MODE=False, + IS_CONFIG_WINDOW_COMPACT_MODE=settings.config_window.is_config_window_compact_mode, **common_args ) - - 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 - + createMainWindowWidgets(vrct_gui=self, settings=self.settings.main) self.config_window = ConfigWindow(vrct_gui=self, settings=self.settings.config_window) # self.information_window = ToplevelWindowInformation(self) - def createGUI(self): - createMainWindowWidgets(vrct_gui=self, settings=self.settings.main) - def startMainLoop(self): self.mainloop()