From fac28edba6e1f92f7a51f4c157d0d8cc9533dc66 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Thu, 31 Aug 2023 21:44:53 +0900 Subject: [PATCH] =?UTF-8?q?GUI=E3=81=8C=E7=94=9F=E6=88=90=E3=81=95?= =?UTF-8?q?=E3=82=8C=E3=82=8B=E5=89=8D=E3=81=AB=E3=81=97=E3=81=9F=E3=81=84?= =?UTF-8?q?=E5=87=A6=E7=90=86(=E8=89=B2=E3=82=84=E3=82=B9=E3=82=B1?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=81=AA=E3=81=A9)=E3=82=92vrct=5Fgui.py?= =?UTF-8?q?=E3=81=8B=E3=82=89view.py=E3=81=AB=E7=A7=BB=E5=8B=95=E3=80=82?= =?UTF-8?q?=E4=BB=8A=E5=BE=8C=E3=82=B3=E3=83=B3=E3=83=88=E3=83=AD=E3=83=BC?= =?UTF-8?q?=E3=83=A9=E5=81=B4=E3=81=A7=E5=80=A4=E3=82=92=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E3=81=97=E3=81=A6GUI=E5=86=8D=E7=94=9F=E6=88=90=E3=81=AA?= =?UTF-8?q?=E3=81=A9=E3=81=97=E3=82=84=E3=81=99=E3=81=8F=E3=81=AA=E3=82=8B?= =?UTF-8?q?=E3=81=AF=E3=81=9A=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 2 +- view.py | 32 ++++++++++++++++++++++++++------ vrct_gui/vrct_gui.py | 29 +++-------------------------- 3 files changed, 30 insertions(+), 33 deletions(-) diff --git a/main.py b/main.py index b6bf26b2..807cf48f 100644 --- a/main.py +++ b/main.py @@ -239,7 +239,7 @@ model.checkOSCStarted() model.checkSoftwareUpdated() # set UI and callback -view.initializer( +view.register( sidebar_features={ "callback_toggle_translation": callbackToggleTranslation, "callback_toggle_transcription_send": callbackToggleTranscriptionSend, diff --git a/view.py b/view.py index 4fd3d85e..696d597c 100644 --- a/view.py +++ b/view.py @@ -1,6 +1,7 @@ from types import SimpleNamespace -from customtkinter import StringVar, END as CTK_END +from customtkinter import StringVar, END as CTK_END, get_appearance_mode +from vrct_gui.ui_managers import ColorThemeManager, ImageFilenameManager, UiScalingManager from vrct_gui import vrct_gui from config import config @@ -8,14 +9,33 @@ 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 + theme = get_appearance_mode() if config.APPEARANCE_THEME == "System" else config.APPEARANCE_THEME + all_ctm = ColorThemeManager(theme) + all_uism = UiScalingManager(config.UI_SCALING) + image_filename = ImageFilenameManager(theme) + + common_args = { + "image_filename": image_filename, + "FONT_FAMILY": config.FONT_FAMILY, + } + + self.settings.main = SimpleNamespace( + ctm=all_ctm.main, + uism=all_uism.main, + IS_SIDEBAR_COMPACT_MODE=False, + COMPACT_MODE_ICON_SIZE=0, + **common_args + ) + + self.settings.config_window = SimpleNamespace( + ctm=all_ctm.config_window, + uism=all_uism.config_window, + IS_CONFIG_WINDOW_COMPACT_MODE=config.IS_CONFIG_WINDOW_COMPACT_MODE, + **common_args ) - pass - def initializer(self, sidebar_features, language_presets, entry_message_box, entry_message_box_bind_Return, entry_message_box_bind_Any_KeyPress, config_window): + def register(self, sidebar_features, language_presets, entry_message_box, entry_message_box_bind_Return, entry_message_box_bind_Any_KeyPress, config_window): vrct_gui.CALLBACK_TOGGLE_TRANSLATION = sidebar_features["callback_toggle_translation"] vrct_gui.CALLBACK_TOGGLE_TRANSCRIPTION_SEND = sidebar_features["callback_toggle_transcription_send"] diff --git a/vrct_gui/vrct_gui.py b/vrct_gui/vrct_gui.py index 87e0eb9a..8a4701a0 100644 --- a/vrct_gui/vrct_gui.py +++ b/vrct_gui/vrct_gui.py @@ -4,7 +4,7 @@ from customtkinter import CTk, get_appearance_mode # from window_help_and_info import ToplevelWindowInformation -from .ui_managers import ColorThemeManager, ImageFilenameManager, UiScalingManager +# from .ui_managers import ColorThemeManager, ImageFilenameManager, UiScalingManager from ._changeMainWindowWidgetsStatus import _changeMainWindowWidgetsStatus from ._printToTextbox import _printToTextbox @@ -18,6 +18,7 @@ from config import config 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)" @@ -31,31 +32,7 @@ class VRCT_GUI(CTk): def createGUI(self, settings): - self.settings = SimpleNamespace() - theme = get_appearance_mode() if config.APPEARANCE_THEME == "System" else config.APPEARANCE_THEME - all_ctm = ColorThemeManager(theme) - all_uism = UiScalingManager(config.UI_SCALING) - image_filename = ImageFilenameManager(theme) - - common_args = { - "image_filename": image_filename, - "FONT_FAMILY": config.FONT_FAMILY, - } - - self.settings.main = SimpleNamespace( - ctm=all_ctm.main, - uism=all_uism.main, - IS_SIDEBAR_COMPACT_MODE=False, - COMPACT_MODE_ICON_SIZE=0, - **common_args - ) - - self.settings.config_window = SimpleNamespace( - ctm=all_ctm.config_window, - uism=all_uism.config_window, - IS_CONFIG_WINDOW_COMPACT_MODE=settings.config_window.is_config_window_compact_mode, - **common_args - ) + self.settings = settings createMainWindowWidgets(vrct_gui=self, settings=self.settings.main) self.config_window = ConfigWindow(vrct_gui=self, settings=self.settings.config_window)