every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[bugfix] Main Window: Sidebar compact mode. サイドバーコンパクトモード切り替え時に、各機能のON/OFF状態、選択されたlanguage preset tab noを保持したまま開閉できるように。

Browse Source 
具体的には今までサイドバー開閉はdestroy関数を使用した後widgetごと再生成していたのを、grid_remove() -> grid() を使用し、再生成ではなく再配置にした。
This commit is contained in:
Sakamoto Shiina
2023-09-04 04:53:37 +09:00
parent 4466e01458
commit 434faafe94
4 changed files with 77 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
vrct_gui/main_window/widgets/_create_sidebar/createSidebarFeatures.py
View File

@@ -36,25 +36,30 @@ def createSidebarFeatures(settings, main_window):
def changeSidebarFeaturesColorByEvents(ww, event_name):
target_frame_widget = getattr(main_window, ww)
target_compact_mode_frame_widget = getattr(main_window, "compact_mode_"+ww)
if event_name == "enter":
target_frame_widget.configure(fg_color=settings.ctm.SF__HOVERED_BG_COLOR)
target_frame_widget.children["!ctkswitch"].configure(fg_color=settings.ctm.SF__SWITCH_BOX_HOVERED_BG_COLOR, progress_color=settings.ctm.SF__SWITCH_BOX_ACTIVE_HOVERED_BG_COLOR)
target_frame_widget.children["!ctkframe"].configure(fg_color=settings.ctm.SF__SELECTED_MARK_ACTIVE_HOVERED_BG_COLOR)
target_compact_mode_frame_widget.configure(fg_color=settings.ctm.SF__HOVERED_BG_COLOR)
target_compact_mode_frame_widget.children["!ctkframe"].configure(fg_color=settings.ctm.SF__SELECTED_MARK_ACTIVE_HOVERED_BG_COLOR)
elif event_name == "leave":
target_frame_widget.configure(fg_color=settings.ctm.SF__BG_COLOR)
target_frame_widget.children["!ctkswitch"].configure(fg_color=settings.ctm.SF__SWITCH_BOX_BG_COLOR, progress_color=settings.ctm.SF__SWITCH_BOX_ACTIVE_BG_COLOR)
target_frame_widget.children["!ctkframe"].configure(fg_color=settings.ctm.SF__SELECTED_MARK_ACTIVE_BG_COLOR)
target_compact_mode_frame_widget.configure(fg_color=settings.ctm.SF__BG_COLOR)
target_compact_mode_frame_widget.children["!ctkframe"].configure(fg_color=settings.ctm.SF__SELECTED_MARK_ACTIVE_BG_COLOR)
elif event_name == "button_press":
target_frame_widget.configure(fg_color=settings.ctm.SF__CLICKED_BG_COLOR)
target_frame_widget.children["!ctkswitch"].configure(fg_color=settings.ctm.SF__SWITCH_BOX_CLICKED_BG_COLOR, progress_color=settings.ctm.SF__SWITCH_BOX_ACTIVE_CLICKED_BG_COLOR)
target_frame_widget.children["!ctkframe"].configure(fg_color=settings.ctm.SF__SELECTED_MARK_ACTIVE_CLICKED_BG_COLOR)
target_compact_mode_frame_widget.configure(fg_color=settings.ctm.SF__CLICKED_BG_COLOR)
target_compact_mode_frame_widget.children["!ctkframe"].configure(fg_color=settings.ctm.SF__SELECTED_MARK_ACTIVE_CLICKED_BG_COLOR)
elif event_name == "button_release":
target_frame_widget.configure(fg_color=settings.ctm.SF__BG_COLOR)
target_frame_widget.children["!ctkswitch"].configure(fg_color=settings.ctm.SF__SWITCH_BOX_BG_COLOR, progress_color=settings.ctm.SF__SWITCH_BOX_ACTIVE_BG_COLOR)
target_frame_widget.children["!ctkframe"].configure(fg_color=settings.ctm.SF__SELECTED_MARK_ACTIVE_BG_COLOR)
target_compact_mode_frame_widget.configure(fg_color=settings.ctm.SF__BG_COLOR)
target_compact_mode_frame_widget.children["!ctkframe"].configure(fg_color=settings.ctm.SF__SELECTED_MARK_ACTIVE_BG_COLOR)
@@ -62,14 +67,6 @@ def createSidebarFeatures(settings, main_window):
# # Side Bar Container
# main_window.sidebar_bg_container = CTkFrame(main_window, corner_radius=0, fg_color=settings.ctm.SIDEBAR_BG_COLOR, width=0, height=0)
# main_window.sidebar_bg_container.grid(row=0, column=0, sticky="nsew")
MIN_SIDEBAR_WIDTH = settings.uism.COMPACT_MODE_SIDEBAR_WIDTH if main_window.view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE is True else settings.uism.SIDEBAR_WIDTH
main_window.sidebar_bg_container.grid_columnconfigure(0, weight=0, minsize=MIN_SIDEBAR_WIDTH)
main_window.grid_rowconfigure(0, weight=1)
(img, width, height) = openImageKeepAspectRatio(settings.image_filename.VRCT_LOGO, settings.uism.SF__LOGO_MAX_SIZE)
@@ -80,25 +77,22 @@ def createSidebarFeatures(settings, main_window):
height=0,
image=CTkImage(img, size=(width,height))
)
main_window.sidebar_logo.grid(row=0, column=0, pady=settings.uism.SF__LOGO_PADY)
# "height-a_s" represents the adjustment in size, and the "pady+a_s/2" indicates a padding increase of 4 pixels to compensate for the reduction.
a_s = settings.uism.SF__LOGO_HEIGHT_FOR_ADJUSTMENT
(img, width, height) = openImageKeepAspectRatio(settings.image_filename.VRCT_LOGO_MARK, height-a_s)
main_window.sidebar_compact_mode_logo = CTkLabel(
main_window.sidebar_bg_container,
main_window.sidebar_compact_mode_bg_container,
fg_color=settings.ctm.SIDEBAR_BG_COLOR,
text=None,
height=0,
image=CTkImage(img, size=(width,height))
)
if main_window.view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE is True:
main_window.sidebar_compact_mode_logo.grid(row=0, column=0, pady=(
int(settings.uism.SF__LOGO_PADY[0]+a_s/2),
int(settings.uism.SF__LOGO_PADY[1]+a_s/2)
))
else:
main_window.sidebar_logo.grid(row=0, column=0, pady=settings.uism.SF__LOGO_PADY)
main_window.sidebar_compact_mode_logo.grid(row=0, column=0, pady=(
int(settings.uism.SF__LOGO_PADY[0]+a_s/2),
int(settings.uism.SF__LOGO_PADY[1]+a_s/2)
))
# Sidebar Features
main_window.sidebar_features_container = CTkFrame(main_window.sidebar_bg_container, corner_radius=0, fg_color="transparent", width=0, height=0)
@@ -107,6 +101,13 @@ def createSidebarFeatures(settings, main_window):
# Sidebar Features Compact Mode
main_window.sidebar_compact_mode_features_container = CTkFrame(main_window.sidebar_compact_mode_bg_container, corner_radius=0, fg_color="transparent", width=0, height=0)
main_window.sidebar_compact_mode_features_container.grid(row=1, column=0, pady=0, sticky="ew")
main_window.sidebar_compact_mode_features_container.grid_columnconfigure(0, weight=1)
sidebar_features_settings = [
{
"frame_attr_name": "translation_frame",
@@ -115,6 +116,7 @@ def createSidebarFeatures(settings, main_window):
"toggle_switch_box_command": lambda e: main_window.translation_switch_box.toggle(),
"label_attr_name": "label_translation",
"compact_mode_icon_attr_name": "translation_compact_mode_icon",
"compact_mode_frame_attr_name": "compact_mode_translation_frame",
"selected_mark_attr_name": "translation_selected_mark",
"var_label_text": main_window.view_variable.VAR_LABEL_TRANSLATION,
"icon_file_name": settings.image_filename.TRANSLATION_ICON,
@@ -126,6 +128,7 @@ def createSidebarFeatures(settings, main_window):
"toggle_switch_box_command": lambda e: main_window.transcription_send_switch_box.toggle(),
"label_attr_name": "label_transcription_send",
"compact_mode_icon_attr_name": "transcription_send_compact_mode_icon",
"compact_mode_frame_attr_name": "compact_mode_transcription_send_frame",
"selected_mark_attr_name": "transcription_send_selected_mark",
"var_label_text": main_window.view_variable.VAR_LABEL_TRANSCRIPTION_SEND,
"icon_file_name": settings.image_filename.MIC_ICON,
@@ -137,6 +140,7 @@ def createSidebarFeatures(settings, main_window):
"toggle_switch_box_command": lambda e: main_window.transcription_receive_switch_box.toggle(),
"label_attr_name": "label_transcription_receive",
"compact_mode_icon_attr_name": "transcription_receive_compact_mode_icon",
"compact_mode_frame_attr_name": "compact_mode_transcription_receive_frame",
"selected_mark_attr_name": "transcription_receive_selected_mark",
"var_label_text": main_window.view_variable.VAR_LABEL_TRANSCRIPTION_RECEIVE,
"icon_file_name": settings.image_filename.HEADPHONES_ICON,
@@ -148,6 +152,7 @@ def createSidebarFeatures(settings, main_window):
"toggle_switch_box_command": lambda e: main_window.foreground_switch_box.toggle(),
"label_attr_name": "label_foreground",
"compact_mode_icon_attr_name": "foreground_compact_mode_icon",
"compact_mode_frame_attr_name": "compact_mode_foreground_frame",
"selected_mark_attr_name": "foreground_selected_mark",
"var_label_text": main_window.view_variable.VAR_LABEL_FOREGROUND,
"icon_file_name": settings.image_filename.FOREGROUND_ICON,
@@ -164,6 +169,7 @@ def createSidebarFeatures(settings, main_window):
toggle_switch_box_command = sfs["toggle_switch_box_command"]
label_attr_name = sfs["label_attr_name"]
compact_mode_icon_attr_name = sfs["compact_mode_icon_attr_name"]
compact_mode_frame_attr_name = sfs["compact_mode_frame_attr_name"]
selected_mark_attr_name = sfs["selected_mark_attr_name"]
var_label_text = sfs["var_label_text"]
icon_file_name = sfs["icon_file_name"]
@@ -174,6 +180,13 @@ def createSidebarFeatures(settings, main_window):
frame_widget.grid(row=row, column=0, pady=(0,1), sticky="ew")
frame_widget.grid_columnconfigure(0, weight=1)
compact_mode_frame_widget = CTkFrame(main_window.sidebar_compact_mode_features_container, corner_radius=0, fg_color=settings.ctm.SF__BG_COLOR, cursor="hand2", width=0, height=0)
setattr(main_window, compact_mode_frame_attr_name, compact_mode_frame_widget)
compact_mode_frame_widget.grid(row=row, column=0, pady=(0,1), sticky="ew")
compact_mode_frame_widget.grid_columnconfigure(0, weight=1)
label_widget = CTkLabel(
frame_widget,
textvariable=var_label_text,
@@ -217,7 +230,7 @@ def createSidebarFeatures(settings, main_window):
# for compact mode
compact_mode_icon_widget = CTkLabel(
frame_widget,
compact_mode_frame_widget,
text=None,
height=0,
corner_radius=0,
@@ -225,26 +238,31 @@ def createSidebarFeatures(settings, main_window):
)
setattr(main_window, compact_mode_icon_attr_name, compact_mode_icon_widget)
selected_mark_widget = CTkFrame(frame_widget, corner_radius=0, fg_color=settings.ctm.SF__SELECTED_MARK_ACTIVE_BG_COLOR, width=settings.uism.SF__SELECTED_MARK_WIDTH, height=0)
selected_mark_widget = CTkFrame(
compact_mode_frame_widget,
corner_radius=0,
fg_color=settings.ctm.SF__SELECTED_MARK_ACTIVE_BG_COLOR,
width=settings.uism.SF__SELECTED_MARK_WIDTH,
height=0
)
setattr(main_window, selected_mark_attr_name, selected_mark_widget)
# Arrange
if main_window.view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE is True:
compact_mode_icon_widget.grid(row=row, column=0, pady=settings.uism.SF__COMPACT_MODE_ICON_PADY)
selected_mark_widget.place(relx=-1, rely=0.5, relheight=0.75, anchor="center")
else:
label_widget.grid(row=row, column=0, pady=settings.uism.SF__LABELS_IPADY, padx=(settings.uism.SF__LABEL_LEFT_PAD,0), sticky="ew")
switch_box_widget.grid(row=row, column=0, padx=(0,settings.uism.SF__SWITCH_BOX_RIGHT_PAD), sticky="e")
compact_mode_icon_widget.grid(row=row, column=0, pady=settings.uism.SF__COMPACT_MODE_ICON_PADY)
selected_mark_widget.place(relx=-1, rely=0.5, relheight=0.75, anchor="center")
label_widget.grid(row=row, column=0, pady=settings.uism.SF__LABELS_IPADY, padx=(settings.uism.SF__LABEL_LEFT_PAD,0), sticky="ew")
switch_box_widget.grid(row=row, column=0, padx=(0,settings.uism.SF__SWITCH_BOX_RIGHT_PAD), sticky="e")
# Unbind the event "<Button-1>" originally set up by the widget to manually control it.
switch_box_widget._canvas.unbind("<Button-1>")
switch_box_widget._text_label.unbind("<Button-1>")
bindButtonReleaseFunction([compact_mode_icon_widget, frame_widget, label_widget, selected_mark_widget, switch_box_widget._canvas, switch_box_widget._bg_canvas], toggle_switch_box_command)
bindButtonReleaseFunction([compact_mode_icon_widget, frame_widget, compact_mode_frame_widget, label_widget, selected_mark_widget, switch_box_widget._canvas, switch_box_widget._bg_canvas], toggle_switch_box_command)
retag("vrct_"+frame_attr_name, compact_mode_icon_widget, frame_widget, label_widget, selected_mark_widget, switch_box_widget)
retag("vrct_"+frame_attr_name, compact_mode_icon_widget, frame_widget, compact_mode_frame_widget, label_widget, selected_mark_widget, switch_box_widget)
def commonEventFunction(e, event_type):
for ww in e.widget.master.bindtags():
@@ -265,12 +283,8 @@ def createSidebarFeatures(settings, main_window):
def buttonReleasedFunction(e):
commonEventFunction(e, "button_release")
bindEnterAndLeaveFunction([compact_mode_icon_widget, frame_widget, label_widget, selected_mark_widget, switch_box_widget._canvas, switch_box_widget._bg_canvas], enterFunction, leaveFunction)
bindButtonPressAndReleaseFunction([compact_mode_icon_widget, frame_widget, label_widget, selected_mark_widget, switch_box_widget._canvas, switch_box_widget._bg_canvas], buttonPressFunction, buttonReleasedFunction)
row+=1
bindEnterAndLeaveFunction([compact_mode_icon_widget, frame_widget, compact_mode_frame_widget, label_widget, selected_mark_widget, switch_box_widget._canvas, switch_box_widget._bg_canvas], enterFunction, leaveFunction)
bindButtonPressAndReleaseFunction([compact_mode_icon_widget, frame_widget, compact_mode_frame_widget, label_widget, selected_mark_widget, switch_box_widget._canvas, switch_box_widget._bg_canvas], buttonPressFunction, buttonReleasedFunction)
row+=1

3
vrct_gui/main_window/widgets/_create_sidebar/createSidebarLanguagesSettings.py
View File

@@ -120,8 +120,7 @@ def createSidebarLanguagesSettings(settings, main_window):
# Sidebar Languages Settings, SLS
main_window.sls__container = CTkFrame(main_window.sidebar_bg_container, corner_radius=0, fg_color=settings.ctm.SIDEBAR_BG_COLOR, width=0, height=0)
if main_window.view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE is False:
main_window.sls__container.grid(row=2, column=0, sticky="new")
main_window.sls__container.grid(row=2, column=0, sticky="new")
main_window.sls__container.grid_columnconfigure(0, weight=1)

19
vrct_gui/main_window/widgets/create_sidebar.py
View File

@@ -8,9 +8,24 @@ from ._create_sidebar import createSidebarFeatures, createSidebarLanguagesSettin
def createSidebar(settings, main_window):
# Side Bar Container
main_window.grid_rowconfigure(0, weight=1)
main_window.sidebar_bg_container = CTkFrame(main_window, corner_radius=0, fg_color=settings.ctm.SIDEBAR_BG_COLOR, width=0, height=0)
main_window.sidebar_bg_container.grid(row=0, column=0, sticky="nsew")
main_window.sidebar_compact_mode_bg_container = CTkFrame(main_window, corner_radius=0, fg_color=settings.ctm.SIDEBAR_BG_COLOR, width=0, height=0)
main_window.sidebar_bg_container.grid_columnconfigure(0, weight=0, minsize=settings.uism.SIDEBAR_WIDTH)
main_window.sidebar_compact_mode_bg_container.grid_columnconfigure(0, weight=0, minsize=settings.uism.COMPACT_MODE_SIDEBAR_WIDTH)
createSidebarFeatures(settings, main_window)
createSidebarLanguagesSettings(settings, main_window)
createSidebarLanguagesSettings(settings, main_window)
main_window.sidebar_bg_container.grid(row=0, column=0, sticky="nsew")
main_window.sidebar_compact_mode_bg_container.grid(row=0, column=0, sticky="nsew")
if main_window.view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE:
main_window.sidebar_bg_container.grid_remove()
else:
main_window.sidebar_compact_mode_bg_container.grid_remove()

9
vrct_gui/vrct_gui.py
View File

@@ -81,8 +81,13 @@ class VRCT_GUI(CTk):
def recreateMainWindowSidebar(self):
self.minimize_sidebar_button_container.destroy()
createMinimizeSidebarButton(self.settings.main, self)
self.sidebar_bg_container.destroy()
createSidebar(self.settings.main, self)
if self.view_variable.IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE:
self.sidebar_bg_container.grid_remove()
self.sidebar_compact_mode_bg_container.grid()
else:
self.sidebar_compact_mode_bg_container.grid_remove()
self.sidebar_bg_container.grid()
vrct_gui = VRCT_GUI()