From bfc5ff04f85e1cd3f247b192f1c928cc322056d4 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Fri, 13 Oct 2023 18:23:55 +0900 Subject: [PATCH] =?UTF-8?q?[Update]=20Config=20Window:=20UI=20Theme=20Dark?= =?UTF-8?q?=E3=83=A2=E3=83=BC=E3=83=89=E5=9B=BA=E5=AE=9A=E3=80=82=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E9=A0=85=E7=9B=AE=E3=81=8B=E3=82=89=E3=83=86=E3=83=BC?= =?UTF-8?q?=E3=83=9E=E9=81=B8=E6=8A=9E=E3=82=92=E3=81=A7=E3=81=8D=E3=81=AA?= =?UTF-8?q?=E3=81=8F=E3=81=97=E3=81=A6=E3=80=81config.json=E3=82=92?= =?UTF-8?q?=E7=B7=A8=E9=9B=86=E3=81=97=E3=81=9F=E3=81=A8=E3=81=97=E3=81=A6?= =?UTF-8?q?=E3=82=82=E5=B8=B8=E3=81=ABDark=E3=83=A2=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=81=AB=E5=9B=BA=E5=AE=9A=E3=80=82=E2=80=BB=E9=A0=85=E7=9B=AE?= =?UTF-8?q?=E3=81=A8=E3=81=97=E3=81=A6=E6=AE=8B=E3=81=97=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=82=8B=E3=81=AE=E3=81=AF=E3=80=81Light=E3=83=A2=E3=83=BC?= =?UTF-8?q?=E3=83=89=E5=AE=9F=E8=A3=85=E4=BA=88=E5=AE=9A=E3=81=A7=E9=96=8B?= =?UTF-8?q?=E7=99=BA=E4=B8=AD=E3=81=A8=E3=81=84=E3=81=86=E4=BA=8B=E3=82=92?= =?UTF-8?q?=E8=A6=8B=E3=81=9B=E3=81=9F=E3=81=84=E3=81=9F=E3=82=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view.py | 15 ++++++++++++--- vrct_gui/_changeConfigWindowWidgetsStatus.py | 4 ++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/view.py b/view.py index 66ec769e..89af1564 100644 --- a/view.py +++ b/view.py @@ -16,7 +16,8 @@ from config import config class View(): def __init__(self): self.settings = SimpleNamespace() - theme = get_appearance_mode() if config.APPEARANCE_THEME == "System" else config.APPEARANCE_THEME + # theme = get_appearance_mode() if config.APPEARANCE_THEME == "System" else config.APPEARANCE_THEME + theme = "Dark" all_ctm = ColorThemeManager(theme) all_uism = UiScalingManager(config.UI_SCALING) image_file = ImageFileManager(theme) @@ -161,9 +162,11 @@ class View(): VAR_LABEL_APPEARANCE_THEME=StringVar(value=i18n.t("config_window.appearance_theme.label")), VAR_DESC_APPEARANCE_THEME=StringVar(value=i18n.t("config_window.appearance_theme.desc")), - LIST_APPEARANCE_THEME=["Light", "Dark", "System"], + LIST_APPEARANCE_THEME=["Dark"], + # LIST_APPEARANCE_THEME=["Light", "Dark", "System"], CALLBACK_SET_APPEARANCE_THEME=None, - VAR_APPEARANCE_THEME=StringVar(value=config.APPEARANCE_THEME), + VAR_APPEARANCE_THEME=StringVar(value="Dark"), + # VAR_APPEARANCE_THEME=StringVar(value=config.APPEARANCE_THEME), VAR_LABEL_UI_SCALING=StringVar(value=i18n.t("config_window.ui_size.label")), VAR_DESC_UI_SCALING=None, @@ -450,6 +453,12 @@ class View(): self.enableConfigWindowCompactMode() vrct_gui.config_window.setting_box_compact_mode_switch_box.select() + vrct_gui._changeConfigWindowWidgetsStatus( + status="disabled", + target_names=[ + "sb__optionmenu_appearance_theme", + ] + ) if config.CHOICE_MIC_HOST == "NoHost": diff --git a/vrct_gui/_changeConfigWindowWidgetsStatus.py b/vrct_gui/_changeConfigWindowWidgetsStatus.py index 39ca924b..0263837b 100644 --- a/vrct_gui/_changeConfigWindowWidgetsStatus.py +++ b/vrct_gui/_changeConfigWindowWidgetsStatus.py @@ -32,6 +32,10 @@ def _changeConfigWindowWidgetsStatus(config_window, settings, view_variable, sta target_widget = config_window.sb__widgets["sb__optionmenu_speaker_device"] disableOptionmenuWidget(target_widget) + case "sb__optionmenu_appearance_theme": + if status == "disabled": + target_widget = config_window.sb__widgets["sb__optionmenu_appearance_theme"] + disableOptionmenuWidget(target_widget) case _: raise ValueError(f"No matching case for target_name: {target_name}")