From ee7589ba93cd7ab50c73256331ab93fa745f3995 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Fri, 19 Jan 2024 12:21:05 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[Update]=20=E6=96=87=E8=A8=80=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E3=80=82=E3=82=AB=E3=83=83=E3=82=B3=E3=81=AA=E3=81=A9?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/en.yml | 8 ++++---- locales/ja.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/locales/en.yml b/locales/en.yml index 31406a23..cce6552b 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -84,8 +84,8 @@ config_window: transcription_mic: Mic transcription_speaker: Speaker others: Others - others_send_message_formats: Message Formats(Send) - others_received_message_formats: Message Formats(Received) + others_send_message_formats: Message Formats (Send) + others_received_message_formats: Message Formats (Received) others_speaker2chatbox: Speaker2Chatbox advanced_settings: Advanced Settings @@ -223,7 +223,7 @@ config_window: error_message: "The characters '[message]' cannot be used." send_message_format_with_t: - label: Message Format(With translation) + label: Message Format (With translation) desc: "You can change the decoration of the message you want to send.\n[message] will be replaced with the message, and [translation] will be replaced with the translated message." example_text: This is an example sentence. Fonts, line breaks, etc. may differ from the actual display. error_message: "The characters '[message]' and '[translation]' cannot be used." @@ -235,7 +235,7 @@ config_window: error_message: "The characters '[message]' cannot be used." received_message_format_with_t: - label: Message Format(With translation) + label: Message Format (With translation) desc: It will be used in Notification XSOverlay too. example_text: This is an example sentence. Fonts, line breaks, etc. may differ from the actual display. error_message: "The characters '[message]' and '[translation]' cannot be used." diff --git a/locales/ja.yml b/locales/ja.yml index 2b3eb2a8..c7132340 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -42,7 +42,7 @@ main_window: latest_language_setting: 現在「あなたの言語」は %{your_language}、「相手の言語」は %{target_language} に設定されています。 opened_web_page_booth: お使いのブラウザで、Boothのページを開きました。 - opened_web_page_vrct_documents: "お使いのブラウザで、VRCTのドキュメントを開きました。使用方法などはそちらに記載されています。\n不具合、ご要望、その他お問い合わせはドキュメント最下部にあるLinks、「お問合せフォーム」もしくはX(元Twitter)にて気軽にご連絡ください！" + opened_web_page_vrct_documents: "お使いのブラウザで、VRCTのドキュメントを開きました。使用方法などはそちらに記載されています。\n不具合、ご要望、その他お問い合わせはドキュメント最下部にあるLinks、「お問合せフォーム」もしくはX (元Twitter) にて気軽にご連絡ください！" update_available: 新しいバージョンが出ました！ @@ -202,7 +202,7 @@ config_window: notice_xsoverlay: label: XSOverlayでの通知受け取り機能を有効 (VR限定) - desc: 文字起こし（受信）されたメッセージをXSOverlayの機能を使って通知として受け取れます。 + desc: 文字起こし (受信) されたメッセージをXSOverlayの機能を使って通知として受け取れます。 auto_export_message_logs: label: 会話ログを自動的に保存する From 379c5bfdb617e3898130269f716892583e25efe2 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Fri, 19 Jan 2024 14:04:11 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[Chore]=20=E5=A4=89=E6=95=B0=E5=90=8D?= =?UTF-8?q?=E5=A4=89=E6=9B=B4:=20AUTHKEY=20->=20AUTH=5FKEY=20=E3=81=AE?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E5=88=86=E3=81=91=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller.py | 6 +++--- locales.yml | 6 +++--- view.py | 2 +- .../createSettingBox_Translation.py | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/controller.py b/controller.py index d65d010d..fc5a7ee9 100644 --- a/controller.py +++ b/controller.py @@ -506,8 +506,8 @@ def callbackSetCtranslate2WeightType(value): view.useTranslationFeatureProcess("Disable") # CTranslate2 weight is not downloaded -def callbackSetDeeplAuthkey(value): - print("callbackSetDeeplAuthkey", str(value)) +def callbackSetDeeplAuthKey(value): + print("callbackSetDeeplAuthKey", str(value)) if len(value) == 39: result = model.authenticationTranslatorDeepLAuthKey(auth_key=value) if result is True: @@ -948,7 +948,7 @@ def createMainWindow(): # Translation Tab "callback_set_use_translation_feature": callbackSetUseTranslationFeature, "callback_set_ctranslate2_weight_type": callbackSetCtranslate2WeightType, - "callback_set_deepl_authkey": callbackSetDeeplAuthkey, + "callback_set_deepl_auth_key": callbackSetDeeplAuthKey, # Transcription Tab (Mic) "callback_set_mic_host": callbackSetMicHost, diff --git a/locales.yml b/locales.yml index f4b80300..3261f636 100644 --- a/locales.yml +++ b/locales.yml @@ -55,7 +55,7 @@ en: # tab Parameter label_ip_address: "OSC IP address" label_port: "OSC Port" - label_authkey: "DeepL Auth Key" + label_auth_key: "DeepL Auth Key" label_message_format: "Message Format" # tab Others @@ -121,7 +121,7 @@ ja: # tab Parameter # label_ip_address: "" # label_port: "" - # label_authkey: "" + # label_auth_key: "" label_message_format: "送信するメッセージのフォーマット" # tab Others @@ -186,7 +186,7 @@ ko: # tab Parameter label_ip_address: "OSC IP 주소" label_port: "OSC 포트" - label_authkey: "DeepL 인증키" + label_auth_key: "DeepL 인증키" label_message_format: "전송 형식" # tab Others diff --git a/view.py b/view.py index 52fb174c..28007ec5 100644 --- a/view.py +++ b/view.py @@ -591,7 +591,7 @@ class View(): # Translation Tab self.view_variable.CALLBACK_SET_USE_TRANSLATION_FEATURE = config_window_registers.get("callback_set_use_translation_feature", None) self.view_variable.CALLBACK_SET_CTRANSLATE2_WEIGHT_TYPE = config_window_registers.get("callback_set_ctranslate2_weight_type", None) - self.view_variable.CALLBACK_SET_DEEPL_AUTHKEY = config_window_registers.get("callback_set_deepl_authkey", None) + self.view_variable.CALLBACK_SET_DEEPL_AUTH_KEY = config_window_registers.get("callback_set_deepl_auth_key", None) # Transcription Tab (Mic) self.view_variable.CALLBACK_SET_MIC_HOST = config_window_registers.get("callback_set_mic_host", None) 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 574856fe..62ed881a 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 @@ -14,8 +14,8 @@ def createSettingBox_Translation(setting_box_wrapper, config_window, settings, v def optionmenu_ctranslate2_weight_type_callback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_CTRANSLATE2_WEIGHT_TYPE, value) - def deepl_authkey_callback(value): - callFunctionIfCallable(view_variable.CALLBACK_SET_DEEPL_AUTHKEY, value) + def deepl_auth_key_callback(value): + callFunctionIfCallable(view_variable.CALLBACK_SET_DEEPL_AUTH_KEY, value) row=0 @@ -41,13 +41,13 @@ def createSettingBox_Translation(setting_box_wrapper, config_window, settings, v row+=1 - config_window.sb__deepl_authkey = createSettingBoxEntry( + config_window.sb__deepl_auth_key = createSettingBoxEntry( 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__entry_deepl_authkey", + entry_attr_name="sb__entry_deepl_auth_key", entry_width=settings.uism.RESPONSIVE_UI_SIZE_INT_300, - entry_bind__Any_KeyRelease=lambda value: deepl_authkey_callback(value), + entry_bind__Any_KeyRelease=lambda value: deepl_auth_key_callback(value), entry_textvariable=view_variable.VAR_DEEPL_AUTH_KEY, ) - config_window.sb__deepl_authkey.grid(row=row, pady=0) + config_window.sb__deepl_auth_key.grid(row=row, pady=0) row+=1 \ No newline at end of file From 43b09de16701da1572fd6911d19490aae6b21392 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Fri, 19 Jan 2024 17:35:01 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[Refactor]=20Config=20Window:=20=E5=A4=89?= =?UTF-8?q?=E6=95=B0=E5=90=8D=E5=A4=89=E6=9B=B4=20snake=5Fcase=20to=20came?= =?UTF-8?q?lCase.=20config.py:=20=E3=83=86=E3=82=B9=E3=83=88=E7=94=A8?= =?UTF-8?q?=E3=81=AE=E4=B8=80=E9=83=A8print=E6=96=87=E3=81=8C=E9=96=93?= =?UTF-8?q?=E9=81=95=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92?= =?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 --- controller.py | 2 +- .../createSettingBox_AdvancedSettings.py | 12 ++--- .../createSettingBox_Appearance.py | 35 +++++++------- .../createSettingBox_Others.py | 28 +++++------ .../createSettingBox_Others_Additional.py | 4 +- ...ettingBox_Others_ReceivedMessageFormats.py | 12 ++--- ...ateSettingBox_Others_SendMessageFormats.py | 12 ++--- .../createSettingBox_Mic.py | 47 ++++++++++--------- .../createSettingBox_Speaker.py | 26 +++++----- .../createSettingBox_Translation.py | 12 ++--- 10 files changed, 95 insertions(+), 95 deletions(-) diff --git a/controller.py b/controller.py index fc5a7ee9..949c12e1 100644 --- a/controller.py +++ b/controller.py @@ -479,7 +479,7 @@ def callbackSetUiLanguage(value): view.showRestartButtonIfRequired(locale=config.UI_LANGUAGE) def callbackSetEnableRestoreMainWindowGeometry(value): - print("callbackSetEnableAutoClearMessageBox", value) + print("callbackSetEnableRestoreMainWindowGeometry", value) config.ENABLE_RESTORE_MAIN_WINDOW_GEOMETRY = value # Translation Tab 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 bb305ecf..330adc6e 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 @@ -8,13 +8,13 @@ def createSettingBox_AdvancedSettings(setting_box_wrapper, config_window, settin createSettingBoxButtonWithImage = sbg.createSettingBoxButtonWithImage - def entry_ip_address_callback(value): + def entryIpAddressCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_OSC_IP_ADDRESS, value) - def entry_port_callback(value): + def entryPortCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_OSC_PORT, value) - def open_config_filepath_callback(): + def openConfigFilepathCallback(): callFunctionIfCallable(view_variable.CALLBACK_OPEN_FILEPATH_CONFIG_FILE) row=0 @@ -23,7 +23,7 @@ def createSettingBox_AdvancedSettings(setting_box_wrapper, config_window, settin for_var_desc_text=view_variable.VAR_DESC_OSC_IP_ADDRESS, entry_attr_name="sb__entry_ip_address", entry_width=settings.uism.RESPONSIVE_UI_SIZE_INT_150, - entry_bind__Any_KeyRelease=lambda value: entry_ip_address_callback(value), + entry_bind__Any_KeyRelease=lambda value: entryIpAddressCallback(value), entry_textvariable=view_variable.VAR_OSC_IP_ADDRESS, ) config_window.sb__ip_address.grid(row=row) @@ -35,7 +35,7 @@ def createSettingBox_AdvancedSettings(setting_box_wrapper, config_window, settin for_var_desc_text=view_variable.VAR_DESC_OSC_PORT, entry_attr_name="sb__entry_port", entry_width=settings.uism.RESPONSIVE_UI_SIZE_INT_150, - entry_bind__Any_KeyRelease=lambda value: entry_port_callback(value), + entry_bind__Any_KeyRelease=lambda value: entryPortCallback(value), entry_textvariable=view_variable.VAR_OSC_PORT, ) config_window.sb__port.grid(row=row) @@ -45,7 +45,7 @@ def createSettingBox_AdvancedSettings(setting_box_wrapper, config_window, settin for_var_label_text=view_variable.VAR_LABEL_OPEN_CONFIG_FILEPATH, for_var_desc_text=view_variable.VAR_DESC_OPEN_CONFIG_FILEPATH, button_attr_name="sb__button_open_config_filepath", - button_command=lambda _e: open_config_filepath_callback(), + button_command=lambda _e: openConfigFilepathCallback(), button_image=settings.image_file.FOLDER_OPEN_ICON, ) config_window.sb__open_config_filepath.grid(row=row, pady=0) 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 615c0e4e..8eecc9c5 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 @@ -8,30 +8,29 @@ def createSettingBox_Appearance(setting_box_wrapper, config_window, settings, vi createSettingBoxSlider = sbg.createSettingBoxSlider createSettingBoxCheckbox = sbg.createSettingBoxCheckbox - # 関数名は変えるかもしれない。 - # テーマ変更、フォント変更時、 Widget再生成か再起動かは検討中 - def slider_transparency_callback(value): + + def sliderTransparencyCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_TRANSPARENCY, value) - def optionmenu_appearance_theme_callback(value): + def optionmenuAppearanceThemeCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_APPEARANCE, value) - def optionmenu_ui_scaling_callback(value): + def optionmenuUiScalingCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_UI_SCALING, value) - def slider_text_box_ui_scaling_callback(value): + def sliderTextBoxUiScalingCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_TEXTBOX_UI_SCALING, value) - def slider_message_box_ratio_callback(value): + def sliderMessageBoxRatioCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_MESSAGE_BOX_RATIO, value) - def optionmenu_font_family_callback(value): + def optionmenuFontFamilyCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_FONT_FAMILY, value) - def optionmenu_ui_language_callback(value): + def optionmenuUiLanguageCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_UI_LANGUAGE, value) - def checkbox_enable_restore_main_window_geometry_callback(checkbox_box_widget): + def checkboxEnableRestoreMainWindowGeometryCallback(checkbox_box_widget): callFunctionIfCallable(view_variable.CALLBACK_SET_ENABLE_RESTORE_MAIN_WINDOW_GEOMETRY, checkbox_box_widget.get()) row=0 @@ -40,7 +39,7 @@ def createSettingBox_Appearance(setting_box_wrapper, config_window, settings, vi for_var_desc_text=view_variable.VAR_DESC_TRANSPARENCY, slider_attr_name="sb__slider_transparency", slider_range=view_variable.SLIDER_RANGE_TRANSPARENCY, - command=lambda value: slider_transparency_callback(value), + command=lambda value: sliderTransparencyCallback(value), variable=view_variable.VAR_TRANSPARENCY, slider_bind__ButtonPress=view_variable.CALLBACK_BUTTON_PRESS_TRANSPARENCY, slider_bind__ButtonRelease=view_variable.CALLBACK_BUTTON_RELEASE_TRANSPARENCY, @@ -55,7 +54,7 @@ def createSettingBox_Appearance(setting_box_wrapper, config_window, settings, vi for_var_desc_text=view_variable.VAR_DESC_APPEARANCE_THEME, optionmenu_attr_name="sb__optionmenu_appearance_theme", dropdown_menu_values=view_variable.LIST_APPEARANCE_THEME, - command=lambda value: optionmenu_appearance_theme_callback(value), + command=lambda value: optionmenuAppearanceThemeCallback(value), variable=view_variable.VAR_APPEARANCE_THEME, ) config_window.sb__appearance_theme.grid(row=row) @@ -68,7 +67,7 @@ def createSettingBox_Appearance(setting_box_wrapper, config_window, settings, vi for_var_desc_text=view_variable.VAR_DESC_UI_SCALING, optionmenu_attr_name="sb__optionmenu_ui_scaling", dropdown_menu_values=view_variable.LIST_UI_SCALING, - command=lambda value: optionmenu_ui_scaling_callback(value), + command=lambda value: optionmenuUiScalingCallback(value), variable=view_variable.VAR_UI_SCALING, ) config_window.sb__ui_scaling.grid(row=row) @@ -79,7 +78,7 @@ def createSettingBox_Appearance(setting_box_wrapper, config_window, settings, vi for_var_desc_text=view_variable.VAR_DESC_TEXTBOX_UI_SCALING, slider_attr_name="sb__slider_transparency", slider_range=view_variable.SLIDER_RANGE_TEXTBOX_UI_SCALING, - command=lambda value: slider_text_box_ui_scaling_callback(value), + command=lambda value: sliderTextBoxUiScalingCallback(value), variable=view_variable.VAR_TEXTBOX_UI_SCALING, slider_bind__ButtonPress=view_variable.CALLBACK_BUTTON_PRESS_TEXTBOX_UI_SCALING, slider_bind__ButtonRelease=view_variable.CALLBACK_BUTTON_RELEASE_TEXTBOX_UI_SCALING, @@ -93,7 +92,7 @@ def createSettingBox_Appearance(setting_box_wrapper, config_window, settings, vi for_var_desc_text=view_variable.VAR_DESC_MESSAGE_BOX_RATIO, slider_attr_name="sb__slider_message_box_ratio", slider_range=view_variable.SLIDER_RANGE_MESSAGE_BOX_RATIO, - command=lambda value: slider_message_box_ratio_callback(value), + command=lambda value: sliderMessageBoxRatioCallback(value), variable=view_variable.VAR_MESSAGE_BOX_RATIO, slider_bind__ButtonPress=view_variable.CALLBACK_BUTTON_PRESS_MESSAGE_BOX_RATIO, slider_bind__ButtonRelease=view_variable.CALLBACK_BUTTON_RELEASE_MESSAGE_BOX_RATIO, @@ -107,7 +106,7 @@ def createSettingBox_Appearance(setting_box_wrapper, config_window, settings, vi for_var_desc_text=view_variable.VAR_DESC_FONT_FAMILY, optionmenu_attr_name="sb__optionmenu_font_family", dropdown_menu_values=view_variable.LIST_FONT_FAMILY, - command=lambda value: optionmenu_font_family_callback(value), + command=lambda value: optionmenuFontFamilyCallback(value), variable=view_variable.VAR_FONT_FAMILY, ) config_window.sb__font_family.grid(row=row) @@ -119,7 +118,7 @@ def createSettingBox_Appearance(setting_box_wrapper, config_window, settings, vi for_var_desc_text=view_variable.VAR_DESC_UI_LANGUAGE, optionmenu_attr_name="sb__optionmenu_ui_language", dropdown_menu_values=view_variable.LIST_UI_LANGUAGE, - command=lambda value: optionmenu_ui_language_callback(value), + command=lambda value: optionmenuUiLanguageCallback(value), variable=view_variable.VAR_UI_LANGUAGE, ) config_window.sb__ui_language.grid(row=row) @@ -129,7 +128,7 @@ def createSettingBox_Appearance(setting_box_wrapper, config_window, settings, vi for_var_label_text=view_variable.VAR_LABEL_ENABLE_RESTORE_MAIN_WINDOW_GEOMETRY, for_var_desc_text=view_variable.VAR_DESC_ENABLE_RESTORE_MAIN_WINDOW_GEOMETRY, checkbox_attr_name="sb__checkbox_enable_restore_main_window_geometry", - command=lambda: checkbox_enable_restore_main_window_geometry_callback(config_window.sb__checkbox_enable_restore_main_window_geometry), + command=lambda: checkboxEnableRestoreMainWindowGeometryCallback(config_window.sb__checkbox_enable_restore_main_window_geometry), variable=view_variable.VAR_ENABLE_RESTORE_MAIN_WINDOW_GEOMETRY, ) config_window.sb__enable_restore_main_window_geometry.grid(row=row, pady=0) 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 bacfa71f..b32116fe 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 @@ -9,25 +9,25 @@ def createSettingBox_Others(setting_box_wrapper, config_window, settings, view_v createSettingBoxAutoExportMessageLogs = sbg.createSettingBoxAutoExportMessageLogs - def checkbox_auto_clear_message_box_callback(checkbox_box_widget): + def checkboxAutoClearMessageBoxCallback(checkbox_box_widget): callFunctionIfCallable(view_variable.CALLBACK_SET_ENABLE_AUTO_CLEAR_MESSAGE_BOX, checkbox_box_widget.get()) - def checkbox_send_only_translated_messages_callback(checkbox_box_widget): + def checkboxSendOnlyTranslatedMessagesCallback(checkbox_box_widget): callFunctionIfCallable(view_variable.CALLBACK_SET_ENABLE_SEND_ONLY_TRANSLATED_MESSAGES, checkbox_box_widget.get()) - def checkbox_send_message_button_type_callback(): + def checkboxSendMessageButtonTypeCallback(): callFunctionIfCallable(view_variable.CALLBACK_SET_SEND_MESSAGE_BUTTON_TYPE, view_variable.VAR_SEND_MESSAGE_BUTTON_TYPE.get()) - def checkbox_notice_xsoverlay_callback(checkbox_box_widget): + def checkboxNoticeXsoverlayCallback(checkbox_box_widget): callFunctionIfCallable(view_variable.CALLBACK_SET_ENABLE_NOTICE_XSOVERLAY, checkbox_box_widget.get()) - def checkbox_auto_export_message_logs_callback(checkbox_box_widget): + def checkboxAutoExportMessageLogsCallback(checkbox_box_widget): callFunctionIfCallable(view_variable.CALLBACK_SET_ENABLE_AUTO_EXPORT_MESSAGE_LOGS, checkbox_box_widget.get()) - def button_auto_export_message_logs_callback(): + def buttonAutoExportMessageLogsCallback(): callFunctionIfCallable(view_variable.CALLBACK_OPEN_FILEPATH_LOGS) - def checkbox_enable_send_message_to_vrc_callback(checkbox_box_widget): + def checkboxEnableSendMessageToVrcCallback(checkbox_box_widget): callFunctionIfCallable(view_variable.CALLBACK_SET_ENABLE_SEND_MESSAGE_TO_VRC, checkbox_box_widget.get()) @@ -36,7 +36,7 @@ def createSettingBox_Others(setting_box_wrapper, config_window, settings, view_v 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", - command=lambda: checkbox_auto_clear_message_box_callback(config_window.sb__checkbox_auto_clear_message_box), + command=lambda: checkboxAutoClearMessageBoxCallback(config_window.sb__checkbox_auto_clear_message_box), variable=view_variable.VAR_ENABLE_AUTO_CLEAR_MESSAGE_BOX, ) config_window.sb__auto_clear_message_box.grid(row=row) @@ -46,7 +46,7 @@ def createSettingBox_Others(setting_box_wrapper, config_window, settings, view_v for_var_label_text=view_variable.VAR_LABEL_ENABLE_SEND_ONLY_TRANSLATED_MESSAGES, for_var_desc_text=view_variable.VAR_DESC_ENABLE_SEND_ONLY_TRANSLATED_MESSAGES, checkbox_attr_name="sb__checkbox_send_only_translated_messages", - command=lambda: checkbox_send_only_translated_messages_callback(config_window.sb__checkbox_send_only_translated_messages), + command=lambda: checkboxSendOnlyTranslatedMessagesCallback(config_window.sb__checkbox_send_only_translated_messages), variable=view_variable.VAR_ENABLE_SEND_ONLY_TRANSLATED_MESSAGES, ) config_window.sb__send_only_translated_messages.grid(row=row) @@ -56,7 +56,7 @@ def createSettingBox_Others(setting_box_wrapper, config_window, settings, view_v for_var_label_text=view_variable.VAR_LABEL_SEND_MESSAGE_BUTTON_TYPE, for_var_desc_text=view_variable.VAR_DESC_SEND_MESSAGE_BUTTON_TYPE, radio_button_attr_name="sb__radiobutton_send_message_button_type", - command=lambda: checkbox_send_message_button_type_callback(), + command=lambda: checkboxSendMessageButtonTypeCallback(), variable=view_variable.VAR_SEND_MESSAGE_BUTTON_TYPE, radiobutton_keys_values=view_variable.KEYS_VALUES_SEND_MESSAGE_BUTTON_TYPE, ) @@ -67,7 +67,7 @@ def createSettingBox_Others(setting_box_wrapper, config_window, settings, view_v 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", - command=lambda: checkbox_notice_xsoverlay_callback(config_window.sb__checkbox_notice_xsoverlay), + command=lambda: checkboxNoticeXsoverlayCallback(config_window.sb__checkbox_notice_xsoverlay), variable=view_variable.VAR_ENABLE_NOTICE_XSOVERLAY, ) config_window.sb__notice_xsoverlay.grid(row=row) @@ -78,8 +78,8 @@ def createSettingBox_Others(setting_box_wrapper, config_window, settings, view_v 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", - checkbox_command=lambda: checkbox_auto_export_message_logs_callback(config_window.sb__checkbox_auto_export_message_logs), - button_command=lambda _e: button_auto_export_message_logs_callback(), + checkbox_command=lambda: checkboxAutoExportMessageLogsCallback(config_window.sb__checkbox_auto_export_message_logs), + button_command=lambda _e: buttonAutoExportMessageLogsCallback(), variable=view_variable.VAR_ENABLE_AUTO_EXPORT_MESSAGE_LOGS, ) config_window.sb__auto_export_message_logs.grid(row=row) @@ -90,7 +90,7 @@ def createSettingBox_Others(setting_box_wrapper, config_window, settings, view_v 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", - command=lambda: checkbox_enable_send_message_to_vrc_callback(config_window.sb__checkbox_enable_send_message_to_vrc), + command=lambda: checkboxEnableSendMessageToVrcCallback(config_window.sb__checkbox_enable_send_message_to_vrc), variable=view_variable.VAR_ENABLE_SEND_MESSAGE_TO_VRC, ) config_window.sb__enable_send_message_to_vrc.grid(row=row, pady=0) diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_others/createSettingBox_Others_Additional.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_others/createSettingBox_Others_Additional.py index b7f39f91..577ef373 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_others/createSettingBox_Others_Additional.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_others/createSettingBox_Others_Additional.py @@ -6,7 +6,7 @@ def createSettingBox_Others_Additional(setting_box_wrapper, config_window, setti sbg = _SettingBoxGenerator(setting_box_wrapper, config_window, settings, view_variable) createSettingBoxCheckbox = sbg.createSettingBoxCheckbox - def checkbox_enable_send_received_message_to_vrc_callback(checkbox_box_widget): + def checkboxEnableSendReceivedMessageToVrcCallback(checkbox_box_widget): callFunctionIfCallable(view_variable.CALLBACK_SET_ENABLE_SEND_RECEIVED_MESSAGE_TO_VRC, checkbox_box_widget.get()) @@ -15,7 +15,7 @@ def createSettingBox_Others_Additional(setting_box_wrapper, config_window, setti for_var_label_text=view_variable.VAR_LABEL_ENABLE_SEND_RECEIVED_MESSAGE_TO_VRC, for_var_desc_text=view_variable.VAR_DESC_ENABLE_SEND_RECEIVED_MESSAGE_TO_VRC, checkbox_attr_name="sb__checkbox_enable_send_received_message_to_vrc", - command=lambda: checkbox_enable_send_received_message_to_vrc_callback(config_window.sb__checkbox_enable_send_received_message_to_vrc), + command=lambda: checkboxEnableSendReceivedMessageToVrcCallback(config_window.sb__checkbox_enable_send_received_message_to_vrc), variable=view_variable.VAR_ENABLE_SEND_RECEIVED_MESSAGE_TO_VRC, ) config_window.sb__enable_send_received_message_to_vrc.grid(row=row, pady=0) diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_others/createSettingBox_Others_ReceivedMessageFormats.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_others/createSettingBox_Others_ReceivedMessageFormats.py index 0d0bbca7..ac8bffa6 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_others/createSettingBox_Others_ReceivedMessageFormats.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_others/createSettingBox_Others_ReceivedMessageFormats.py @@ -8,14 +8,14 @@ def createSettingBox_Others_ReceivedMessageFormats(setting_box_wrapper, config_w createSettingBoxMessageFormatEntries = sbg.createSettingBoxMessageFormatEntries createSettingBoxMessageFormatEntries_WithTranslation = sbg.createSettingBoxMessageFormatEntries_WithTranslation - def entry_received_message_format_callback(value): + def entryReceivedMessageFormatCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_RECEIVED_MESSAGE_FORMAT, value) - def entry_received_message_format_with_t_callback(value): + def entryReceivedMessageFormatWithTCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_RECEIVED_MESSAGE_FORMAT_WITH_T, value) - def entry_swap_received_message_format_with_t_callback(_e): + def entrySwapReceivedMessageFormatWithTCallback(_e): callFunctionIfCallable(view_variable.CALLBACK_SWAP_RECEIVED_MESSAGE_FORMAT_WITH_T_REQUIRED_TEXT) row=0 @@ -33,7 +33,7 @@ def createSettingBox_Others_ReceivedMessageFormats(setting_box_wrapper, config_w entry_textvariable_1=view_variable.VAR_ENTRY_1_RECEIVED_MESSAGE_FORMAT, textvariable_0=view_variable.VAR_TEXT_REQUIRED_0_RECEIVED_MESSAGE_FORMAT, example_label_textvariable=view_variable.VAR_LABEL_EXAMPLE_TEXT_RECEIVED_MESSAGE_FORMAT, - entry_bind__Any_KeyRelease=lambda value: entry_received_message_format_callback(value), + entry_bind__Any_KeyRelease=lambda value: entryReceivedMessageFormatCallback(value), entry_bind__FocusOut=view_variable.CALLBACK_FOCUS_OUT_RECEIVED_MESSAGE_FORMAT, ) config_window.sb__received_message_format.grid(row=row) @@ -57,8 +57,8 @@ def createSettingBox_Others_ReceivedMessageFormats(setting_box_wrapper, config_w textvariable_0=view_variable.VAR_TEXT_REQUIRED_0_RECEIVED_MESSAGE_FORMAT_WITH_T, textvariable_1=view_variable.VAR_TEXT_REQUIRED_1_RECEIVED_MESSAGE_FORMAT_WITH_T, example_label_textvariable=view_variable.VAR_LABEL_EXAMPLE_TEXT_RECEIVED_MESSAGE_FORMAT_WITH_T, - entry_bind__Any_KeyRelease=lambda value: entry_received_message_format_with_t_callback(value), - swap_button_command=entry_swap_received_message_format_with_t_callback, + entry_bind__Any_KeyRelease=lambda value: entryReceivedMessageFormatWithTCallback(value), + swap_button_command=entrySwapReceivedMessageFormatWithTCallback, entry_bind__FocusOut=view_variable.CALLBACK_FOCUS_OUT_RECEIVED_MESSAGE_FORMAT_WITH_T, ) config_window.sb__received_message_format_with_t.grid(row=row, pady=0) diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_others/createSettingBox_Others_SendMessageFormats.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_others/createSettingBox_Others_SendMessageFormats.py index 6180ffd8..61c89dd2 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_others/createSettingBox_Others_SendMessageFormats.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_others/createSettingBox_Others_SendMessageFormats.py @@ -8,14 +8,14 @@ def createSettingBox_Others_SendMessageFormats(setting_box_wrapper, config_windo createSettingBoxMessageFormatEntries = sbg.createSettingBoxMessageFormatEntries createSettingBoxMessageFormatEntries_WithTranslation = sbg.createSettingBoxMessageFormatEntries_WithTranslation - def entry_send_message_format_callback(value): + def entrySendMessageFormatCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_SEND_MESSAGE_FORMAT, value) - def entry_send_message_format_with_t_callback(value): + def entrySendMessageFormatWithTCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_SEND_MESSAGE_FORMAT_WITH_T, value) - def entry_swap_message_format_with_t_callback(_e): + def entrySwapMessageFormatWithTCallback(_e): callFunctionIfCallable(view_variable.CALLBACK_SWAP_SEND_MESSAGE_FORMAT_WITH_T_REQUIRED_TEXT) @@ -34,7 +34,7 @@ def createSettingBox_Others_SendMessageFormats(setting_box_wrapper, config_windo entry_textvariable_1=view_variable.VAR_ENTRY_1_SEND_MESSAGE_FORMAT, textvariable_0=view_variable.VAR_TEXT_REQUIRED_0_SEND_MESSAGE_FORMAT, example_label_textvariable=view_variable.VAR_LABEL_EXAMPLE_TEXT_SEND_MESSAGE_FORMAT, - entry_bind__Any_KeyRelease=lambda value: entry_send_message_format_callback(value), + entry_bind__Any_KeyRelease=lambda value: entrySendMessageFormatCallback(value), entry_bind__FocusOut=view_variable.CALLBACK_FOCUS_OUT_SEND_MESSAGE_FORMAT, ) config_window.sb__message_format.grid(row=row) @@ -58,8 +58,8 @@ def createSettingBox_Others_SendMessageFormats(setting_box_wrapper, config_windo textvariable_0=view_variable.VAR_TEXT_REQUIRED_0_SEND_MESSAGE_FORMAT_WITH_T, textvariable_1=view_variable.VAR_TEXT_REQUIRED_1_SEND_MESSAGE_FORMAT_WITH_T, example_label_textvariable=view_variable.VAR_LABEL_EXAMPLE_TEXT_SEND_MESSAGE_FORMAT_WITH_T, - entry_bind__Any_KeyRelease=lambda value: entry_send_message_format_with_t_callback(value), - swap_button_command=entry_swap_message_format_with_t_callback, + entry_bind__Any_KeyRelease=lambda value: entrySendMessageFormatWithTCallback(value), + swap_button_command=entrySwapMessageFormatWithTCallback, entry_bind__FocusOut=view_variable.CALLBACK_FOCUS_OUT_SEND_MESSAGE_FORMAT_WITH_T, ) config_window.sb__message_format_with_t.grid(row=row, pady=0) 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 d5ece1b6..50eb8d2e 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 @@ -12,39 +12,40 @@ def createSettingBox_Mic(setting_box_wrapper, config_window, settings, view_vari createSettingBoxAddAndDeleteAbleList = sbg.createSettingBoxAddAndDeleteAbleList - def checkbox_input_mic_threshold_check_callback(is_turned_on): + def checkboxInputMicThresholdCheckCallback(is_turned_on): callFunctionIfCallable(view_variable.CALLBACK_CHECK_MIC_THRESHOLD, is_turned_on) - def optionmenu_mic_host_callback(value): + def optionmenuMicHostCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_MIC_HOST, value) - def optionmenu_input_mic_device_callback(value): + def optionmenuInputMicDeviceCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_MIC_DEVICE, value) - def slider_input_mic_energy_threshold_callback(value): + def sliderInputMicEnergyThresholdCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_MIC_ENERGY_THRESHOLD, value) - def checkbox_input_mic_dynamic_energy_threshold_callback(checkbox_box_widget): + def checkboxInputMicDynamicEnergyThresholdCallback(checkbox_box_widget): callFunctionIfCallable(view_variable.CALLBACK_SET_MIC_DYNAMIC_ENERGY_THRESHOLD, checkbox_box_widget.get()) - def entry_input_mic_record_timeout_callback(value): + def entryInputMicRecordTimeoutCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_MIC_RECORD_TIMEOUT, value) - def entry_input_mic_phrase_timeout_callback(value): + def entryInputMicPhraseTimeoutCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_MIC_PHRASE_TIMEOUT, value) - def entry_input_mic_max_phrases_callback(value): + def entryInputMicMaxPhrasesCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_MIC_MAX_PHRASES, value) - def arrow_switch_mic_word_filter_list_open_callback(value): + def arrowSwitchMicWordFilterListOpenCallback(value): callFunctionIfCallable(view_variable.CALLBACK_ARROW_SWITCH_MIC_WORD_FILTER_LIST_OPEN) - def arrow_switch_mic_word_filter_list_close_callback(value): + def arrowSwitchMicWordFilterListCloseCallback(value): callFunctionIfCallable(view_variable.CALLBACK_ARROW_SWITCH_MIC_WORD_FILTER_LIST_CLOSE) - def entry_input_mic_word_filters_callback(value): - callFunctionIfCallable(view_variable.CALLBACK_SET_MIC_WORD_FILTER, value) +# 直接 SettingBoxGenerator.pyでcallFunctionIfCallableから呼んでいます。（word filter 専用関数になっているのでそのままですが、良くはない） + # def entry_input_mic_word_filters_callback(value): + # callFunctionIfCallable(view_variable.CALLBACK_SET_MIC_WORD_FILTER, value) row=0 @@ -54,7 +55,7 @@ def createSettingBox_Mic(setting_box_wrapper, config_window, settings, view_vari for_var_desc_text=view_variable.VAR_DESC_MIC_HOST, optionmenu_attr_name="sb__optionmenu_mic_host", dropdown_menu_values=view_variable.LIST_MIC_HOST, - command=lambda value: optionmenu_mic_host_callback(value), + command=lambda value: optionmenuMicHostCallback(value), variable=view_variable.VAR_MIC_HOST, ) config_window.sb__mic_host.grid(row=row) @@ -65,7 +66,7 @@ def createSettingBox_Mic(setting_box_wrapper, config_window, settings, view_vari for_var_desc_text=view_variable.VAR_DESC_MIC_DEVICE, optionmenu_attr_name="sb__optionmenu_mic_device", dropdown_menu_values=view_variable.LIST_MIC_DEVICE, - command=lambda value: optionmenu_input_mic_device_callback(value), + command=lambda value: optionmenuInputMicDeviceCallback(value), variable=view_variable.VAR_MIC_DEVICE, ) config_window.sb__mic_device.grid(row=row) @@ -75,14 +76,14 @@ def createSettingBox_Mic(setting_box_wrapper, config_window, settings, view_vari for_var_label_text=view_variable.VAR_LABEL_MIC_DYNAMIC_ENERGY_THRESHOLD, for_var_desc_text=view_variable.VAR_DESC_MIC_DYNAMIC_ENERGY_THRESHOLD, switch_attr_name="sb__checkbox_mic_dynamic_energy_threshold", - command=lambda: checkbox_input_mic_dynamic_energy_threshold_callback(config_window.sb__checkbox_mic_dynamic_energy_threshold), + command=lambda: checkboxInputMicDynamicEnergyThresholdCallback(config_window.sb__checkbox_mic_dynamic_energy_threshold), variable=view_variable.VAR_MIC_DYNAMIC_ENERGY_THRESHOLD ) config_window.sb__mic_dynamic_energy_threshold.grid(row=row, pady=0) row+=1 config_window.sb__mic_energy_threshold = createSettingBoxProgressbarXSlider( - command=slider_input_mic_energy_threshold_callback, + command=sliderInputMicEnergyThresholdCallback, progressbar_x_slider_attr_name="sb__mic_energy_threshold", entry_attr_name="sb__progressbar_x_slider__entry_mic_energy_threshold", @@ -97,9 +98,9 @@ def createSettingBox_Mic(setting_box_wrapper, config_window, settings, view_vari progressbar_attr_name="sb__progressbar_x_slider__progressbar_mic_energy_threshold", passive_button_attr_name="sb__progressbar_x_slider__passive_button_mic_energy_threshold", - passive_button_command=lambda _e: checkbox_input_mic_threshold_check_callback(True), + passive_button_command=lambda _e: checkboxInputMicThresholdCheckCallback(True), active_button_attr_name="sb__progressbar_x_slider__active_button_mic_energy_threshold", - active_button_command=lambda _e: checkbox_input_mic_threshold_check_callback(False), + active_button_command=lambda _e: checkboxInputMicThresholdCheckCallback(False), button_image_file=settings.image_file.MIC_ICON, disabled_button_attr_name="sb__progressbar_x_slider__disabled_button_mic_energy_threshold", disabled_button_image_file=settings.image_file.MIC_ICON_DISABLED, @@ -114,7 +115,7 @@ def createSettingBox_Mic(setting_box_wrapper, config_window, settings, view_vari for_var_desc_text=view_variable.VAR_DESC_MIC_RECORD_TIMEOUT, entry_attr_name="sb__entry_mic_record_timeout", entry_width=settings.uism.RESPONSIVE_UI_SIZE_INT_100, - entry_bind__Any_KeyRelease=lambda value: entry_input_mic_record_timeout_callback(value), + entry_bind__Any_KeyRelease=lambda value: entryInputMicRecordTimeoutCallback(value), entry_textvariable=view_variable.VAR_MIC_RECORD_TIMEOUT, entry_bind__FocusOut=view_variable.CALLBACK_FOCUS_OUT_MIC_RECORD_TIMEOUT, ) @@ -126,7 +127,7 @@ def createSettingBox_Mic(setting_box_wrapper, config_window, settings, view_vari for_var_desc_text=view_variable.VAR_DESC_MIC_PHRASE_TIMEOUT, entry_attr_name="sb__entry_mic_phrase_timeout", entry_width=settings.uism.RESPONSIVE_UI_SIZE_INT_100, - entry_bind__Any_KeyRelease=lambda value: entry_input_mic_phrase_timeout_callback(value), + entry_bind__Any_KeyRelease=lambda value: entryInputMicPhraseTimeoutCallback(value), entry_textvariable=view_variable.VAR_MIC_PHRASE_TIMEOUT, entry_bind__FocusOut=view_variable.CALLBACK_FOCUS_OUT_MIC_PHRASE_TIMEOUT, ) @@ -138,7 +139,7 @@ def createSettingBox_Mic(setting_box_wrapper, config_window, settings, view_vari for_var_desc_text=view_variable.VAR_DESC_MIC_MAX_PHRASES, entry_attr_name="sb__entry_mic_max_phrases", entry_width=settings.uism.RESPONSIVE_UI_SIZE_INT_100, - entry_bind__Any_KeyRelease=lambda value: entry_input_mic_max_phrases_callback(value), + entry_bind__Any_KeyRelease=lambda value: entryInputMicMaxPhrasesCallback(value), entry_textvariable=view_variable.VAR_MIC_MAX_PHRASES, entry_bind__FocusOut=view_variable.CALLBACK_FOCUS_OUT_MIC_MAX_PHRASES, ) @@ -151,8 +152,8 @@ def createSettingBox_Mic(setting_box_wrapper, config_window, settings, view_vari for_var_label_text=view_variable.VAR_LABEL_MIC_WORD_FILTER, for_var_desc_text=view_variable.VAR_DESC_MIC_WORD_FILTER, arrow_switch_attr_name="sb__arrow_switch_mic_word_filter", - open_command=lambda value: arrow_switch_mic_word_filter_list_open_callback(value), - close_command=lambda value: arrow_switch_mic_word_filter_list_close_callback(value), + open_command=lambda value: arrowSwitchMicWordFilterListOpenCallback(value), + close_command=lambda value: arrowSwitchMicWordFilterListCloseCallback(value), var_switch_desc=view_variable.VAR_SWITCH_DESC_MIC_WORD_FILTER, ) config_window.sb__mic_word_filter.grid(row=row, pady=0) 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 a9d1ad9b..846dbd8e 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 @@ -9,24 +9,24 @@ def createSettingBox_Speaker(setting_box_wrapper, config_window, settings, view_ createSettingBoxEntry = sbg.createSettingBoxEntry - def checkbox_input_speaker_threshold_check_callback(is_turned_on): + def checkboxInputSpeakerThresholdCheckCallback(is_turned_on): callFunctionIfCallable(view_variable.CALLBACK_CHECK_SPEAKER_THRESHOLD, is_turned_on) - def slider_input_speaker_energy_threshold_callback(value): + def sliderInputSpeakerEnergyThresholdCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_SPEAKER_ENERGY_THRESHOLD, value) - def checkbox_input_speaker_dynamic_energy_threshold_callback(checkbox_box_widget): + def checkboxInputSpeakerDynamicEnergyThresholdCallback(checkbox_box_widget): callFunctionIfCallable(view_variable.CALLBACK_SET_SPEAKER_DYNAMIC_ENERGY_THRESHOLD, checkbox_box_widget.get()) - def entry_input_speaker_record_timeout_callback(value): + def entryInputSpeakerRecordTimeoutCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_SPEAKER_RECORD_TIMEOUT, value) - def entry_input_speaker_phrase_timeout_callback(value): + def entryInputSpeakerPhraseTimeoutCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_SPEAKER_PHRASE_TIMEOUT, value) - def entry_input_speaker_max_phrases_callback(value): + def entryInputSpeakerMaxPhrasesCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_SPEAKER_MAX_PHRASES, value) @@ -36,14 +36,14 @@ def createSettingBox_Speaker(setting_box_wrapper, config_window, settings, view_ for_var_label_text=view_variable.VAR_LABEL_SPEAKER_DYNAMIC_ENERGY_THRESHOLD, for_var_desc_text=view_variable.VAR_DESC_SPEAKER_DYNAMIC_ENERGY_THRESHOLD, switch_attr_name="sb__checkbox_speaker_dynamic_energy_threshold", - command=lambda: checkbox_input_speaker_dynamic_energy_threshold_callback(config_window.sb__checkbox_speaker_dynamic_energy_threshold), + command=lambda: checkboxInputSpeakerDynamicEnergyThresholdCallback(config_window.sb__checkbox_speaker_dynamic_energy_threshold), variable=view_variable.VAR_SPEAKER_DYNAMIC_ENERGY_THRESHOLD, ) config_window.sb__speaker_dynamic_energy_threshold.grid(row=row, pady=0) row+=1 config_window.sb__speaker_energy_threshold = createSettingBoxProgressbarXSlider( - command=slider_input_speaker_energy_threshold_callback, + command=sliderInputSpeakerEnergyThresholdCallback, progressbar_x_slider_attr_name="sb__speaker_energy_threshold", entry_variable=view_variable.VAR_SPEAKER_ENERGY_THRESHOLD__ENTRY, @@ -58,9 +58,9 @@ def createSettingBox_Speaker(setting_box_wrapper, config_window, settings, view_ progressbar_attr_name="sb__progressbar_x_slider__progressbar_speaker_energy_threshold", passive_button_attr_name="sb__progressbar_x_slider__passive_button_speaker_energy_threshold", - passive_button_command=lambda _e: checkbox_input_speaker_threshold_check_callback(True), + passive_button_command=lambda _e: checkboxInputSpeakerThresholdCheckCallback(True), active_button_attr_name="sb__progressbar_x_slider__active_button_speaker_energy_threshold", - active_button_command=lambda _e: checkbox_input_speaker_threshold_check_callback(False), + active_button_command=lambda _e: checkboxInputSpeakerThresholdCheckCallback(False), button_image_file=settings.image_file.HEADPHONES_ICON, disabled_button_attr_name="sb__progressbar_x_slider__disabled_button_speaker_energy_threshold", disabled_button_image_file=settings.image_file.HEADPHONES_ICON_DISABLED, @@ -75,7 +75,7 @@ def createSettingBox_Speaker(setting_box_wrapper, config_window, settings, view_ for_var_desc_text=view_variable.VAR_DESC_SPEAKER_RECORD_TIMEOUT, entry_attr_name="sb__entry_speaker_record_timeout", entry_width=settings.uism.RESPONSIVE_UI_SIZE_INT_100, - entry_bind__Any_KeyRelease=lambda value: entry_input_speaker_record_timeout_callback(value), + entry_bind__Any_KeyRelease=lambda value: entryInputSpeakerRecordTimeoutCallback(value), entry_textvariable=view_variable.VAR_SPEAKER_RECORD_TIMEOUT, entry_bind__FocusOut=view_variable.CALLBACK_FOCUS_OUT_SPEAKER_RECORD_TIMEOUT, ) @@ -87,7 +87,7 @@ def createSettingBox_Speaker(setting_box_wrapper, config_window, settings, view_ for_var_desc_text=view_variable.VAR_DESC_SPEAKER_PHRASE_TIMEOUT, entry_attr_name="sb__entry_speaker_phrase_timeout", entry_width=settings.uism.RESPONSIVE_UI_SIZE_INT_100, - entry_bind__Any_KeyRelease=lambda value: entry_input_speaker_phrase_timeout_callback(value), + entry_bind__Any_KeyRelease=lambda value: entryInputSpeakerPhraseTimeoutCallback(value), entry_textvariable=view_variable.VAR_SPEAKER_PHRASE_TIMEOUT, entry_bind__FocusOut=view_variable.CALLBACK_FOCUS_OUT_SPEAKER_PHRASE_TIMEOUT, ) @@ -99,7 +99,7 @@ def createSettingBox_Speaker(setting_box_wrapper, config_window, settings, view_ for_var_desc_text=view_variable.VAR_DESC_SPEAKER_MAX_PHRASES, entry_attr_name="sb__entry_speaker_max_phrases", entry_width=settings.uism.RESPONSIVE_UI_SIZE_INT_100, - entry_bind__Any_KeyRelease=lambda value: entry_input_speaker_max_phrases_callback(value), + entry_bind__Any_KeyRelease=lambda value: entryInputSpeakerMaxPhrasesCallback(value), entry_textvariable=view_variable.VAR_SPEAKER_MAX_PHRASES, entry_bind__FocusOut=view_variable.CALLBACK_FOCUS_OUT_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 62ed881a..f245c387 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 @@ -8,13 +8,13 @@ def createSettingBox_Translation(setting_box_wrapper, config_window, settings, v createSettingBoxDropdownMenu = sbg.createSettingBoxDropdownMenu createSettingBoxEntry = sbg.createSettingBoxEntry - def switch_use_translation_feature_callback(switch_widget): + def switchUseTranslationFeatureCallback(switch_widget): callFunctionIfCallable(view_variable.CALLBACK_SET_USE_TRANSLATION_FEATURE, switch_widget.get()) - def optionmenu_ctranslate2_weight_type_callback(value): + def optionmenuCtranslate2WeightTypeCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_CTRANSLATE2_WEIGHT_TYPE, value) - def deepl_auth_key_callback(value): + def deeplAuthKeyCallback(value): callFunctionIfCallable(view_variable.CALLBACK_SET_DEEPL_AUTH_KEY, value) @@ -23,7 +23,7 @@ def createSettingBox_Translation(setting_box_wrapper, config_window, settings, v for_var_label_text=view_variable.VAR_LABEL_USE_TRANSLATION_FEATURE, for_var_desc_text=view_variable.VAR_DESC_USE_TRANSLATION_FEATURE, switch_attr_name="sb__switch_use_translation_feature", - command=lambda: switch_use_translation_feature_callback(config_window.sb__switch_use_translation_feature), + command=lambda: switchUseTranslationFeatureCallback(config_window.sb__switch_use_translation_feature), variable=view_variable.VAR_USE_TRANSLATION_FEATURE ) config_window.sb__use_translation_feature.grid(row=row, pady=0) @@ -34,7 +34,7 @@ def createSettingBox_Translation(setting_box_wrapper, config_window, settings, v for_var_desc_text=view_variable.VAR_DESC_CTRANSLATE2_WEIGHT_TYPE, optionmenu_attr_name="sb__optionmenu_ctranslate2_weight_type", dropdown_menu_values=view_variable.DICT_CTRANSLATE2_WEIGHT_TYPE, - command=lambda value: optionmenu_ctranslate2_weight_type_callback(value), + command=lambda value: optionmenuCtranslate2WeightTypeCallback(value), variable=view_variable.VAR_CTRANSLATE2_WEIGHT_TYPE, ) config_window.sb__ctranslate2_weight_type.grid(row=row) @@ -46,7 +46,7 @@ def createSettingBox_Translation(setting_box_wrapper, config_window, settings, v for_var_desc_text=view_variable.VAR_DESC_DEEPL_AUTH_KEY, entry_attr_name="sb__entry_deepl_auth_key", entry_width=settings.uism.RESPONSIVE_UI_SIZE_INT_300, - entry_bind__Any_KeyRelease=lambda value: deepl_auth_key_callback(value), + entry_bind__Any_KeyRelease=lambda value: deeplAuthKeyCallback(value), entry_textvariable=view_variable.VAR_DEEPL_AUTH_KEY, ) config_window.sb__deepl_auth_key.grid(row=row, pady=0) From 0ae206f4bd554100ae6a8432c0e2a86b66b3ebe2 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Fri, 19 Jan 2024 17:48:51 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[Chore]=20img:=20=E7=94=BB=E5=83=8F?= =?UTF-8?q?=E3=83=87=E3=83=BC=E3=82=BF=E4=B8=80=E3=81=A4=E3=81=A0=E3=81=91?= =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=82=BA=E3=81=8C=E5=A4=A7=E3=81=8D=E3=81=8B?= =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=81=AE=E3=81=A7=E3=80=8148px=E3=81=AE?= =?UTF-8?q?=E3=82=82=E3=81=AE=E3=81=AB=E5=B7=AE=E3=81=97=E6=9B=BF=E3=81=88?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- img/narrow_arrow_down_black.png | Bin 5433 -> 855 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/img/narrow_arrow_down_black.png b/img/narrow_arrow_down_black.png index 21e2ea0bd1d35aee3e23166cac7768a50db90e3e..e53829e5dc93de28c2b861c0ee8dd1d281ea7c0d 100644 GIT binary patch delta 847 zcmV-V1F-zLD%S=fiBL{Q4GJ0x0000DNk~Le0000m0000m2nGNE09OL}hmj!{e*+0g zL_t(&-tCvYYZO5k#-DfQRxWF>5>1gJ*r|{rg$n)+Nt39kl@jiDZ+Fi`i1-mnWo0yp zce!kWAzD}lxkf}pLP zd9+}2QuQ|_l5UUzWB~uTGJv#|e*vVe3?OY~0BI`&NLv{|+R6aZRtAu^GJv#|0i>-A zAZ`600FF1d>u(uqwbvg33YO!BVfeOayN8lCU$osrVHmzISWY=M008@$xm#;}*LKRi zNtw5uaKbfDI|-V68g0-pcwd@1$R=yp~cP1E93llSSJ-+Nt@X?H<)y zPXbU<%Hw{m@~YJuEnS7he}(EpDTD_=L{YS2mArv=&08gJAc~?D073{cvA9sZ-%g#D z@A9HQ?+YQS0L&b6tvX|;y!lzXBmssk{E5I2|n`Pp_iqOHfc-89FE=m9hLDy8b) znX~z=uJz8G%{LRLmx!L^^LeLT^KApnT)(Oe!#GAnubBBj5CqFxe_a~{!7?)+Afk7M zVGQ4xy%zp;005{}=QcKzNo#$gU^(aiw5DJ==e5=+0DNgC&RQqtI|2XzzgBr8r5pwj zYOSvnZFlH*bBne+q_w^RKsOWTWvAvl1^|G?h3aD|+=tMf4H~nzOMVa?)UxqeBST({ld&dpO;INi-m=S*U&)6 z0vuPF8|QJb*Sx=w1P&*>4Qzc`Sopp(w?9&4_{3OP1gVBPw=9E3Xyc*YDRWI6s|a#< zAa>{2Dd#U8xlf!_HTZCq8i-?$FfMB1m>aAxx2v$lXIBi8n&8RZUdtX;B#$(f_B$GO z#e!G$@)sUM#c?0J1+!lIXPFdS>A#S|X=uEiJ-#!p5h)p9$1xlHcVJF9gxr&}dh|0e zonG}D_dDG3*q6;#ZGHr@JaiF{vn<8lUgj)iV`(kWj`~C8IV+nt5Bu@SGh95aHw4c- zagn~xf-`esd70bFa`rzR{)5B+8xIeJzu@O=yP<4?g;MDVUMkOCt7{a8V~Fjr1%i53 zL|ntt9)*IVIk@h4HZ?tl`)zJr_5Zvq%(3IUCyHqwkD+ew@mA1}Cb=tZexmVk1KHD~ zZZ&GChiGoDn1SU+)zk5w=m<~6qoYacL8C?l8}&h5+x@8VtDYMs*@v@Rcs$--i&0}N zby4TS8x7vX@`_3Vhli44ee>xTI@@shjL63FOP4MUg|Fi;#g2hdHk2-QFRmr;daG?7JoC$zxuYV~L9r?;na{h*%v(<=oQMeaRlG1W!y`f^va z!sr+2Phere&d$@XWxKeq`6Wsk#_Q?pb8viK>8~Pi@6~u7n9%0uhu?#Ca2NEEl9J-H zr4j6HDBXq8a^3)l^Jn>1w8-RA#}s3!p)kM0@20kh=ZDY;aFUFl)vYBg_>G+8i{+p$ z(s)Z15O=-`+oa7^9Bu3<3Jbi#NqoePP;DsB4?kj|pTEznaUd&t;PTOuU5>73HG8h+ z);sC4q>lq`d@>m?^jsn`zwK!ZlFrw9@KFNuh{&7x1id`fM)=xvVkwsS=r82~zEzEl z&SlbZmyihgjD$0M`rFXVF>5S=zi!II$5EV5AJzevzd%cnj+3xXNw27=2vx*GBR>m< zMV&aGk8N_zudc4vJNfh^%@~TlmihMW88`QpD=uh>s**AnchdLo-=qAXcj*Wj&fDLe zEBpNdsWCU`jG*8U`=3ay&X*qZCWw3S^gh`nupwnn$l&4M*xvojjsAM1Q6hOmWA>SEWTLQBR02 z)&dY+Pt}b-2S;n9f06a3rQOBH#l>xXkdDw%OUA>$8%W9z&#%k6q9sxu`30ZWzd*e8 zOpKB|H#g_*IXH5RdRX_}m5F6uw}O?Oo!wQ=HWgZeY!?=X!}0qC_=C{lfTA77)7IA3 z&fBIT`UsrSClxZgl^n#&zLjoJL~Fq+PdWw;-N2HBDnbtbSj#_bN7-c2#2+F5Vptf+*e%cT57_lt zY246{l+S21#3y`pTHV~)gE^x$9KXnc&*nkhS?Q;4y#gV2>C|9I$qWoYc(~}vyCZe# zL`jke+GOYO=BJ)6XsD);E_k!q5^G2LN2`+X#O-}!DeVuH!vfpSe^6}^v5~GQWWAn!G;hPCU?-wDz?~$j3=_@KoJc<6z#|NO5h0v>OuTibBs3=i$=&6W64EY>oG8D5_BBZrWth;(K=E*IA- z9X|2j&M2H1T#W(O7V>$03lT~um#9u?bj^pW0DM`;=0@;N%|@Z&Qpx9u$W4)0?1ES+ zwnvZ;L#;jS!@<8W`Q8q5`gR%cqG*B-lktK8yVdlm_ch z8!!DlorsRT-I)533-T!=+Bg*VudVQf&}&r>z=%9b`|t zTg%_GuvqU^9vb`A2_|@F&YZx#eD76Anbm>)2vs2?;p7Xw9DfxD8CwJe{cXWc3dy2*wil$F1YNuy&|c#n@F^ z>Qqsp!j`_(fZNt;sV%lRQ?&AN^J@`nP@x_@R({sm*;x#3anceb4Y~CJU9f%q!=q4$ zi*M=I%a<>g)8QHWv3i9NLR!s4`S!ii4dE&gTQGECEg<{tgz-Icffk@D#!ySd;W6q` zqbgtufg;PeeH;V>Av`~zYp(p)Ac=cCff*gg4mD73jeo?Z{**lRqQO0W-ml?7NlERf zz>DuqMh`bb!cDJFGXA12slO#M;c#kYRKqG(tmOsb+w02$C_4aJKdXj~LZs~Pd;j9M zzBo|w4&c+Cz|8zGI(10Z$f&yF7c2)4e`+9Eg(LMJDuL-!u|>hUlBY-|-ZO_2V|BjD zV-ZxSN7m)s)~Bx8pVd5tIODFX8fg zS4XHAt(nHkirRy_gQVc6tdX}IQ9FOe({=^M2^azUGiHlpe|f=b#)!^ zvUd5$KVl-c)v;}S>`aD|ds=VzX4RCb*7(lwj8%Ol9)GTF**L#r(mob4`q+%A4{T`A5x>Av1^G zOuPn3@$6j2xl9!Eh`aCGx;KAAOSFl4X_x%1aBOQqVev^KO(sJvAYB!yOYO(l3k7*L zH8Dd}A#|8952uRV+&QuxkQmn9;piPvLa_M$TN=l44y4akB<4_##nK&T4We`d{_k`!d2Q@Mja}o z^yIYM$|IWP99`@3X=j2*8T4B0VHYmGhI-{178YiZ=DOGuSu(I#Syff#_Nw8880GBE zC?Ovus3zH%zmH&$RP7wJ+o#b(Uk~=mS!t465+G!WOk6ZPwPos5WLcb#hue{7XzE{~ zk(JZi?CnXlCG?bb=OXi}jO?te!y{rIN@kxle0zP+UcVklQXx7|H69+OIJu(Q0S&#O z9VPdMObH)FDo$YF3TOk#r7Z|QALYJlu71wiPxw?5tVQF@Dv0dRO3+>V`mcjV zkhmY3A{JMxhXwc$0$cQ48($R%hIpc0WZ~@U4S--nq+?~<55PZ9SRD&d<#o9=%*aa^ zS@_m>JafFPKM)BoAobP%Dab{$_StZyT z8O9dga_3AG1<2`Dgm4dN!kTefv|(?IPf>gDxFkEyiOhwZJ~4U!O71XVbIEEI>Lm#wRZ zOg#&=IY8m>#|$9sv6!+eivGKAqXP5<+xf4^$e>06<$7d^+=}vrPo-K<0O37R*aS

m6wQKMnObs$qP*5=7d9{03Md2wc#USR}ySEyl0f}~H zg_;g>sYc;5vv|{NeBfXUoi@wJwN5pvh(rZg(y)sZv$f z{18dVQl%=RLe7X$Sfg1f#1FcR0KmPun*Ok)*=H9oUOb3lQ>zLH8u=WB9w8DdZy6?? zCKAG$AA6zvU(M}Zj)}h+wb9{KcE=Lf5+Plst;=CWmW%r{I8*gEWjr|3vyrkH#^nI` z0*iv~hkfYg<#Lz3h~~*@vq^R85>gzJ**y^br&&%+rh(*gSy`>U+>ZN@t+@YM&@|5I zAu`yrK+|P-*kIn$Olqa!KZ&ARLCofY!fhG;gQ9Cmd=a*^AZGA zL?%zev=2(e7cFEDD>bDhg#EF#@S{-z(crhikr z?s6whHo}aVnI>|Ez0U+^7@yt&c#t9iN+Hn~36mf+=WPAM5Ba|BF$b z%zaM`;d?hSXGOU*N8o)-;3VrW5;0`Zxzdt5x^;7tHIF!{6TBA<+MR3ES|s>l`K4_k zuJIw%3H$9o>|OatZ<^zw)qD-|UJNIp5+#-NK-9Diq#Eyt5c|JgESa%02* zFZW-D`#oV{8s?Uf4{jg`fe-HTs)QwI2XS1xX?@jU{}ZqU7l$16Pd@zz6wCz=lxo-h zjc*0FqPWeNMoLvkh^lM;lT;MJ)Y|eH%Zs$NX59W-8~BCAZ5f)0$gfrm%zX5JE)RDi zox^^f72&Ib;(FGmO&T+%0zVhv#qZ@rAD&#F693Z5e%Nfyb6k7SWWNuosNW2%8-G>A zgV*B2w|yt)-zdK-wQG79C22SWBSh*8wkHb-2`Se*n2d3KHkcHDD`4$V23=NMLtvBn?U8(>CBn+{wkbw8Tz|Q*c4gZ&a!2+5Yjudv6Mf%kN2z`e?la8?>J)g@qnVVOKm|ZV6L*-awxPs~ zfeu51z3MRFNr8*PojCv9>3TH>Ta#QBft`g5aJI5n5tjBhnr)rR_(Q6??}Pb8#U=1B Pl*LfjM5p|=Q}llWi%qS6