From 56936d0285d93018eb68fc2581dac4291619244f Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Sat, 26 Apr 2025 19:41:28 +0900 Subject: [PATCH] [Update] Plugins -> AdvancedSettings. Move to AdvancedSettings because the plugin just only one is available and it's for specific user, actually. so put it to AdvancedSettings for now. --- locales/en.yml | 3 +- locales/ja.yml | 3 +- .../setting_box/SettingBox.jsx | 6 ++-- .../advanced_settings/AdvancedSettings.jsx | 29 ++++++++++++++----- .../AdvancedSettings.module.scss | 21 ++------------ .../plugins/Plugins.jsx | 2 +- .../plugins/Plugins.module.scss | 0 .../setting_section/setting_box/index.js | 2 +- .../sidebar_section/SidebarSection.jsx | 2 +- 9 files changed, 34 insertions(+), 34 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 a72200cb..cdefbfe5 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -244,6 +244,7 @@ config_page: label: "Open Config File" switch_compute_device: label: "Switch VRCT To CPU/GPU Version" + section_label_plugins: Plugins plugin_notifications: downloading: Downloading the plugin. @@ -254,7 +255,7 @@ plugin_notifications: updated_success: Updated successfully. updated_error: Update failed. - disabled_out_of_support: THe plugin has been disabled. It's not supported on this VRCT version. + disabled_out_of_support: The plugin has been disabled. It's not supported on this VRCT version. is_enabled: The plugin has enabled. is_disabled: The plugin has disabled. \ No newline at end of file diff --git a/locales/ja.yml b/locales/ja.yml index 188c5325..e4c40eb5 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -243,4 +243,5 @@ config_page: open_config_filepath: label: "設定ファイルを開く" switch_compute_device: - label: "VRCT CPU/GPUバージョンの切り替え" \ No newline at end of file + label: "VRCT CPU/GPUバージョンの切り替え" + section_label_plugins: プラグイン \ No newline at end of file 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 b149da0d..9fc67c13 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 b96c7fa9..206ed7ca 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,6 +2,8 @@ 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, @@ -10,22 +12,35 @@ import { import { ActionButtonContainer, - EntryContainer, 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/advanced_settings/AdvancedSettings.module.scss b/src-ui/app/config_page/setting_section/setting_box/advanced_settings/AdvancedSettings.module.scss index fa5eefb3..a49fed11 100644 --- a/src-ui/app/config_page/setting_section/setting_box/advanced_settings/AdvancedSettings.module.scss +++ b/src-ui/app/config_page/setting_section/setting_box/advanced_settings/AdvancedSettings.module.scss @@ -1,22 +1,5 @@ .container { display: flex; - width: 100%; - justify-content: space-between; - align-items: center; - padding: 2rem; - align-items: center; - gap: 2rem; - &.flex_column { - flex-direction: column; - } - border-bottom: solid 0.1rem var(--dark_800_color); -} - -.switch_section_container { - display: flex; - width: 100%; - justify-content: space-between; - align-items: center; - align-items: center; - gap: 2rem; + gap: 6.4rem; + flex-direction: column; } \ No newline at end of file diff --git a/src-ui/app/config_page/setting_section/setting_box/plugins/Plugins.jsx b/src-ui/app/config_page/setting_section/setting_box/advanced_settings/plugins/Plugins.jsx similarity index 95% rename from src-ui/app/config_page/setting_section/setting_box/plugins/Plugins.jsx rename to src-ui/app/config_page/setting_section/setting_box/advanced_settings/plugins/Plugins.jsx index d0715698..850e83dd 100644 --- a/src-ui/app/config_page/setting_section/setting_box/plugins/Plugins.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/advanced_settings/plugins/Plugins.jsx @@ -2,7 +2,7 @@ import { useEffect, useRef } 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"; export const Plugins = () => { diff --git a/src-ui/app/config_page/setting_section/setting_box/plugins/Plugins.module.scss b/src-ui/app/config_page/setting_section/setting_box/advanced_settings/plugins/Plugins.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/plugins/Plugins.module.scss rename to src-ui/app/config_page/setting_section/setting_box/advanced_settings/plugins/Plugins.module.scss 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 abb876ae..80cfca10 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/sidebar_section/SidebarSection.jsx b/src-ui/app/config_page/sidebar_section/SidebarSection.jsx index e1691ce9..f845a733 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 = () => { - + {/* */}