From cfca2be71e216c1185c90058ff67f35bdab05242 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Wed, 20 Sep 2023 20:02:07 +0900 Subject: [PATCH] =?UTF-8?q?[Refactor]=20Config=20Window:=20Setting=20Box?= =?UTF-8?q?=E5=9B=9E=E3=82=8A=E3=80=82=E5=85=B1=E9=80=9A=E3=81=A7=E4=BD=BF?= =?UTF-8?q?=E3=81=86=E5=A4=89=E6=95=B0=E3=82=92=E3=82=AF=E3=83=A9=E3=82=B9?= =?UTF-8?q?=E5=A4=89=E6=95=B0=E3=81=AB=E3=81=97=E3=81=9F=E3=82=8A=E3=80=81?= =?UTF-8?q?ctm(=E8=89=B2)=E3=82=84uism(=E3=82=B5=E3=82=A4=E3=82=BA)?= =?UTF-8?q?=E3=82=82settings=E3=81=AB=E3=81=BE=E3=81=A8=E3=82=81=E3=81=9F?= =?UTF-8?q?=E3=82=8A=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_SettingBoxGenerator.py | 199 +++++++++--------- .../createSettingBox_AdvancedSettings.py | 4 +- .../createSettingBox_Appearance.py | 7 +- .../createSettingBox_Others.py | 8 +- .../createSettingBox_Mic.py | 10 +- .../createSettingBox_Speaker.py | 8 +- .../createSettingBox_Translation.py | 3 +- 7 files changed, 105 insertions(+), 134 deletions(-) diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/_SettingBoxGenerator.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/_SettingBoxGenerator.py index c84012bd..70afcedd 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/_SettingBoxGenerator.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/_SettingBoxGenerator.py @@ -5,17 +5,16 @@ from vrct_gui.ui_utils import createButtonWithImage from typing import Union class _SettingBoxGenerator(): - def __init__(self, config_window, settings): + def __init__(self, parent_widget, config_window, settings): self.IS_CONFIG_WINDOW_COMPACT_MODE = settings.IS_CONFIG_WINDOW_COMPACT_MODE - self.ctm = settings.ctm - self.uism = settings.uism - self.FONT_FAMILY = settings.FONT_FAMILY self.config_window = config_window + self.parent_widget = parent_widget + self.settings = settings - def _createSettingBoxFrame(self, parent_widget, for_var_label_text, for_var_desc_text): - setting_box_frame = CTkFrame(parent_widget, corner_radius=0, fg_color=self.ctm.SB__BG_COLOR, width=0, height=0) + def _createSettingBoxFrame(self, for_var_label_text, for_var_desc_text): + setting_box_frame = CTkFrame(self.parent_widget, corner_radius=0, fg_color=self.settings.ctm.SB__BG_COLOR, width=0, height=0) # setting_box_frame = CTkFrame(parent_widget, corner_radius=0, fg_color="gray", width=0, height=0) # "pady=(0,1)" is for bottom padding. It can be removed(override) when you do like "self.attr_name.grid(row=row, pady=0)" @@ -24,13 +23,13 @@ class _SettingBoxGenerator(): # setting_box_frame_wrapper = CTkFrame(setting_box_frame, corner_radius=0, fg_color="gray", width=0, height=0) - setting_box_frame_wrapper = CTkFrame(setting_box_frame, corner_radius=0, fg_color=self.ctm.SB__BG_COLOR, width=self.uism.SB__MAIN_WIDTH, height=0) - setting_box_frame_wrapper.grid(row=0, column=0, padx=self.uism.SB__IPADX, pady=self.uism.SB__IPADY, sticky="ew") - setting_box_frame_wrapper.grid_columnconfigure((0,1), weight=1, minsize=int(self.uism.SB__MAIN_WIDTH / 2)) + setting_box_frame_wrapper = CTkFrame(setting_box_frame, corner_radius=0, fg_color=self.settings.ctm.SB__BG_COLOR, width=self.settings.uism.SB__MAIN_WIDTH, height=0) + setting_box_frame_wrapper.grid(row=0, column=0, padx=self.settings.uism.SB__IPADX, pady=self.settings.uism.SB__IPADY, sticky="ew") + setting_box_frame_wrapper.grid_columnconfigure((0,1), weight=1, minsize=int(self.settings.uism.SB__MAIN_WIDTH / 2)) # setting_box_frame_wrapper.grid(column=0, padx=0, pady=0) - setting_box_frame_wrapper.grid(row=0, column=0, padx=self.uism.SB__IPADX, pady=self.uism.SB__IPADY, sticky="ew") + setting_box_frame_wrapper.grid(row=0, column=0, padx=self.settings.uism.SB__IPADX, pady=self.settings.uism.SB__IPADY, sticky="ew") self._setSettingBoxLabels(setting_box_frame_wrapper, for_var_label_text, for_var_desc_text) @@ -38,7 +37,7 @@ class _SettingBoxGenerator(): def _setSettingBoxLabels(self, setting_box_frame_wrapper, for_var_label_text, for_var_desc_text=None): - setting_box_labels_frame = CTkFrame(setting_box_frame_wrapper, corner_radius=0, fg_color=self.ctm.SB__BG_COLOR, width=0, height=0) + setting_box_labels_frame = CTkFrame(setting_box_frame_wrapper, corner_radius=0, fg_color=self.settings.ctm.SB__BG_COLOR, width=0, height=0) setting_box_labels_frame.grid(row=0, column=0, padx=0, pady=0, sticky="w") setting_box_label = CTkLabel( @@ -46,8 +45,8 @@ class _SettingBoxGenerator(): textvariable=for_var_label_text, anchor="w", # height=0, - font=CTkFont(family=self.FONT_FAMILY, size=self.uism.SB__LABEL_FONT_SIZE, weight="normal"), - text_color=self.ctm.LABELS_TEXT_COLOR + font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.SB__LABEL_FONT_SIZE, weight="normal"), + text_color=self.settings.ctm.LABELS_TEXT_COLOR ) setting_box_label.grid(row=0, column=0, padx=0, pady=0, sticky="ew") @@ -60,17 +59,17 @@ class _SettingBoxGenerator(): anchor="w", justify="left", # height=0, - wraplength=int(self.uism.SB__MAIN_WIDTH / 2), - font=CTkFont(family=self.FONT_FAMILY, size=self.uism.SB__DESC_FONT_SIZE, weight="normal"), - text_color=self.ctm.LABELS_DESC_TEXT_COLOR + wraplength=int(self.settings.uism.SB__MAIN_WIDTH / 2), + font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.SB__DESC_FONT_SIZE, weight="normal"), + text_color=self.settings.ctm.LABELS_DESC_TEXT_COLOR ) - self.setting_box_desc.grid(row=1, column=0, padx=0, pady=(self.uism.SB__DESC_TOP_PADY,0), sticky="ew") + self.setting_box_desc.grid(row=1, column=0, padx=0, pady=(self.settings.uism.SB__DESC_TOP_PADY,0), sticky="ew") - def createSettingBoxDropdownMenu(self, parent_widget, for_var_label_text, for_var_desc_text, optionmenu_attr_name, command, variable=None, dropdown_menu_attr_name=None, dropdown_menu_values=None): - (setting_box_frame, setting_box_frame_wrapper) = self._createSettingBoxFrame(parent_widget, for_var_label_text, for_var_desc_text) + def createSettingBoxDropdownMenu(self, for_var_label_text, for_var_desc_text, optionmenu_attr_name, command, variable=None, dropdown_menu_attr_name=None, dropdown_menu_values=None): + (setting_box_frame, setting_box_frame_wrapper) = self._createSettingBoxFrame(for_var_label_text, for_var_desc_text) - setting_box_dropdown_menu_frame = CTkFrame(setting_box_frame_wrapper, corner_radius=0, width=0, height=0, fg_color=self.ctm.SB__BG_COLOR) + setting_box_dropdown_menu_frame = CTkFrame(setting_box_frame_wrapper, corner_radius=0, width=0, height=0, fg_color=self.settings.ctm.SB__BG_COLOR) setting_box_dropdown_menu_frame.grid(row=0, column=1, padx=0, sticky="e") self.createOption_DropdownMenu( @@ -86,10 +85,10 @@ class _SettingBoxGenerator(): - def createSettingBoxSwitch(self, parent_widget, for_var_label_text, for_var_desc_text, switch_attr_name, is_checked, command): - (setting_box_frame, setting_box_frame_wrapper) = self._createSettingBoxFrame(parent_widget, for_var_label_text, for_var_desc_text) + def createSettingBoxSwitch(self, for_var_label_text, for_var_desc_text, switch_attr_name, is_checked, command): + (setting_box_frame, setting_box_frame_wrapper) = self._createSettingBoxFrame(for_var_label_text, for_var_desc_text) - setting_box_switch_frame = CTkFrame(setting_box_frame_wrapper, corner_radius=0, width=0, height=0, fg_color=self.ctm.SB__BG_COLOR) + setting_box_switch_frame = CTkFrame(setting_box_frame_wrapper, corner_radius=0, width=0, height=0, fg_color=self.settings.ctm.SB__BG_COLOR) setting_box_switch_frame.grid(row=0, column=1, padx=0, sticky="e") switch_widget = CTkSwitch( @@ -97,16 +96,16 @@ class _SettingBoxGenerator(): text=None, height=0, width=0, - corner_radius=int(self.uism.SB__SWITCH_BOX_HEIGHT/2), + corner_radius=int(self.settings.uism.SB__SWITCH_BOX_HEIGHT/2), border_width=0, - switch_height=self.uism.SB__SWITCH_BOX_HEIGHT, - switch_width=self.uism.SB__SWITCH_BOX_WIDTH, + switch_height=self.settings.uism.SB__SWITCH_BOX_HEIGHT, + switch_width=self.settings.uism.SB__SWITCH_BOX_WIDTH, onvalue=True, offvalue=False, command=command, - fg_color=self.ctm.SB__SWITCH_BOX_BG_COLOR, + fg_color=self.settings.ctm.SB__SWITCH_BOX_BG_COLOR, # bg_color="red", - progress_color=self.ctm.SB__SWITCH_BOX_ACTIVE_BG_COLOR, + progress_color=self.settings.ctm.SB__SWITCH_BOX_ACTIVE_BG_COLOR, ) setattr(self.config_window, switch_attr_name, switch_widget) @@ -118,31 +117,31 @@ class _SettingBoxGenerator(): - def createSettingBoxCheckbox(self, parent_widget, for_var_label_text, for_var_desc_text, checkbox_attr_name, variable, command): - (setting_box_frame, setting_box_frame_wrapper) = self._createSettingBoxFrame(parent_widget, for_var_label_text, for_var_desc_text) + def createSettingBoxCheckbox(self, for_var_label_text, for_var_desc_text, checkbox_attr_name, variable, command): + (setting_box_frame, setting_box_frame_wrapper) = self._createSettingBoxFrame(for_var_label_text, for_var_desc_text) - setting_box_checkbox_frame = CTkFrame(setting_box_frame_wrapper, corner_radius=0, width=0, height=0, fg_color=self.ctm.SB__BG_COLOR) + setting_box_checkbox_frame = CTkFrame(setting_box_frame_wrapper, corner_radius=0, width=0, height=0, fg_color=self.settings.ctm.SB__BG_COLOR) setting_box_checkbox_frame.grid(row=0, column=1, padx=0, sticky="e") checkbox_widget = CTkCheckBox( setting_box_checkbox_frame, text=None, width=0, - checkbox_width=self.uism.SB__CHECKBOX_SIZE, - checkbox_height=self.uism.SB__CHECKBOX_SIZE, + checkbox_width=self.settings.uism.SB__CHECKBOX_SIZE, + checkbox_height=self.settings.uism.SB__CHECKBOX_SIZE, onvalue=True, offvalue=False, variable=variable, command=command, - corner_radius=self.uism.SB__CHECKBOX_CORNER_RADIUS, - border_width=self.uism.SB__CHECKBOX_BORDER_WIDTH, - border_color=self.ctm.SB__CHECKBOX_BORDER_COLOR, - hover_color=self.ctm.SB__CHECKBOX_HOVER_COLOR, - checkmark_color=self.ctm.SB__CHECKBOX_CHECKMARK_COLOR, - fg_color=self.ctm.SB__CHECKBOX_CHECKED_COLOR, - # fg_color=self.ctm.SB__SWITCH_BOX_BG_COLOR, + corner_radius=self.settings.uism.SB__CHECKBOX_CORNER_RADIUS, + border_width=self.settings.uism.SB__CHECKBOX_BORDER_WIDTH, + border_color=self.settings.ctm.SB__CHECKBOX_BORDER_COLOR, + hover_color=self.settings.ctm.SB__CHECKBOX_HOVER_COLOR, + checkmark_color=self.settings.ctm.SB__CHECKBOX_CHECKMARK_COLOR, + fg_color=self.settings.ctm.SB__CHECKBOX_CHECKED_COLOR, + # fg_color=self.settings.ctm.SB__SWITCH_BOX_BG_COLOR, # bg_color="red", - # progress_color=self.ctm.SB__SWITCH_BOX_ACTIVE_BG_COLOR, + # progress_color=self.settings.ctm.SB__SWITCH_BOX_ACTIVE_BG_COLOR, ) setattr(self.config_window, checkbox_attr_name, checkbox_widget) @@ -157,10 +156,10 @@ class _SettingBoxGenerator(): - def createSettingBoxSlider(self, parent_widget, for_var_label_text, for_var_desc_text, slider_attr_name, slider_range, command, variable, slider_number_of_steps: Union[int, None] = None): - (setting_box_frame, setting_box_frame_wrapper) = self._createSettingBoxFrame(parent_widget, for_var_label_text, for_var_desc_text) + def createSettingBoxSlider(self, for_var_label_text, for_var_desc_text, slider_attr_name, slider_range, command, variable, slider_number_of_steps: Union[int, None] = None): + (setting_box_frame, setting_box_frame_wrapper) = self._createSettingBoxFrame(for_var_label_text, for_var_desc_text) - setting_box_slider_frame = CTkFrame(setting_box_frame_wrapper, corner_radius=0, width=0, height=0, fg_color=self.ctm.SB__BG_COLOR) + setting_box_slider_frame = CTkFrame(setting_box_frame_wrapper, corner_radius=0, width=0, height=0, fg_color=self.settings.ctm.SB__BG_COLOR) setting_box_slider_frame.grid(row=0, column=1, padx=0, sticky="e") slider_widget = CTkSlider( @@ -168,8 +167,8 @@ class _SettingBoxGenerator(): from_=slider_range[0], to=slider_range[1], number_of_steps=slider_number_of_steps, - button_color=self.ctm.SB__SLIDER_BUTTON_COLOR, - button_hover_color=self.ctm.SB__SLIDER_BUTTON_HOVERED_COLOR, + button_color=self.settings.ctm.SB__SLIDER_BUTTON_COLOR, + button_hover_color=self.settings.ctm.SB__SLIDER_BUTTON_HOVERED_COLOR, command=command, variable=variable, ) @@ -183,7 +182,7 @@ class _SettingBoxGenerator(): def createSettingBoxProgressbarXSlider(self, - parent_widget, for_var_label_text, for_var_desc_text, command, + for_var_label_text, for_var_desc_text, command, entry_attr_name, slider_attr_name, slider_range, progressbar_attr_name, @@ -197,17 +196,17 @@ class _SettingBoxGenerator(): ): - (setting_box_frame, setting_box_frame_wrapper) = self._createSettingBoxFrame(parent_widget, for_var_label_text, for_var_desc_text) + (setting_box_frame, setting_box_frame_wrapper) = self._createSettingBoxFrame(for_var_label_text, for_var_desc_text) - setting_box_progressbar_x_slider_frame = CTkFrame(setting_box_frame_wrapper, corner_radius=0, width=0, height=0, fg_color=self.ctm.SB__BG_COLOR) + setting_box_progressbar_x_slider_frame = CTkFrame(setting_box_frame_wrapper, corner_radius=0, width=0, height=0, fg_color=self.settings.ctm.SB__BG_COLOR) setting_box_progressbar_x_slider_frame.grid(row=0, column=1, padx=0, sticky="e") - ENTRY_WIDTH = self.uism.SB__PROGRESSBAR_X_SLIDER__ENTRY_WIDTH - BAR_WIDTH = self.uism.SB__PROGRESSBAR_X_SLIDER__BAR_WIDTH + ENTRY_WIDTH = self.settings.uism.SB__PROGRESSBAR_X_SLIDER__ENTRY_WIDTH + BAR_WIDTH = self.settings.uism.SB__PROGRESSBAR_X_SLIDER__BAR_WIDTH - BAR_PADDING = int(ENTRY_WIDTH + self.uism.SB__PROGRESSBAR_X_SLIDER__BAR_RIGHT_PADX) - BUTTON_PADDING = int(BAR_WIDTH + BAR_PADDING + self.uism.SB__PROGRESSBAR_X_SLIDER__BUTTON_RIGHT_PADX) + BAR_PADDING = int(ENTRY_WIDTH + self.settings.uism.SB__PROGRESSBAR_X_SLIDER__BAR_RIGHT_PADX) + BUTTON_PADDING = int(BAR_WIDTH + BAR_PADDING + self.settings.uism.SB__PROGRESSBAR_X_SLIDER__BUTTON_RIGHT_PADX) def adjusted_command__for_entry_bind__Any_KeyRelease(e): command(e.widget.get()) @@ -217,9 +216,9 @@ class _SettingBoxGenerator(): entry_widget = CTkEntry( setting_box_progressbar_x_slider_frame, width=ENTRY_WIDTH, - height=self.uism.SB__PROGRESSBAR_X_SLIDER__ENTRY_HEIGHT, + height=self.settings.uism.SB__PROGRESSBAR_X_SLIDER__ENTRY_HEIGHT, textvariable=entry_variable, - font=CTkFont(family=self.FONT_FAMILY, size=self.uism.SB__ENTRY_FONT_SIZE, weight="normal"), + font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.SB__ENTRY_FONT_SIZE, weight="normal"), ) entry_widget.bind("", adjusted_command__for_entry_bind__Any_KeyRelease) @@ -228,7 +227,7 @@ class _SettingBoxGenerator(): # at least 2px is needed otherwise the slider button is gonna broken. - SLIDER_BORDER_WIDTH = max(2,self.uism.SB__PROGRESSBAR_X_SLIDER__SLIDER_BUTTON_LENGTH) + SLIDER_BORDER_WIDTH = max(2,self.settings.uism.SB__PROGRESSBAR_X_SLIDER__SLIDER_BUTTON_LENGTH) SLIDER_BUTTON_LENGTH = int(SLIDER_BORDER_WIDTH/2) slider_widget = CTkSlider( setting_box_progressbar_x_slider_frame, @@ -237,17 +236,17 @@ class _SettingBoxGenerator(): number_of_steps=slider_number_of_steps, command=adjusted_command__for_slider, variable=slider_variable, - height=self.uism.SB__PROGRESSBAR_X_SLIDER__SLIDER_HEIGHT, + height=self.settings.uism.SB__PROGRESSBAR_X_SLIDER__SLIDER_HEIGHT, width=BAR_WIDTH, border_width=0, button_length=SLIDER_BORDER_WIDTH, button_corner_radius=SLIDER_BUTTON_LENGTH, corner_radius=0, - button_color=self.ctm.SB__PROGRESSBAR_X_SLIDER__SLIDER_BUTTON_COLOR, - button_hover_color=self.ctm.SB__PROGRESSBAR_X_SLIDER__SLIDER_BUTTON_HOVERED_COLOR, - fg_color=self.ctm.SB__BG_COLOR, - progress_color=self.ctm.SB__BG_COLOR, - border_color=self.ctm.SB__BG_COLOR, + button_color=self.settings.ctm.SB__PROGRESSBAR_X_SLIDER__SLIDER_BUTTON_COLOR, + button_hover_color=self.settings.ctm.SB__PROGRESSBAR_X_SLIDER__SLIDER_BUTTON_HOVERED_COLOR, + fg_color=self.settings.ctm.SB__BG_COLOR, + progress_color=self.settings.ctm.SB__BG_COLOR, + border_color=self.settings.ctm.SB__BG_COLOR, ) slider_widget.grid(row=0, column=0, padx=(0, BAR_PADDING), sticky="e") setattr(self.config_window, slider_attr_name, slider_widget) @@ -258,7 +257,7 @@ class _SettingBoxGenerator(): progressbar_widget = CTkProgressBar( setting_box_progressbar_x_slider_frame, width=BAR_WIDTH, - height=self.uism.SB__PROGRESSBAR_X_SLIDER__PROGRESSBAR_HEIGHT, + height=self.settings.uism.SB__PROGRESSBAR_X_SLIDER__PROGRESSBAR_HEIGHT, corner_radius=0, ) setattr(self.config_window, progressbar_attr_name, progressbar_widget) @@ -280,10 +279,10 @@ class _SettingBoxGenerator(): - def createSettingBoxEntry(self, parent_widget, for_var_label_text, for_var_desc_text, entry_attr_name, entry_width, entry_bind__Any_KeyRelease, entry_textvariable): - (setting_box_frame, setting_box_frame_wrapper) = self._createSettingBoxFrame(parent_widget, for_var_label_text, for_var_desc_text) + def createSettingBoxEntry(self, for_var_label_text, for_var_desc_text, entry_attr_name, entry_width, entry_bind__Any_KeyRelease, entry_textvariable): + (setting_box_frame, setting_box_frame_wrapper) = self._createSettingBoxFrame(for_var_label_text, for_var_desc_text) - setting_box_entry_frame = CTkFrame(setting_box_frame_wrapper, corner_radius=0, width=0, height=0, fg_color=self.ctm.SB__BG_COLOR) + setting_box_entry_frame = CTkFrame(setting_box_frame_wrapper, corner_radius=0, width=0, height=0, fg_color=self.settings.ctm.SB__BG_COLOR) setting_box_entry_frame.grid(row=0, column=1, padx=0, sticky="e") def adjusted_command__for_entry_bind__Any_KeyRelease(e): @@ -292,9 +291,9 @@ class _SettingBoxGenerator(): entry_widget = CTkEntry( setting_box_entry_frame, width=entry_width, - height=self.uism.SB__PROGRESSBAR_X_SLIDER__ENTRY_HEIGHT, + height=self.settings.uism.SB__PROGRESSBAR_X_SLIDER__ENTRY_HEIGHT, textvariable=entry_textvariable, - font=CTkFont(family=self.FONT_FAMILY, size=self.uism.SB__ENTRY_FONT_SIZE, weight="normal"), + font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.SB__ENTRY_FONT_SIZE, weight="normal"), ) entry_widget.bind("", adjusted_command__for_entry_bind__Any_KeyRelease) setattr(self.config_window, entry_attr_name, entry_widget) @@ -307,8 +306,8 @@ class _SettingBoxGenerator(): # if setting_box_type == "dropdown_menu_x_dropdown_menu": - # self.setting_box_dropdown_menu_x_dropdown_menu = CTkFrame(self.setting_box, corner_radius=0, fg_color=self.ctm.SB__BG_COLOR, width=0, height=0) - # self.setting_box_dropdown_menu_x_dropdown_menu.grid(row=0, column=1, padx=(0, self.uism.SB__RIGHT_PADX), rowspan=2, sticky="e") + # self.setting_box_dropdown_menu_x_dropdown_menu = CTkFrame(self.setting_box, corner_radius=0, fg_color=self.settings.ctm.SB__BG_COLOR, width=0, height=0) + # self.setting_box_dropdown_menu_x_dropdown_menu.grid(row=0, column=1, padx=(0, self.settings.uism.SB__RIGHT_PADX), rowspan=2, sticky="e") @@ -316,7 +315,7 @@ class _SettingBoxGenerator(): # self.optionmenu_label_left = CTkLabel( # self.setting_box_dropdown_menu_x_dropdown_menu, # text=kwargs["left_dropdown_menu_label"], - # font=CTkFont(family=self.FONT_FAMILY, size=self.uism.SB__OPTION_MENU_FONT_SIZE, weight="normal"), + # font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.SB__OPTION_MENU_FONT_SIZE, weight="normal"), # ) # self.optionmenu_label_left.grid(row=0, column=0) @@ -330,7 +329,7 @@ class _SettingBoxGenerator(): # self.optionmenu_label_right = CTkLabel( # self.setting_box_dropdown_menu_x_dropdown_menu, # text=kwargs["right_dropdown_menu_label"], - # font=CTkFont(family=self.FONT_FAMILY, size=self.uism.SB__OPTION_MENU_FONT_SIZE, weight="normal"), + # font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.SB__OPTION_MENU_FONT_SIZE, weight="normal"), # ) # self.optionmenu_label_right.grid(row=0, column=2) @@ -355,10 +354,10 @@ class _SettingBoxGenerator(): # self.setting_box_dropdown_menu_x_dropdown_menu, # text="-->", # # anchor="w", - # font=CTkFont(family=self.FONT_FAMILY, size=self.uism.SB__OPTION_MENU_FONT_SIZE, weight="normal"), - # text_color=self.ctm.LABELS_TEXT_COLOR + # font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.SB__OPTION_MENU_FONT_SIZE, weight="normal"), + # text_color=self.settings.ctm.LABELS_TEXT_COLOR # ) - # self.the_label_between_optionmenu.grid(row=1, column=1, padx=self.uism.SB__RIGHT_PADX/2) + # self.the_label_between_optionmenu.grid(row=1, column=1, padx=self.settings.uism.SB__RIGHT_PADX/2) # self.createOption_DropdownMenu( @@ -378,27 +377,27 @@ class _SettingBoxGenerator(): # if setting_box_type == "radio_buttons": # self.setting_box_radio_buttons_frame = CTkFrame(self.setting_box, corner_radius=0, width=0, height=0) - # self.setting_box_radio_buttons_frame.grid(row=0, column=1, padx=(0, self.uism.SB__RIGHT_PADX), rowspan=2, sticky="e") + # self.setting_box_radio_buttons_frame.grid(row=0, column=1, padx=(0, self.settings.uism.SB__RIGHT_PADX), rowspan=2, sticky="e") # RADIO_BUTTON_RIGHT_PAD = 14 # self.setting_box_radio_button_1 = CTkRadioButton( # self.setting_box_radio_buttons_frame, # text="lorem ipsum", - # font=CTkFont(family=self.FONT_FAMILY, size=self.uism.SB__RADIO_BUTTON_FONT_SIZE, weight="normal") + # font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.SB__RADIO_BUTTON_FONT_SIZE, weight="normal") # ) # self.setting_box_radio_button_1.grid(row=0, column=0, padx=(0,RADIO_BUTTON_RIGHT_PAD), sticky="e") # self.setting_box_radio_button_2 = CTkRadioButton( # self.setting_box_radio_buttons_frame, # text="lorem ipsum", - # font=CTkFont(family=self.FONT_FAMILY, size=self.uism.SB__RADIO_BUTTON_FONT_SIZE, weight="normal") + # font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.SB__RADIO_BUTTON_FONT_SIZE, weight="normal") # ) # self.setting_box_radio_button_2.grid(row=0, column=1, padx=(0,RADIO_BUTTON_RIGHT_PAD), sticky="e") # self.setting_box_radio_button_3 = CTkRadioButton( # self.setting_box_radio_buttons_frame, # text="lorem ipsum", - # font=CTkFont(family=self.FONT_FAMILY, size=self.uism.SB__RADIO_BUTTON_FONT_SIZE, weight="normal") + # font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.SB__RADIO_BUTTON_FONT_SIZE, weight="normal") # ) # self.setting_box_radio_button_3.grid(row=0, column=2, padx=(0,RADIO_BUTTON_RIGHT_PAD), sticky="e") @@ -415,13 +414,13 @@ class _SettingBoxGenerator(): option_menu_widget = CTkOptionMenu( setting_box_dropdown_menu_frame, - height=self.uism.SB__OPTIONMENU_HEIGHT, - width=self.uism.SB__OPTIONMENU_WIDTH, + height=self.settings.uism.SB__OPTIONMENU_HEIGHT, + width=self.settings.uism.SB__OPTIONMENU_WIDTH, values=dropdown_menu_values, - button_color=self.ctm.SB__OPTIONMENU_BG_COLOR, - button_hover_color=self.ctm.SB__OPTIONMENU_HOVERED_BG_COLOR, - fg_color=self.ctm.SB__OPTIONMENU_BG_COLOR, - font=CTkFont(family=self.FONT_FAMILY, size=self.uism.SB__OPTION_MENU_FONT_SIZE, weight="normal"), + button_color=self.settings.ctm.SB__OPTIONMENU_BG_COLOR, + button_hover_color=self.settings.ctm.SB__OPTIONMENU_HOVERED_BG_COLOR, + fg_color=self.settings.ctm.SB__OPTIONMENU_BG_COLOR, + font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.SB__OPTION_MENU_FONT_SIZE, weight="normal"), variable=variable, command=command, anchor="w", @@ -434,13 +433,13 @@ class _SettingBoxGenerator(): # dropdown_menu_widget = CTkScrollableDropdown( # option_menu_widget, # justify="left", - # width=self.uism.SB__DROPDOWN_MENU_WIDTH, + # width=self.settings.uism.SB__DROPDOWN_MENU_WIDTH, # min_show_button_num=6, # button_pady=0, - # frame_corner_radius=self.uism.SB__DROPDOWN_MENU_FRAME_CORNER_RADIUS, - # max_button_height=self.uism.SB__DROPDOWN_MENU_MAX_BUTTON_HEIGHT, - # max_height=self.uism.SB__DROPDOWN_MENU_FRAME_MAX_HEIGHT, - # font=CTkFont(family=self.FONT_FAMILY, size=self.uism.SB__OPTION_MENU_FONT_SIZE, weight="normal"), + # frame_corner_radius=self.settings.uism.SB__DROPDOWN_MENU_FRAME_CORNER_RADIUS, + # max_button_height=self.settings.uism.SB__DROPDOWN_MENU_MAX_BUTTON_HEIGHT, + # max_height=self.settings.uism.SB__DROPDOWN_MENU_FRAME_MAX_HEIGHT, + # font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.SB__OPTION_MENU_FONT_SIZE, weight="normal"), # command=adjustedCommand, # ) @@ -462,12 +461,12 @@ class _SettingBoxGenerator(): def _createPassiveButtonForProgressbarXSlider(self, setting_box_progressbar_x_slider_frame, BUTTON_PADDING, button_command, button_image_file): button_wrapper = createButtonWithImage( parent_widget=setting_box_progressbar_x_slider_frame, - button_fg_color=self.ctm.SB__PROGRESSBAR_X_SLIDER__PASSIVE_BUTTON_COLOR, - button_enter_color=self.ctm.SB__PROGRESSBAR_X_SLIDER__PASSIVE_BUTTON_HOVERED_COLOR, - button_clicked_color=self.ctm.SB__PROGRESSBAR_X_SLIDER__PASSIVE_BUTTON_CLICKED_COLOR, + button_fg_color=self.settings.ctm.SB__PROGRESSBAR_X_SLIDER__PASSIVE_BUTTON_COLOR, + button_enter_color=self.settings.ctm.SB__PROGRESSBAR_X_SLIDER__PASSIVE_BUTTON_HOVERED_COLOR, + button_clicked_color=self.settings.ctm.SB__PROGRESSBAR_X_SLIDER__PASSIVE_BUTTON_CLICKED_COLOR, button_image_file=button_image_file, - button_image_size=self.uism.SB__PROGRESSBAR_X_SLIDER__BUTTON_ICON_SIZE, - button_ipadxy=self.uism.SB__PROGRESSBAR_X_SLIDER__BUTTON_IPADXY, + button_image_size=self.settings.uism.SB__PROGRESSBAR_X_SLIDER__BUTTON_ICON_SIZE, + button_ipadxy=self.settings.uism.SB__PROGRESSBAR_X_SLIDER__BUTTON_IPADXY, button_command=button_command, shape="circle", ) @@ -480,12 +479,12 @@ class _SettingBoxGenerator(): def _createActiveButtonForProgressbarXSlider(self, setting_box_progressbar_x_slider_frame, BUTTON_PADDING, button_command, button_image_file): button_wrapper = createButtonWithImage( parent_widget=setting_box_progressbar_x_slider_frame, - button_fg_color=self.ctm.SB__PROGRESSBAR_X_SLIDER__ACTIVE_BUTTON_COLOR, - button_enter_color=self.ctm.SB__PROGRESSBAR_X_SLIDER__ACTIVE_BUTTON_HOVERED_COLOR, - button_clicked_color=self.ctm.SB__PROGRESSBAR_X_SLIDER__ACTIVE_BUTTON_CLICKED_COLOR, + button_fg_color=self.settings.ctm.SB__PROGRESSBAR_X_SLIDER__ACTIVE_BUTTON_COLOR, + button_enter_color=self.settings.ctm.SB__PROGRESSBAR_X_SLIDER__ACTIVE_BUTTON_HOVERED_COLOR, + button_clicked_color=self.settings.ctm.SB__PROGRESSBAR_X_SLIDER__ACTIVE_BUTTON_CLICKED_COLOR, button_image_file=button_image_file, - button_image_size=self.uism.SB__PROGRESSBAR_X_SLIDER__BUTTON_ICON_SIZE, - button_ipadxy=self.uism.SB__PROGRESSBAR_X_SLIDER__BUTTON_IPADXY, + button_image_size=self.settings.uism.SB__PROGRESSBAR_X_SLIDER__BUTTON_ICON_SIZE, + button_ipadxy=self.settings.uism.SB__PROGRESSBAR_X_SLIDER__BUTTON_IPADXY, button_command=button_command, shape="circle", ) diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_advanced_settings/createSettingBox_AdvancedSettings.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_advanced_settings/createSettingBox_AdvancedSettings.py index c66d1e86..28895d3c 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_advanced_settings/createSettingBox_AdvancedSettings.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_advanced_settings/createSettingBox_AdvancedSettings.py @@ -3,7 +3,7 @@ from utils import callFunctionIfCallable from .._SettingBoxGenerator import _SettingBoxGenerator def createSettingBox_AdvancedSettings(setting_box_wrapper, config_window, settings, view_variable): - sbg = _SettingBoxGenerator(config_window, settings) + sbg = _SettingBoxGenerator(setting_box_wrapper, config_window, settings) createSettingBoxEntry = sbg.createSettingBoxEntry @@ -15,7 +15,6 @@ def createSettingBox_AdvancedSettings(setting_box_wrapper, config_window, settin row=0 config_window.sb__ip_address = createSettingBoxEntry( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_OSC_IP_ADDRESS, for_var_desc_text=view_variable.VAR_DESC_OSC_IP_ADDRESS, entry_attr_name="sb__entry_ip_address", @@ -28,7 +27,6 @@ def createSettingBox_AdvancedSettings(setting_box_wrapper, config_window, settin config_window.sb__port = createSettingBoxEntry( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_OSC_PORT, for_var_desc_text=view_variable.VAR_DESC_OSC_PORT, entry_attr_name="sb__entry_port", diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_appearance/createSettingBox_Appearance.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_appearance/createSettingBox_Appearance.py index 80ace904..ab596c34 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_appearance/createSettingBox_Appearance.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_appearance/createSettingBox_Appearance.py @@ -3,7 +3,7 @@ from utils import callFunctionIfCallable from .._SettingBoxGenerator import _SettingBoxGenerator def createSettingBox_Appearance(setting_box_wrapper, config_window, settings, view_variable): - sbg = _SettingBoxGenerator(config_window, settings) + sbg = _SettingBoxGenerator(setting_box_wrapper, config_window, settings) createSettingBoxDropdownMenu = sbg.createSettingBoxDropdownMenu createSettingBoxSlider = sbg.createSettingBoxSlider @@ -27,7 +27,6 @@ def createSettingBox_Appearance(setting_box_wrapper, config_window, settings, vi row=0 config_window.sb__transparency = createSettingBoxSlider( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_TRANSPARENCY, for_var_desc_text=view_variable.VAR_DESC_TRANSPARENCY, slider_attr_name="sb__transparency_slider", @@ -40,7 +39,6 @@ def createSettingBox_Appearance(setting_box_wrapper, config_window, settings, vi config_window.sb__appearance_theme = createSettingBoxDropdownMenu( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_APPEARANCE_THEME, for_var_desc_text=view_variable.VAR_DESC_APPEARANCE_THEME, optionmenu_attr_name="sb__optionmenu_appearance_theme", @@ -55,7 +53,6 @@ def createSettingBox_Appearance(setting_box_wrapper, config_window, settings, vi config_window.sb__ui_scaling = createSettingBoxDropdownMenu( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_UI_SCALING, for_var_desc_text=view_variable.VAR_DESC_UI_SCALING, optionmenu_attr_name="sb__optionmenu_ui_scaling", @@ -69,7 +66,6 @@ def createSettingBox_Appearance(setting_box_wrapper, config_window, settings, vi config_window.sb__font_family = createSettingBoxDropdownMenu( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_FONT_FAMILY, for_var_desc_text=view_variable.VAR_DESC_FONT_FAMILY, optionmenu_attr_name="sb__optionmenu_font_family", @@ -82,7 +78,6 @@ def createSettingBox_Appearance(setting_box_wrapper, config_window, settings, vi config_window.sb__ui_language = createSettingBoxDropdownMenu( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_UI_LANGUAGE, for_var_desc_text=view_variable.VAR_DESC_UI_LANGUAGE, optionmenu_attr_name="sb__optionmenu_ui_language", diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_others/createSettingBox_Others.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_others/createSettingBox_Others.py index b125aa75..afa79980 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_others/createSettingBox_Others.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_others/createSettingBox_Others.py @@ -3,7 +3,7 @@ from utils import callFunctionIfCallable from .._SettingBoxGenerator import _SettingBoxGenerator def createSettingBox_Others(setting_box_wrapper, config_window, settings, view_variable): - sbg = _SettingBoxGenerator(config_window, settings) + sbg = _SettingBoxGenerator(setting_box_wrapper, config_window, settings) createSettingBoxCheckbox = sbg.createSettingBoxCheckbox createSettingBoxEntry = sbg.createSettingBoxEntry @@ -30,7 +30,6 @@ def createSettingBox_Others(setting_box_wrapper, config_window, settings, view_v row=0 config_window.sb__auto_clear_message_box = createSettingBoxCheckbox( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_ENABLE_AUTO_CLEAR_MESSAGE_BOX, for_var_desc_text=view_variable.VAR_DESC_ENABLE_AUTO_CLEAR_MESSAGE_BOX, checkbox_attr_name="sb__checkbox_auto_clear_message_box", @@ -42,7 +41,6 @@ def createSettingBox_Others(setting_box_wrapper, config_window, settings, view_v config_window.sb__notice_xsoverlay = createSettingBoxCheckbox( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_ENABLE_NOTICE_XSOVERLAY, for_var_desc_text=view_variable.VAR_DESC_ENABLE_NOTICE_XSOVERLAY, checkbox_attr_name="sb__checkbox_notice_xsoverlay", @@ -54,7 +52,6 @@ def createSettingBox_Others(setting_box_wrapper, config_window, settings, view_v config_window.sb__auto_export_message_logs = createSettingBoxCheckbox( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_ENABLE_AUTO_EXPORT_MESSAGE_LOGS, for_var_desc_text=view_variable.VAR_DESC_ENABLE_AUTO_EXPORT_MESSAGE_LOGS, checkbox_attr_name="sb__checkbox_auto_export_message_logs", @@ -66,7 +63,6 @@ def createSettingBox_Others(setting_box_wrapper, config_window, settings, view_v config_window.sb__message_format = createSettingBoxEntry( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_MESSAGE_FORMAT, for_var_desc_text=view_variable.VAR_DESC_MESSAGE_FORMAT, entry_attr_name="sb__entry_message_format", @@ -79,7 +75,6 @@ def createSettingBox_Others(setting_box_wrapper, config_window, settings, view_v config_window.sb__enable_send_message_to_vrc = createSettingBoxCheckbox( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_ENABLE_SEND_MESSAGE_TO_VRC, for_var_desc_text=view_variable.VAR_DESC_ENABLE_SEND_MESSAGE_TO_VRC, checkbox_attr_name="sb__checkbox_enable_send_message_to_vrc", @@ -90,7 +85,6 @@ def createSettingBox_Others(setting_box_wrapper, config_window, settings, view_v row+=1 config_window.sb__startup_osc_enabled_check = createSettingBoxCheckbox( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_STARTUP_OSC_ENABLED_CHECK, for_var_desc_text=view_variable.VAR_DESC_STARTUP_OSC_ENABLED_CHECK, checkbox_attr_name="sb__checkbox_startup_osc_enabled_check", diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_transcription/createSettingBox_Mic.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_transcription/createSettingBox_Mic.py index 82731054..852f92e7 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_transcription/createSettingBox_Mic.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_transcription/createSettingBox_Mic.py @@ -3,7 +3,7 @@ from utils import callFunctionIfCallable from .._SettingBoxGenerator import _SettingBoxGenerator def createSettingBox_Mic(setting_box_wrapper, config_window, settings, view_variable): - sbg = _SettingBoxGenerator(config_window, settings) + sbg = _SettingBoxGenerator(setting_box_wrapper, config_window, settings) createSettingBoxDropdownMenu = sbg.createSettingBoxDropdownMenu createSettingBoxCheckbox = sbg.createSettingBoxCheckbox createSettingBoxProgressbarXSlider = sbg.createSettingBoxProgressbarXSlider @@ -43,7 +43,6 @@ def createSettingBox_Mic(setting_box_wrapper, config_window, settings, view_vari row=0 # Mic Host と Mic Device は一つの項目として引っ付ける予定 config_window.sb__mic_host = createSettingBoxDropdownMenu( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_MIC_HOST, for_var_desc_text=view_variable.VAR_DESC_MIC_HOST, optionmenu_attr_name="sb__optionmenu_mic_host", @@ -56,7 +55,6 @@ def createSettingBox_Mic(setting_box_wrapper, config_window, settings, view_vari row+=1 config_window.sb__mic_device = createSettingBoxDropdownMenu( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_MIC_DEVICE, for_var_desc_text=view_variable.VAR_DESC_MIC_DEVICE, optionmenu_attr_name="sb__optionmenu_mic_device", @@ -70,7 +68,6 @@ def createSettingBox_Mic(setting_box_wrapper, config_window, settings, view_vari config_window.sb__mic_energy_threshold = createSettingBoxProgressbarXSlider( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_MIC_ENERGY_THRESHOLD, for_var_desc_text=view_variable.VAR_DESC_MIC_ENERGY_THRESHOLD, command=slider_input_mic_energy_threshold_callback, @@ -96,7 +93,6 @@ def createSettingBox_Mic(setting_box_wrapper, config_window, settings, view_vari # Mic Dynamic Energy Thresholdも上に引っ付ける予定 config_window.sb__mic_dynamic_energy_threshold = createSettingBoxCheckbox( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_MIC_DYNAMIC_ENERGY_THRESHOLD, for_var_desc_text=view_variable.VAR_DESC_MIC_DYNAMIC_ENERGY_THRESHOLD, checkbox_attr_name="sb__checkbox_mic_dynamic_energy_threshold", @@ -109,7 +105,6 @@ def createSettingBox_Mic(setting_box_wrapper, config_window, settings, view_vari # 以下３つも一つの項目にまとめるかもしれない config_window.sb__mic_record_timeout = createSettingBoxEntry( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_MIC_RECORD_TIMEOUT, for_var_desc_text=view_variable.VAR_DESC_MIC_RECORD_TIMEOUT, entry_attr_name="sb__entry_mic_record_timeout", @@ -121,7 +116,6 @@ def createSettingBox_Mic(setting_box_wrapper, config_window, settings, view_vari row+=1 config_window.sb__mic_phrase_timeout = createSettingBoxEntry( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_MIC_PHRASE_TIMEOUT, for_var_desc_text=view_variable.VAR_DESC_MIC_PHRASE_TIMEOUT, entry_attr_name="sb__entry_mic_phrase_timeout", @@ -133,7 +127,6 @@ def createSettingBox_Mic(setting_box_wrapper, config_window, settings, view_vari row+=1 config_window.sb__mic_max_phrases = createSettingBoxEntry( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_MIC_MAX_PHRASES, for_var_desc_text=view_variable.VAR_DESC_MIC_MAX_PHRASES, entry_attr_name="sb__entry_mic_max_phrases", @@ -147,7 +140,6 @@ def createSettingBox_Mic(setting_box_wrapper, config_window, settings, view_vari config_window.sb__mic_word_filter = createSettingBoxEntry( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_MIC_WORD_FILTER, for_var_desc_text=view_variable.VAR_DESC_MIC_WORD_FILTER, entry_attr_name="sb__entry_mic_word_filter", diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_transcription/createSettingBox_Speaker.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_transcription/createSettingBox_Speaker.py index 60d6d168..064535a7 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_transcription/createSettingBox_Speaker.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_transcription/createSettingBox_Speaker.py @@ -3,7 +3,7 @@ from utils import callFunctionIfCallable from .._SettingBoxGenerator import _SettingBoxGenerator def createSettingBox_Speaker(setting_box_wrapper, config_window, settings, view_variable): - sbg = _SettingBoxGenerator(config_window, settings) + sbg = _SettingBoxGenerator(setting_box_wrapper, config_window, settings) createSettingBoxDropdownMenu = sbg.createSettingBoxDropdownMenu createSettingBoxCheckbox = sbg.createSettingBoxCheckbox createSettingBoxProgressbarXSlider = sbg.createSettingBoxProgressbarXSlider @@ -37,7 +37,6 @@ def createSettingBox_Speaker(setting_box_wrapper, config_window, settings, view_ row=0 config_window.sb__speaker_device = createSettingBoxDropdownMenu( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_SPEAKER_DEVICE, for_var_desc_text=view_variable.VAR_DESC_SPEAKER_DEVICE, optionmenu_attr_name="sb__optionmenu_speaker_device", @@ -51,7 +50,6 @@ def createSettingBox_Speaker(setting_box_wrapper, config_window, settings, view_ config_window.sb__speaker_energy_threshold = createSettingBoxProgressbarXSlider( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_SPEAKER_ENERGY_THRESHOLD, for_var_desc_text=view_variable.VAR_DESC_SPEAKER_ENERGY_THRESHOLD, command=slider_input_speaker_energy_threshold_callback, @@ -77,7 +75,6 @@ def createSettingBox_Speaker(setting_box_wrapper, config_window, settings, view_ # Speaker Dynamic Energy Thresholdも上に引っ付ける予定 config_window.sb__speaker_dynamic_energy_threshold = createSettingBoxCheckbox( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_SPEAKER_DYNAMIC_ENERGY_THRESHOLD, for_var_desc_text=view_variable.VAR_DESC_SPEAKER_DYNAMIC_ENERGY_THRESHOLD, checkbox_attr_name="sb__checkbox_speaker_dynamic_energy_threshold", @@ -90,7 +87,6 @@ def createSettingBox_Speaker(setting_box_wrapper, config_window, settings, view_ # 以下３つも一つの項目にまとめるかもしれない config_window.sb__speaker_record_timeout = createSettingBoxEntry( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_SPEAKER_RECORD_TIMEOUT, for_var_desc_text=view_variable.VAR_DESC_SPEAKER_RECORD_TIMEOUT, entry_attr_name="sb__entry_speaker_record_timeout", @@ -102,7 +98,6 @@ def createSettingBox_Speaker(setting_box_wrapper, config_window, settings, view_ row+=1 config_window.sb__speaker_phrase_timeout = createSettingBoxEntry( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_SPEAKER_PHRASE_TIMEOUT, for_var_desc_text=view_variable.VAR_DESC_SPEAKER_PHRASE_TIMEOUT, entry_attr_name="sb__entry_speaker_phrase_timeout", @@ -114,7 +109,6 @@ def createSettingBox_Speaker(setting_box_wrapper, config_window, settings, view_ row+=1 config_window.sb__speaker_max_phrases = createSettingBoxEntry( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_SPEAKER_MAX_PHRASES, for_var_desc_text=view_variable.VAR_DESC_SPEAKER_MAX_PHRASES, entry_attr_name="sb__entry_speaker_max_phrases", diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_translation/createSettingBox_Translation.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_translation/createSettingBox_Translation.py index 7096bbc2..48b01e95 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_translation/createSettingBox_Translation.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_translation/createSettingBox_Translation.py @@ -3,7 +3,7 @@ from utils import callFunctionIfCallable from .._SettingBoxGenerator import _SettingBoxGenerator def createSettingBox_Translation(setting_box_wrapper, config_window, settings, view_variable): - sbg = _SettingBoxGenerator(config_window, settings) + sbg = _SettingBoxGenerator(setting_box_wrapper, config_window, settings) createSettingBoxEntry = sbg.createSettingBoxEntry @@ -13,7 +13,6 @@ def createSettingBox_Translation(setting_box_wrapper, config_window, settings, v row=0 config_window.sb__deepl_authkey = createSettingBoxEntry( - parent_widget=setting_box_wrapper, for_var_label_text=view_variable.VAR_LABEL_DEEPL_AUTH_KEY, for_var_desc_text=view_variable.VAR_DESC_DEEPL_AUTH_KEY, entry_attr_name="sb__deepl_authkey",