From 8ea7fb05c0af25fded2f3cbe5b160f4fc2b2ae2c Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Sun, 11 May 2025 16:25:02 +0900 Subject: [PATCH] [Update] Config Page: Move and add plugin section from AdvancedSettings. --- locales/en.yml | 22 +++++++++--------- locales/ja.yml | 23 ++++++++++--------- .../setting_box/SettingBox.jsx | 6 ++--- .../advanced_settings/AdvancedSettings.jsx | 15 ------------ .../setting_section/setting_box/index.js | 2 +- .../plugins/Plugins.jsx | 2 +- .../plugins/Plugins.module.scss | 0 .../sidebar_section/SidebarSection.jsx | 2 +- 8 files changed, 29 insertions(+), 43 deletions(-) rename src-ui/app/config_page/setting_section/setting_box/{advanced_settings => }/plugins/Plugins.jsx (95%) rename src-ui/app/config_page/setting_section/setting_box/{advanced_settings => }/plugins/Plugins.module.scss (100%) diff --git a/locales/en.yml b/locales/en.yml index f72907ac..9c45be98 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -80,6 +80,7 @@ config_page: transcription: "Transcription" others: "Other" hotkeys: "Hotkeys" + plugins: "Plugins" advanced_settings: "Advanced Settings" device: @@ -235,17 +236,6 @@ config_page: toggle_transcription_receive: label: "Toggle {{transcription_receive}}" - advanced_settings: - osc_ip_address: - label: "OSC IP Address" - osc_port: - label: "OSC Port" - open_config_filepath: - label: "Open Config File" - switch_compute_device: - label: "Switch VRCT To CPU/GPU Version" - section_label_plugins: Plugins # Exception, It'll be moved later. - plugins: downloaded_version: "Downloaded version: {{downloaded_version}}" latest_version: "Latest version: {{latest_version}}" @@ -258,6 +248,16 @@ config_page: available_in_latest_vrct_version: "Available in the latest VRCT version" unavailable_not_downloaded: "Currently unavailable" + advanced_settings: + osc_ip_address: + label: "OSC IP Address" + osc_port: + label: "OSC Port" + open_config_filepath: + label: "Open Config File" + switch_compute_device: + label: "Switch VRCT To CPU/GPU Version" + plugin_notifications: downloading: Downloading the plugin. downloaded_success: Downloaded successfully. diff --git a/locales/ja.yml b/locales/ja.yml index 3d109b8a..8241d324 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -80,6 +80,7 @@ config_page: transcription: "音声認識" others: "その他" hotkeys: "ホットキー" + plugins: "プラグイン" advanced_settings: "高度な設定" device: @@ -235,17 +236,6 @@ config_page: toggle_transcription_receive: label: "「{{transcription_receive}}」 オン/オフの切り替え" - advanced_settings: - osc_ip_address: - label: "OSC IP Address" - osc_port: - label: "OSC Port" - open_config_filepath: - label: "設定ファイルを開く" - switch_compute_device: - label: "VRCT CPU/GPUバージョンの切り替え" - section_label_plugins: プラグイン # Exception, It'll be moved later. - plugins: downloaded_version: "ダウンロード済バージョン: {{downloaded_version}}" latest_version: "最新バージョン: {{latest_version}}" @@ -258,6 +248,17 @@ config_page: available_in_latest_vrct_version: VRCT最新版で利用可能 unavailable_not_downloaded: 現在利用不可 + advanced_settings: + osc_ip_address: + label: "OSC IP Address" + osc_port: + label: "OSC Port" + open_config_filepath: + label: "設定ファイルを開く" + switch_compute_device: + label: "VRCT CPU/GPUバージョンの切り替え" + + plugin_notifications: downloading: プラグインをダウンロード中。 downloaded_success: プラグインのダウンロードが完了しました。 diff --git a/src-ui/app/config_page/setting_section/setting_box/SettingBox.jsx b/src-ui/app/config_page/setting_section/setting_box/SettingBox.jsx index 9fc67c13..b149da0d 100644 --- a/src-ui/app/config_page/setting_section/setting_box/SettingBox.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/SettingBox.jsx @@ -9,7 +9,7 @@ import { AdvancedSettings, Vr, Hotkeys, - // Plugins, + Plugins, Supporters, AboutVrct, } from "@setting_box"; @@ -33,8 +33,8 @@ export const SettingBox = () => { return ; case "advanced_settings": return ; - // case "plugins": - // return ; + case "plugins": + return ; case "supporters": return ; case "about_vrct": diff --git a/src-ui/app/config_page/setting_section/setting_box/advanced_settings/AdvancedSettings.jsx b/src-ui/app/config_page/setting_section/setting_box/advanced_settings/AdvancedSettings.jsx index 206ed7ca..7d96cda5 100644 --- a/src-ui/app/config_page/setting_section/setting_box/advanced_settings/AdvancedSettings.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/advanced_settings/AdvancedSettings.jsx @@ -2,8 +2,6 @@ import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import styles from "./AdvancedSettings.module.scss"; -import { Plugins } from "./plugins/Plugins"; - import { useOpenFolder } from "@logics_common"; import { useOscIpAddress, @@ -15,31 +13,18 @@ import { EntryWithSaveButtonContainer, } from "../_templates/Templates"; -import { - SectionLabelComponent, -} from "../_components/"; - - import OpenFolderSvg from "@images/open_folder.svg?react"; import HelpSvg from "@images/help.svg?react"; export const AdvancedSettings = () => { - const { t } = useTranslation(); - return (
-
- -
- - -
); }; diff --git a/src-ui/app/config_page/setting_section/setting_box/index.js b/src-ui/app/config_page/setting_section/setting_box/index.js index 80cfca10..abb876ae 100644 --- a/src-ui/app/config_page/setting_section/setting_box/index.js +++ b/src-ui/app/config_page/setting_section/setting_box/index.js @@ -6,6 +6,6 @@ export { Others, VrcMicMuteSyncContainer } from "./others/Others"; export { AdvancedSettings } from "./advanced_settings/AdvancedSettings"; export { Vr } from "./vr/Vr"; export { Hotkeys } from "./hotkeys/Hotkeys"; -// export { Plugins } from "./plugins/Plugins"; +export { Plugins } from "./plugins/Plugins"; export { AboutVrct } from "./about_vrct/AboutVrct"; export { Supporters } from "./supporters/Supporters"; \ No newline at end of file diff --git a/src-ui/app/config_page/setting_section/setting_box/advanced_settings/plugins/Plugins.jsx b/src-ui/app/config_page/setting_section/setting_box/plugins/Plugins.jsx similarity index 95% rename from src-ui/app/config_page/setting_section/setting_box/advanced_settings/plugins/Plugins.jsx rename to src-ui/app/config_page/setting_section/setting_box/plugins/Plugins.jsx index 2980ebab..0d7f8693 100644 --- a/src-ui/app/config_page/setting_section/setting_box/advanced_settings/plugins/Plugins.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/plugins/Plugins.jsx @@ -2,7 +2,7 @@ import { useEffect, useRef, useState, useCallback } from "react"; import { useTranslation } from "react-i18next"; import { usePlugins } from "@logics_configs"; import styles from "./Plugins.module.scss"; -import { PluginsControlComponent } from "../../_components/plugins_control_component/PluginsControlComponent"; +import { PluginsControlComponent } from "../_components/plugins_control_component/PluginsControlComponent"; import { useNotificationStatus } from "@logics_common"; import ExternalLink from "@images/external_link.svg?react"; diff --git a/src-ui/app/config_page/setting_section/setting_box/advanced_settings/plugins/Plugins.module.scss b/src-ui/app/config_page/setting_section/setting_box/plugins/Plugins.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/advanced_settings/plugins/Plugins.module.scss rename to src-ui/app/config_page/setting_section/setting_box/plugins/Plugins.module.scss diff --git a/src-ui/app/config_page/sidebar_section/SidebarSection.jsx b/src-ui/app/config_page/sidebar_section/SidebarSection.jsx index c2342aa2..341da4aa 100644 --- a/src-ui/app/config_page/sidebar_section/SidebarSection.jsx +++ b/src-ui/app/config_page/sidebar_section/SidebarSection.jsx @@ -12,7 +12,7 @@ export const SidebarSection = () => { - {/* */} +