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 = () => {
- {/* */}
+
diff --git a/src-ui/app/main_page/main_section/top_bar/right_side_components/RightSideComponents.jsx b/src-ui/app/main_page/main_section/top_bar/right_side_components/RightSideComponents.jsx
index 1917d523..7bd3ae59 100644
--- a/src-ui/app/main_page/main_section/top_bar/right_side_components/RightSideComponents.jsx
+++ b/src-ui/app/main_page/main_section/top_bar/right_side_components/RightSideComponents.jsx
@@ -9,8 +9,11 @@ import { useIsEnabledOverlaySmallLog, useIsEnabledOverlayLargeLog, useEnableVrcM
import { OpenQuickSettingButton } from "./_buttons/OpenQuickSettingButton";
export const RightSideComponents = () => {
+
return (
+
+
@@ -46,6 +49,21 @@ const OpenOverlayQuickSetting = () => {
/>
);
};
+const PluginsQuickSetting = () => {
+ const { t } = useTranslation();
+ const { updateOpenedQuickSetting } = useStore_OpenedQuickSetting();
+
+ const onClickFunction = () => {
+ updateOpenedQuickSetting("plugins");
+ };
+
+ return (
+
+ );
+};
const OpenVrcMicMuteSyncQuickSetting = () => {
const { t } = useTranslation();
diff --git a/src-ui/app/main_page/main_section/top_bar/right_side_components/_buttons/OpenQuickSettingButton.jsx b/src-ui/app/main_page/main_section/top_bar/right_side_components/_buttons/OpenQuickSettingButton.jsx
index d23eae2c..abc779e3 100644
--- a/src-ui/app/main_page/main_section/top_bar/right_side_components/_buttons/OpenQuickSettingButton.jsx
+++ b/src-ui/app/main_page/main_section/top_bar/right_side_components/_buttons/OpenQuickSettingButton.jsx
@@ -4,14 +4,22 @@ import styles from "./OpenQuickSettingButton.module.scss";
export const OpenQuickSettingButton = (props) => {
const { t } = useTranslation();
+ const variable = (typeof props.variable === "boolean") ? props.variable : null;
return (
{props.label}
- {props.variable === true
- ?
{t("main_page.state_text_enabled")}
- :
{t("main_page.state_text_disabled")}
- }
+ {variable !== null && (
+ props.variable === true ? (
+
+ {t("main_page.state_text_enabled")}
+
+ ) : (
+
+ {t("main_page.state_text_disabled")}
+
+ )
+ )}
);
diff --git a/src-ui/app/main_page/main_section/top_bar/right_side_components/_buttons/OpenQuickSettingButton.module.scss b/src-ui/app/main_page/main_section/top_bar/right_side_components/_buttons/OpenQuickSettingButton.module.scss
index 2b542209..d46cbee0 100644
--- a/src-ui/app/main_page/main_section/top_bar/right_side_components/_buttons/OpenQuickSettingButton.module.scss
+++ b/src-ui/app/main_page/main_section/top_bar/right_side_components/_buttons/OpenQuickSettingButton.module.scss
@@ -1,14 +1,15 @@
.container {
- // height: 100%;
+ height: 100%;
}
.button_wrapper {
+ height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 0.2rem;
- padding: 0.6rem 0.4rem;
+ padding: 0 0.8rem;
border-radius: 0.2rem;
cursor: pointer;
&:hover {
diff --git a/src-ui/app/modal_controller/ModalController.jsx b/src-ui/app/modal_controller/ModalController.jsx
index 022d1271..edfd1d55 100644
--- a/src-ui/app/modal_controller/ModalController.jsx
+++ b/src-ui/app/modal_controller/ModalController.jsx
@@ -1,6 +1,6 @@
import styles from "./ModalController.module.scss";
import { useStore_OpenedQuickSetting } from "@store";
-import { Vr, VrcMicMuteSyncContainer } from "@setting_box";
+import { Vr, VrcMicMuteSyncContainer, Plugins } from "@setting_box";
import { UpdateModal } from "./update_modal/UpdateModal";
export const ModalController = () => {
@@ -20,10 +20,12 @@ const QuickSettingsController = () => {
const { currentOpenedQuickSetting, updateOpenedQuickSetting } = useStore_OpenedQuickSetting();
switch (currentOpenedQuickSetting.data) {
- case "overlay":
- return
;
+ case "plugins":
+ return
;
case "vrc_mic_mute_sync":
return
;
+ case "overlay":
+ return
;
case "update_software":
return
;
default: