From 3714162340195972eb1d9af2854755983a4d89c9 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Wed, 13 Sep 2023 10:14:57 +0900 Subject: [PATCH] =?UTF-8?q?[Update]=20Main=20Window:=20Sidebar=20Language?= =?UTF-8?q?=20Settings=20DropdownButton=20=E3=83=9B=E3=83=90=E3=83=BC?= =?UTF-8?q?=E6=99=82=E3=81=A8=E3=82=AF=E3=83=AA=E3=83=83=E3=82=AF=E6=99=82?= =?UTF-8?q?=E3=81=AE=E8=89=B2=E3=82=92=E8=BF=BD=E5=8A=A0=E3=80=82=20?= =?UTF-8?q?=E3=81=9D=E3=81=AE=E4=BB=96=E8=A6=81=E3=82=89=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E3=81=AE=E5=89=8A=E9=99=A4=E3=82=84?= =?UTF-8?q?=E3=80=81widget=E3=81=AE=E8=A6=AAframe=E3=81=AE=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E5=BF=98=E3=82=8C(=E8=A2=AB=E3=82=8A)=E3=81=AE?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../createSidebarLanguagesSettings.py | 38 ++++--------------- vrct_gui/ui_managers/ColorThemeManager.py | 2 + 2 files changed, 9 insertions(+), 31 deletions(-) diff --git a/vrct_gui/main_window/widgets/_create_sidebar/createSidebarLanguagesSettings.py b/vrct_gui/main_window/widgets/_create_sidebar/createSidebarLanguagesSettings.py index 493092b6..08dd9c70 100644 --- a/vrct_gui/main_window/widgets/_create_sidebar/createSidebarLanguagesSettings.py +++ b/vrct_gui/main_window/widgets/_create_sidebar/createSidebarLanguagesSettings.py @@ -51,29 +51,7 @@ def createSidebarLanguagesSettings(settings, main_window, view_variable): - - - def createOption_DropdownMenu_for_languageSettings(setattr_obj, parent_widget, optionmenu_attr_name, dropdown_menu_values, command, width:int = 200, font_size:int = 10, text_color="white", variable=""): - setattr(setattr_obj, optionmenu_attr_name, CTkOptionMenu( - parent_widget, - height=30, - width=width, - values=dropdown_menu_values, - button_color=settings.ctm.SLS__DROPDOWN_MENU_BG_COLOR, - fg_color=settings.ctm.SLS__DROPDOWN_MENU_BG_COLOR, - text_color=text_color, - font=CTkFont(family=settings.FONT_FAMILY, size=font_size, weight="normal"), - variable=variable, - anchor="center", - command=command, - )) - target_optionmenu_attr = getattr(setattr_obj, optionmenu_attr_name) - target_optionmenu_attr.grid(row=0, column=0, sticky="e") - - - - - def createLanguageSettingBox(parent_widget, var_title_text, title_text_attr_name, arrow_img_attr_name, dropdown_menu_values, open_selectable_language_window_command, variable): + def createLanguageSettingBox(parent_widget, var_title_text, title_text_attr_name, arrow_img_attr_name, open_selectable_language_window_command, variable): sls__box = CTkFrame(parent_widget, corner_radius=0, fg_color=settings.ctm.SLS__BOX_BG_COLOR, width=0, height=0) sls__box.columnconfigure((0,2), weight=1) @@ -102,11 +80,11 @@ def createSidebarLanguagesSettings(settings, main_window, view_variable): sls__selected_language_box.columnconfigure(0, minsize=200) sls__selected_language_box.rowconfigure(0, minsize=30) - sls__selected_language_label = CTkFrame(sls__selected_language_box, corner_radius=0, fg_color=settings.ctm.SLS__DROPDOWN_MENU_BG_COLOR) - sls__selected_language_label.grid(row=0, column=0) + sls__selected_language_label_frame = CTkFrame(sls__selected_language_box, corner_radius=0, fg_color=settings.ctm.SLS__DROPDOWN_MENU_BG_COLOR) + sls__selected_language_label_frame.grid(row=0, column=0) sls__selected_language_label = CTkLabel( - sls__selected_language_label, + sls__selected_language_label_frame, textvariable=variable, height=0, # anchor="center", @@ -133,12 +111,12 @@ def createSidebarLanguagesSettings(settings, main_window, view_variable): - # bindEnterAndLeaveColor([self.wrapper, label_widget], self.settings.ctm.LANGUAGE_BUTTON_BG_HOVERED_COLOR, self.settings.ctm.LANGUAGE_BUTTON_BG_COLOR) - # bindButtonPressColor([self.wrapper, label_widget], self.settings.ctm.LANGUAGE_BUTTON_BG_CLICKED_COLOR, self.settings.ctm.LANGUAGE_BUTTON_BG_COLOR) + bindEnterAndLeaveColor([sls__selected_language_label_frame, sls__selected_language_box, sls__selected_language_label], settings.ctm.SLS__DROPDOWN_MENU_HOVERED_BG_COLOR, settings.ctm.SLS__DROPDOWN_MENU_BG_COLOR) + bindButtonPressColor([sls__selected_language_label_frame, sls__selected_language_box, sls__selected_language_label], settings.ctm.SLS__DROPDOWN_MENU_CLICKED_BG_COLOR, settings.ctm.SLS__DROPDOWN_MENU_HOVERED_BG_COLOR) - bindButtonReleaseFunction([sls__selected_language_box, sls__selected_language_label, sls__selected_language_arrow_img], open_selectable_language_window_command) + bindButtonReleaseFunction([sls__selected_language_label_frame, sls__selected_language_box, sls__selected_language_label, sls__selected_language_arrow_img], open_selectable_language_window_command) return sls__box @@ -251,7 +229,6 @@ def createSidebarLanguagesSettings(settings, main_window, view_variable): var_title_text=view_variable.VAR_LABEL_YOUR_LANGUAGE, title_text_attr_name="sls__title_text_your_language", arrow_img_attr_name="sls__arrow_img_your_language", - dropdown_menu_values=view_variable.LIST_SELECTABLE_LANGUAGES, open_selectable_language_window_command=callbackOpenSelectableYourLanguageWindow, variable=view_variable.VAR_YOUR_LANGUAGE ) @@ -299,7 +276,6 @@ def createSidebarLanguagesSettings(settings, main_window, view_variable): var_title_text=view_variable.VAR_LABEL_TARGET_LANGUAGE, title_text_attr_name="sls__title_text_target_language", arrow_img_attr_name="sls__arrow_img_target_language", - dropdown_menu_values=view_variable.LIST_SELECTABLE_LANGUAGES, open_selectable_language_window_command=callbackOpenSelectableTargetLanguageWindow, variable=view_variable.VAR_TARGET_LANGUAGE ) diff --git a/vrct_gui/ui_managers/ColorThemeManager.py b/vrct_gui/ui_managers/ColorThemeManager.py index 85600f13..029d34b8 100644 --- a/vrct_gui/ui_managers/ColorThemeManager.py +++ b/vrct_gui/ui_managers/ColorThemeManager.py @@ -151,6 +151,8 @@ class ColorThemeManager(): self.main.SLS__BOX_ARROWS_TEXT_COLOR = self.DARK_500_COLOR self.main.SLS__DROPDOWN_MENU_BG_COLOR = self.DARK_888_COLOR + self.main.SLS__DROPDOWN_MENU_HOVERED_BG_COLOR = self.DARK_875_COLOR + self.main.SLS__DROPDOWN_MENU_CLICKED_BG_COLOR = self.DARK_900_COLOR self.main.CONFIG_BUTTON_BG_COLOR = self.main.SIDEBAR_BG_COLOR