every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'plugins' into develop

Browse Source
This commit is contained in:
Sakamoto Shiina
2025-05-11 16:59:15 +09:00
parent bdf59a9932 83686f3073
commit 0d1a59a5ce
12 changed files with 67 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
locales/en.yml
View File

@@ -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.

23
locales/ja.yml
View File

@@ -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: プラグインのダウンロードが完了しました。

6
src-ui/app/config_page/setting_section/setting_box/SettingBox.jsx
View File

@@ -9,7 +9,7 @@ import {
AdvancedSettings,
Vr,
Hotkeys,
// Plugins,
Plugins,
Supporters,
AboutVrct,
} from "@setting_box";
@@ -33,8 +33,8 @@ export const SettingBox = () => {
return <Hotkeys />;
case "advanced_settings":
return <AdvancedSettings />;
// case "plugins":
// return <Plugins />;
case "plugins":
return <Plugins />;
case "supporters":
return <Supporters />;
case "about_vrct":

15
src-ui/app/config_page/setting_section/setting_box/advanced_settings/AdvancedSettings.jsx
View File

@@ -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 (
<div className={styles.container}>
<div>
<OscIpAddressContainer />
<OscPortContainer />
<OpenConfigFolderContainer />
<OpenSwitchComputeDeviceModalContainer />
</div>
<div>
<SectionLabelComponent label={t("config_page.advanced_settings.section_label_plugins")} />
<Plugins />
</div>
</div>
);
};

2
src-ui/app/config_page/setting_section/setting_box/index.js
View File

@@ -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";

2
src-ui/app/config_page/setting_section/setting_box/advanced_settings/plugins/Plugins.jsx → src-ui/app/config_page/setting_section/setting_box/plugins/Plugins.jsx
View File

@@ -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";

0
src-ui/app/config_page/setting_section/setting_box/advanced_settings/plugins/Plugins.module.scss → src-ui/app/config_page/setting_section/setting_box/plugins/Plugins.module.scss
View File

2
src-ui/app/config_page/sidebar_section/SidebarSection.jsx
View File

@@ -12,7 +12,7 @@ export const SidebarSection = () => {
<Tab tab_id="vr" />
<Tab tab_id="others" />
<Tab tab_id="hotkeys" />
{/* <Tab tab_id="plugins" /> */}
<Tab tab_id="plugins" />
<Tab tab_id="advanced_settings" />
</div>
<div className={styles.separated_tabs_wrapper}>

18
src-ui/app/main_page/main_section/top_bar/right_side_components/RightSideComponents.jsx
View File

@@ -9,8 +9,11 @@ import { useIsEnabledOverlaySmallLog, useIsEnabledOverlayLargeLog, useEnableVrcM
import { OpenQuickSettingButton } from "./_buttons/OpenQuickSettingButton";
export const RightSideComponents = () => {
return (
<div className={styles.container}>
<PluginsQuickSetting />
<OpenVrcMicMuteSyncQuickSetting />
<OpenOverlayQuickSetting />
<SoftwareUpdateAvailableButton />
@@ -46,6 +49,21 @@ const OpenOverlayQuickSetting = () => {
/>
);
};
const PluginsQuickSetting = () => {
const { t } = useTranslation();
const { updateOpenedQuickSetting } = useStore_OpenedQuickSetting();
const onClickFunction = () => {
updateOpenedQuickSetting("plugins");
};
return (
<OpenQuickSettingButton
label={t("config_page.side_menu_labels.plugins")}
onClickFunction={onClickFunction}
/>
);
};
const OpenVrcMicMuteSyncQuickSetting = () => {
const { t } = useTranslation();

16
src-ui/app/main_page/main_section/top_bar/right_side_components/_buttons/OpenQuickSettingButton.jsx
View File

@@ -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 (
<div className={styles.container}>
<div className={styles.button_wrapper} onClick={props.onClickFunction}>
<p className={styles.button_label}>{props.label}</p>
{props.variable === true
? <p className={clsx(styles.button_indicator_label, styles.enabled)}>{t("main_page.state_text_enabled")}</p>
: <p className={clsx(styles.button_indicator_label, styles.disabled)}>{t("main_page.state_text_disabled")}</p>
}
{variable !== null && (
props.variable === true ? (
<p className={clsx(styles.button_indicator_label, styles.enabled)}>
{t("main_page.state_text_enabled")}
</p>
) : (
<p className={clsx(styles.button_indicator_label, styles.disabled)}>
{t("main_page.state_text_disabled")}
</p>
)
)}
</div>
</div>
);

5
src-ui/app/main_page/main_section/top_bar/right_side_components/_buttons/OpenQuickSettingButton.module.scss
View File

@@ -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 {

8
src-ui/app/modal_controller/ModalController.jsx
View File

@@ -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 <Vr />;
case "plugins":
return <Plugins />;
case "vrc_mic_mute_sync":
return <VrcMicMuteSyncContainer />;
case "overlay":
return <Vr />;
case "update_software":
return <UpdateModal />;
default: