[Update] Config Window: 再起動が必要な変更がある場合に、再起動ボタンを表示。(現状、設定が変わらなくても変更しようとすると表示される状態ではある。例: UI size 100%からもう一度100%を選択した場合など)
This commit is contained in:
@@ -0,0 +1,37 @@
|
||||
from customtkinter import CTkFont, CTkFrame, CTkLabel
|
||||
from utils import callFunctionIfCallable
|
||||
from ....ui_utils import bindButtonFunctionAndColor
|
||||
|
||||
def _createRestartButton(parent_widget, config_window, settings, view_variable, column_num):
|
||||
|
||||
parent_widget.grid_columnconfigure(0, weight=1)
|
||||
config_window.restart_button_container = CTkFrame(parent_widget, corner_radius=20, fg_color=settings.ctm.RESTART_BUTTON_BG_COLOR, width=0, height=0, cursor="hand2")
|
||||
config_window.restart_button_container.grid(row=0, column=column_num, padx=settings.uism.RESTART_BUTTON_PADX, sticky="ew")
|
||||
|
||||
|
||||
config_window.restart_button_container.grid_rowconfigure(0, weight=1)
|
||||
config_window.restart_button_label = CTkLabel(
|
||||
config_window.restart_button_container,
|
||||
height=0,
|
||||
textvariable=view_variable.VAR_CONFIG_WINDOW_RESTART_BUTTON_LABEL,
|
||||
anchor="w",
|
||||
font=CTkFont(family=settings.FONT_FAMILY, size=settings.uism.RESTART_BUTTON_LABEL_FONT_SIZE, weight="normal"),
|
||||
text_color=settings.ctm.LABELS_TEXT_COLOR
|
||||
)
|
||||
config_window.restart_button_label.grid(row=0, column=0, padx=20, pady=10)
|
||||
|
||||
|
||||
|
||||
bindButtonFunctionAndColor(
|
||||
target_widgets=[
|
||||
config_window.restart_button_container,
|
||||
config_window.restart_button_label,
|
||||
],
|
||||
enter_color=settings.ctm.RESTART_BUTTON_HOVERED_BG_COLOR,
|
||||
leave_color=settings.ctm.RESTART_BUTTON_BG_COLOR,
|
||||
clicked_color=settings.ctm.RESTART_BUTTON_CLICKED_BG_COLOR,
|
||||
buttonReleasedFunction=lambda _e: callFunctionIfCallable(view_variable.CALLBACK_RESTART_SOFTWARE),
|
||||
)
|
||||
|
||||
|
||||
config_window.restart_button_container.grid_remove()
|
||||
@@ -1,6 +1,7 @@
|
||||
from customtkinter import CTkFont, CTkFrame, CTkLabel
|
||||
|
||||
from ._createSettingBoxTitle import _createSettingBoxTitle
|
||||
from ._createRestartButton import _createRestartButton
|
||||
from ._createSettingBoxCompactModeButton import _createSettingBoxCompactModeButton
|
||||
|
||||
from ....ui_utils import getLatestHeight, getLatestWidth
|
||||
@@ -22,6 +23,10 @@ def createSettingBoxTopBar(config_window, settings, view_variable):
|
||||
config_window.setting_box_top_bar.grid_columnconfigure(column_num, weight=1)
|
||||
column_num+=1
|
||||
|
||||
# Restart Button(Tmp)
|
||||
_createRestartButton(parent_widget=config_window.setting_box_top_bar, config_window=config_window, settings=settings, view_variable=view_variable, column_num=column_num)
|
||||
column_num+=1
|
||||
|
||||
_createSettingBoxCompactModeButton(parent_widget=config_window.setting_box_top_bar, config_window=config_window, settings=settings, view_variable=view_variable, column_num=column_num)
|
||||
column_num+=1
|
||||
|
||||
|
||||
@@ -43,22 +43,6 @@ def createMainWindowWidgets(vrct_gui, settings, view_variable):
|
||||
# Main Top Bar Container - Right Side
|
||||
# start from 3
|
||||
main_topbar_column=3
|
||||
# Restart Button(Tmp)
|
||||
vrct_gui.restart_button_container = createButtonWithImage(
|
||||
parent_widget=vrct_gui.main_topbar_container,
|
||||
button_fg_color=settings.ctm.HELP_AND_INFO_BUTTON_BG_COLOR,
|
||||
button_enter_color=settings.ctm.HELP_AND_INFO_BUTTON_HOVERED_BG_COLOR,
|
||||
button_clicked_color=settings.ctm.HELP_AND_INFO_BUTTON_CLICKED_BG_COLOR,
|
||||
button_image_file=settings.image_file.VRCT_LOGO_MARK,
|
||||
button_image_size=settings.uism.HELP_AND_INFO_BUTTON_SIZE,
|
||||
button_ipadxy=settings.uism.HELP_AND_INFO_BUTTON_IPADXY,
|
||||
button_command=lambda e: callFunctionIfCallable(view_variable.CALLBACK_RESTART_SOFTWARE),
|
||||
corner_radius=settings.uism.HELP_AND_INFO_BUTTON_CORNER_RADIUS,
|
||||
)
|
||||
vrct_gui.restart_button_container.grid(row=0, column=main_topbar_column, padx=settings.uism.HELP_AND_INFO_BUTTON_PADX, pady=settings.uism.TOP_BAR_BUTTON_PADY, sticky="e")
|
||||
main_topbar_column+=1
|
||||
|
||||
|
||||
# Update Available Button
|
||||
vrct_gui.update_available_container = CTkFrame(
|
||||
vrct_gui.main_topbar_container,
|
||||
|
||||
@@ -225,6 +225,13 @@ class ColorThemeManager():
|
||||
|
||||
# Top bar
|
||||
self.config_window.TOP_BAR_BG_COLOR = self.DARK_850_COLOR
|
||||
|
||||
# Restart Button
|
||||
self.config_window.RESTART_BUTTON_BG_COLOR = self.PRIMARY_600_COLOR
|
||||
self.config_window.RESTART_BUTTON_HOVERED_BG_COLOR = self.PRIMARY_500_COLOR
|
||||
self.config_window.RESTART_BUTTON_CLICKED_BG_COLOR = self.PRIMARY_700_COLOR
|
||||
|
||||
|
||||
# Compact Mode
|
||||
self.config_window.COMPACT_MODE_SWITCH_BOX_ACTIVE_BG_COLOR = self.main.SF__SWITCH_BOX_ACTIVE_BG_COLOR
|
||||
|
||||
|
||||
@@ -155,6 +155,10 @@ class UiScalingManager():
|
||||
self.config_window.TOP_BAR_SIDE__CONFIG_TITLE_LEFT_PADX = int(self.config_window.TOP_BAR_SIDE__CONFIG_TITLE_FONT_SIZE + self._calculateUiSize(16))
|
||||
self.config_window.TOP_BAR_SIDE__TITLE_PADX= self._calculateUiSize(30)
|
||||
|
||||
# Restart Button
|
||||
self.config_window.RESTART_BUTTON_LABEL_FONT_SIZE = self._calculateUiSize(12)
|
||||
self.config_window.RESTART_BUTTON_PADX = (0, self._calculateUiSize(20))
|
||||
|
||||
# Compact Mode
|
||||
self.config_window.COMPACT_MODE_PADX = (0, self._calculateUiSize(20))
|
||||
self.config_window.COMPACT_MODE_LABEL_FONT_SIZE = self._calculateUiSize(12)
|
||||
|
||||
Reference in New Issue
Block a user