From 376f5e7b5ac9b37e6667b6973bfc52a24d274623 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Fri, 13 Oct 2023 16:56:49 +0900 Subject: [PATCH] =?UTF-8?q?[Update]=20=E3=82=BD=E3=83=95=E3=83=88=E3=81=AE?= =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E6=83=85=E5=A0=B1?= =?UTF-8?q?=E3=82=92=E8=A8=AD=E5=AE=9A=E7=94=BB=E9=9D=A2=E3=81=AB=E7=A7=BB?= =?UTF-8?q?=E5=8B=95=E3=80=81UI=20Size=E5=A4=89=E6=9B=B4=E3=80=81=E8=89=B2?= =?UTF-8?q?=E3=81=AE=E5=A4=89=E6=95=B0=E5=8C=96=E3=80=81=E8=A1=A8=E8=A8=98?= =?UTF-8?q?=E3=82=92=E8=8B=B1=E8=AA=9E=E3=81=A8=E6=97=A5=E6=9C=AC=E8=AA=9E?= =?UTF-8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/en.yml | 1 + locales/ja.yml | 1 + view.py | 2 +- vrct_gui/config_window/ConfigWindow.py | 16 +++++++++++++++- vrct_gui/main_window/createMainWindowWidgets.py | 16 ---------------- vrct_gui/ui_managers/ColorThemeManager.py | 1 + vrct_gui/ui_managers/UiScalingManager.py | 1 + 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/locales/en.yml b/locales/en.yml index 88aa52fe..126618bc 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -27,6 +27,7 @@ selectable_language_window: config_window: config_title: Settings compact_mode: Compact Mode + version: version %{version} side_menu_labels: appearance: Appearance translation: Translation diff --git a/locales/ja.yml b/locales/ja.yml index ed424fd0..ef2b2e3d 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -28,6 +28,7 @@ selectable_language_window: config_window: config_title: 設定 compact_mode: コンパクトモード + version: バージョン %{version} side_menu_labels: appearance: デザイン translation: 翻訳 diff --git a/view.py b/view.py index 76d79047..66ec769e 100644 --- a/view.py +++ b/view.py @@ -135,7 +135,7 @@ class View(): ACTIVE_SETTING_BOX_TAB_ATTR_NAME="side_menu_tab_appearance", CALLBACK_SELECTED_SETTING_BOX_TAB=None, VAR_ERROR_MESSAGE=StringVar(value=""), - VAR_VERSION=StringVar(value=config.VERSION), + VAR_VERSION=StringVar(value=i18n.t("config_window.version", version=config.VERSION)), VAR_CONFIG_WINDOW_TITLE=StringVar(value=i18n.t("config_window.config_title")), VAR_CONFIG_WINDOW_COMPACT_MODE_LABEL=StringVar(value=i18n.t("config_window.compact_mode")), diff --git a/vrct_gui/config_window/ConfigWindow.py b/vrct_gui/config_window/ConfigWindow.py index d7be1492..ee88da4b 100644 --- a/vrct_gui/config_window/ConfigWindow.py +++ b/vrct_gui/config_window/ConfigWindow.py @@ -1,7 +1,7 @@ from .widgets import createConfigWindowTitle, createSideMenuAndSettingsBoxContainers, createSettingBoxTopBar -from customtkinter import CTkToplevel, CTkFrame +from customtkinter import CTkToplevel, CTkFrame, CTkLabel, CTkFont from ..ui_utils import getImagePath, getLatestWidth, getLatestHeight from utils import isEven @@ -49,4 +49,18 @@ class ConfigWindow(CTkToplevel): l_width = getLatestWidth(self.side_menu_bg_container) + + # VRCT Now Version Label(Tmp) + version_label = CTkLabel( + self.side_menu_bg_container, + textvariable=self._view_variable.VAR_VERSION, + height=0, + corner_radius=0, + font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.NOW_VERSION_FONT_SIZE, weight="normal"), + anchor="w", + text_color=self.settings.ctm.NOW_VERSION_TEXT_COLOR, + ) + version_label.place(relx=0.05, rely=0.99, anchor="sw") + + self.bind_all("", lambda event: event.widget.focus_set(), "+") \ No newline at end of file diff --git a/vrct_gui/main_window/createMainWindowWidgets.py b/vrct_gui/main_window/createMainWindowWidgets.py index 25021800..14b0eda3 100644 --- a/vrct_gui/main_window/createMainWindowWidgets.py +++ b/vrct_gui/main_window/createMainWindowWidgets.py @@ -43,22 +43,6 @@ def createMainWindowWidgets(vrct_gui, settings, view_variable): # Main Top Bar Container - Right Side # start from 3 main_topbar_column=3 - - # VRCT Now Version Label(Tmp) - vrct_gui.version_label = CTkLabel( - vrct_gui.main_topbar_container, - textvariable=view_variable.VAR_VERSION, - height=0, - corner_radius=0, - font=CTkFont(family=settings.FONT_FAMILY, size=settings.uism.UPDATE_AVAILABLE_BUTTON_FONT_SIZE, weight="normal"), - anchor="e", - text_color="white", - ) - vrct_gui.version_label.grid(row=0, column=main_topbar_column, padx=(0,8)) - main_topbar_column+=1 - - - # Restart Button(Tmp) vrct_gui.restart_button_container = createButtonWithImage( parent_widget=vrct_gui.main_topbar_container, diff --git a/vrct_gui/ui_managers/ColorThemeManager.py b/vrct_gui/ui_managers/ColorThemeManager.py index 541da271..0f46aa14 100644 --- a/vrct_gui/ui_managers/ColorThemeManager.py +++ b/vrct_gui/ui_managers/ColorThemeManager.py @@ -284,6 +284,7 @@ class ColorThemeManager(): self.config_window.SIDE_MENU_SELECTED_MARK_ACTIVE_BG_COLOR = self.main.SF__SWITCH_BOX_ACTIVE_BG_COLOR + self.config_window.NOW_VERSION_TEXT_COLOR = self.DARK_300_COLOR # Error Message Window for Config Window # The color code [#bb4448] is a mixture of [#a9555c] and [#cc3333] (for a redder shade). diff --git a/vrct_gui/ui_managers/UiScalingManager.py b/vrct_gui/ui_managers/UiScalingManager.py index e5c7a41c..1d73764f 100644 --- a/vrct_gui/ui_managers/UiScalingManager.py +++ b/vrct_gui/ui_managers/UiScalingManager.py @@ -169,6 +169,7 @@ class UiScalingManager(): self.config_window.SIDE_MENU_LABELS_IPADY = self._calculateUiSize(8) self.config_window.SIDE_MENU_LABELS_FONT_SIZE = self._calculateUiSize(18) + self.config_window.NOW_VERSION_FONT_SIZE = self._calculateUiSize(12) # Top bar Main self.config_window.TOP_BAR_MAIN__TITLE_FONT_SIZE = self._calculateUiSize(22)