[Update] ソフトのバージョン情報を設定画面に移動、UI Size変更、色の変数化、表記を英語と日本語に対応。

This commit is contained in:
Sakamoto Shiina
2023-10-13 16:56:49 +09:00
parent a2c090f234
commit 376f5e7b5a
7 changed files with 20 additions and 18 deletions

View File

@@ -27,6 +27,7 @@ selectable_language_window:
config_window: config_window:
config_title: Settings config_title: Settings
compact_mode: Compact Mode compact_mode: Compact Mode
version: version %{version}
side_menu_labels: side_menu_labels:
appearance: Appearance appearance: Appearance
translation: Translation translation: Translation

View File

@@ -28,6 +28,7 @@ selectable_language_window:
config_window: config_window:
config_title: 設定 config_title: 設定
compact_mode: コンパクトモード compact_mode: コンパクトモード
version: バージョン %{version}
side_menu_labels: side_menu_labels:
appearance: デザイン appearance: デザイン
translation: 翻訳 translation: 翻訳

View File

@@ -135,7 +135,7 @@ class View():
ACTIVE_SETTING_BOX_TAB_ATTR_NAME="side_menu_tab_appearance", ACTIVE_SETTING_BOX_TAB_ATTR_NAME="side_menu_tab_appearance",
CALLBACK_SELECTED_SETTING_BOX_TAB=None, CALLBACK_SELECTED_SETTING_BOX_TAB=None,
VAR_ERROR_MESSAGE=StringVar(value=""), 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_TITLE=StringVar(value=i18n.t("config_window.config_title")),
VAR_CONFIG_WINDOW_COMPACT_MODE_LABEL=StringVar(value=i18n.t("config_window.compact_mode")), VAR_CONFIG_WINDOW_COMPACT_MODE_LABEL=StringVar(value=i18n.t("config_window.compact_mode")),

View File

@@ -1,7 +1,7 @@
from .widgets import createConfigWindowTitle, createSideMenuAndSettingsBoxContainers, createSettingBoxTopBar 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 ..ui_utils import getImagePath, getLatestWidth, getLatestHeight
from utils import isEven from utils import isEven
@@ -49,4 +49,18 @@ class ConfigWindow(CTkToplevel):
l_width = getLatestWidth(self.side_menu_bg_container) 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("<Button-1>", lambda event: event.widget.focus_set(), "+") self.bind_all("<Button-1>", lambda event: event.widget.focus_set(), "+")

View File

@@ -43,22 +43,6 @@ def createMainWindowWidgets(vrct_gui, settings, view_variable):
# Main Top Bar Container - Right Side # Main Top Bar Container - Right Side
# start from 3 # start from 3
main_topbar_column=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) # Restart Button(Tmp)
vrct_gui.restart_button_container = createButtonWithImage( vrct_gui.restart_button_container = createButtonWithImage(
parent_widget=vrct_gui.main_topbar_container, parent_widget=vrct_gui.main_topbar_container,

View File

@@ -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.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 # Error Message Window for Config Window
# The color code [#bb4448] is a mixture of [#a9555c] and [#cc3333] (for a redder shade). # The color code [#bb4448] is a mixture of [#a9555c] and [#cc3333] (for a redder shade).

View File

@@ -169,6 +169,7 @@ class UiScalingManager():
self.config_window.SIDE_MENU_LABELS_IPADY = self._calculateUiSize(8) self.config_window.SIDE_MENU_LABELS_IPADY = self._calculateUiSize(8)
self.config_window.SIDE_MENU_LABELS_FONT_SIZE = self._calculateUiSize(18) self.config_window.SIDE_MENU_LABELS_FONT_SIZE = self._calculateUiSize(18)
self.config_window.NOW_VERSION_FONT_SIZE = self._calculateUiSize(12)
# Top bar Main # Top bar Main
self.config_window.TOP_BAR_MAIN__TITLE_FONT_SIZE = self._calculateUiSize(22) self.config_window.TOP_BAR_MAIN__TITLE_FONT_SIZE = self._calculateUiSize(22)