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

Merge branch 'ui_init_configs' into for_webui

Browse Source
This commit is contained in:
Sakamoto Shiina
2024-11-06 00:25:42 +09:00
parent 834d5886ab 1acb0a9565
commit 7648ebe493
8 changed files with 52 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src-python/webui_mainloop.py
View File

@@ -98,7 +98,7 @@ mapping = {
# Appearance # Appearance
"/get/data/version": {"status": True, "variable":controller.getVersion}, "/get/data/version": {"status": True, "variable":controller.getVersion},
"/get/data/transparency_range": {"status": True, "variable":controller.getTransparencyRange}, # "/get/data/transparency_range": {"status": True, "variable":controller.getTransparencyRange},
"/get/data/transparency": {"status": True, "variable":controller.getTransparency}, "/get/data/transparency": {"status": True, "variable":controller.getTransparency},
"/set/data/transparency": {"status": True, "variable":controller.setTransparency}, "/set/data/transparency": {"status": True, "variable":controller.setTransparency},
@@ -106,15 +106,15 @@ mapping = {
# "/get/data/appearance_theme": {"status": True, "variable":controller.getAppearanceTheme}, # "/get/data/appearance_theme": {"status": True, "variable":controller.getAppearanceTheme},
# "/set/data/appearance_theme": {"status": True, "variable":controller.setAppearanceTheme}, # "/set/data/appearance_theme": {"status": True, "variable":controller.setAppearanceTheme},
"/get/data/ui_scaling_range": {"status": True, "variable":controller.getUiScalingRange}, # "/get/data/ui_scaling_range": {"status": True, "variable":controller.getUiScalingRange},
"/get/data/ui_scaling": {"status": True, "variable":controller.getUiScaling}, "/get/data/ui_scaling": {"status": True, "variable":controller.getUiScaling},
"/set/data/ui_scaling": {"status": True, "variable":controller.setUiScaling}, "/set/data/ui_scaling": {"status": True, "variable":controller.setUiScaling},
"/get/data/textbox_ui_scaling_range": {"status": True, "variable":controller.getTextboxUiScalingRange}, # "/get/data/textbox_ui_scaling_range": {"status": True, "variable":controller.getTextboxUiScalingRange},
"/get/data/textbox_ui_scaling": {"status": True, "variable":controller.getTextboxUiScaling}, "/get/data/textbox_ui_scaling": {"status": True, "variable":controller.getTextboxUiScaling},
"/set/data/textbox_ui_scaling": {"status": True, "variable":controller.setTextboxUiScaling}, "/set/data/textbox_ui_scaling": {"status": True, "variable":controller.setTextboxUiScaling},
"/get/data/message_box_ratio_range": {"status": True, "variable":controller.getMessageBoxRatioRange}, # "/get/data/message_box_ratio_range": {"status": True, "variable":controller.getMessageBoxRatioRange},
"/get/data/message_box_ratio": {"status": True, "variable":controller.getMessageBoxRatio}, "/get/data/message_box_ratio": {"status": True, "variable":controller.getMessageBoxRatio},
"/set/data/message_box_ratio": {"status": True, "variable":controller.setMessageBoxRatio}, "/set/data/message_box_ratio": {"status": True, "variable":controller.setMessageBoxRatio},
@@ -124,9 +124,9 @@ mapping = {
"/get/data/ui_language": {"status": True, "variable":controller.getUiLanguage}, "/get/data/ui_language": {"status": True, "variable":controller.getUiLanguage},
"/set/data/ui_language": {"status": True, "variable":controller.setUiLanguage}, "/set/data/ui_language": {"status": True, "variable":controller.setUiLanguage},
"/get/data/restore_main_window_geometry": {"status": True, "variable":controller.getRestoreMainWindowGeometry}, # "/get/data/restore_main_window_geometry": {"status": True, "variable":controller.getRestoreMainWindowGeometry},
"/set/enable/restore_main_window_geometry": {"status": True, "variable":controller.setEnableRestoreMainWindowGeometry}, # "/set/enable/restore_main_window_geometry": {"status": True, "variable":controller.setEnableRestoreMainWindowGeometry},
"/set/disable/restore_main_window_geometry": {"status": True, "variable":controller.setDisableRestoreMainWindowGeometry}, # "/set/disable/restore_main_window_geometry": {"status": True, "variable":controller.setDisableRestoreMainWindowGeometry},
"/get/data/main_window_geometry": {"status": True, "variable":controller.getMainWindowGeometry}, "/get/data/main_window_geometry": {"status": True, "variable":controller.getMainWindowGeometry},
"/set/data/main_window_geometry": {"status": True, "variable":controller.setMainWindowGeometry}, "/set/data/main_window_geometry": {"status": True, "variable":controller.setMainWindowGeometry},
@@ -160,8 +160,8 @@ mapping = {
"/get/data/mic_device_list": {"status": True, "variable":controller.getMicDeviceList}, "/get/data/mic_device_list": {"status": True, "variable":controller.getMicDeviceList},
"/get/data/speaker_device_list": {"status": True, "variable":controller.getSpeakerDeviceList}, "/get/data/speaker_device_list": {"status": True, "variable":controller.getSpeakerDeviceList},
"/get/data/max_mic_threshold": {"status": True, "variable":controller.getMaxMicThreshold}, # "/get/data/max_mic_threshold": {"status": True, "variable":controller.getMaxMicThreshold},
"/get/data/max_speaker_threshold": {"status": True, "variable":controller.getMaxSpeakerThreshold}, # "/get/data/max_speaker_threshold": {"status": True, "variable":controller.getMaxSpeakerThreshold},
"/get/data/auto_mic_select": {"status": True, "variable":controller.getAutoMicSelect}, "/get/data/auto_mic_select": {"status": True, "variable":controller.getAutoMicSelect},
"/set/enable/auto_mic_select": {"status": True, "variable":controller.setEnableAutoMicSelect}, "/set/enable/auto_mic_select": {"status": True, "variable":controller.setEnableAutoMicSelect},
@@ -277,17 +277,17 @@ mapping = {
"/set/enable/send_message_to_vrc": {"status": True, "variable":controller.setEnableSendMessageToVrc}, "/set/enable/send_message_to_vrc": {"status": True, "variable":controller.setEnableSendMessageToVrc},
"/set/disable/send_message_to_vrc": {"status": True, "variable":controller.setDisableSendMessageToVrc}, "/set/disable/send_message_to_vrc": {"status": True, "variable":controller.setDisableSendMessageToVrc},
"/get/data/send_message_format": {"status": True, "variable":controller.getSendMessageFormat}, # "/get/data/send_message_format": {"status": True, "variable":controller.getSendMessageFormat},
"/set/data/send_message_format": {"status": True, "variable":controller.setSendMessageFormat}, # "/set/data/send_message_format": {"status": True, "variable":controller.setSendMessageFormat},
"/get/data/send_message_format_with_t": {"status": True, "variable":controller.getSendMessageFormatWithT}, # "/get/data/send_message_format_with_t": {"status": True, "variable":controller.getSendMessageFormatWithT},
"/set/data/send_message_format_with_t": {"status": True, "variable":controller.setSendMessageFormatWithT}, # "/set/data/send_message_format_with_t": {"status": True, "variable":controller.setSendMessageFormatWithT},
"/get/data/received_message_format": {"status": True, "variable":controller.getReceivedMessageFormat}, # "/get/data/received_message_format": {"status": True, "variable":controller.getReceivedMessageFormat},
"/set/data/received_message_format": {"status": True, "variable":controller.setReceivedMessageFormat}, # "/set/data/received_message_format": {"status": True, "variable":controller.setReceivedMessageFormat},
"/get/data/received_message_format_with_t": {"status": True, "variable":controller.getReceivedMessageFormatWithT}, # "/get/data/received_message_format_with_t": {"status": True, "variable":controller.getReceivedMessageFormatWithT},
"/set/data/received_message_format_with_t": {"status": True, "variable":controller.setReceivedMessageFormatWithT}, # "/set/data/received_message_format_with_t": {"status": True, "variable":controller.setReceivedMessageFormatWithT},
"/get/data/send_received_message_to_vrc": {"status": True, "variable":controller.getSendReceivedMessageToVrc}, "/get/data/send_received_message_to_vrc": {"status": True, "variable":controller.getSendReceivedMessageToVrc},
"/set/enable/send_received_message_to_vrc": {"status": True, "variable":controller.setEnableSendReceivedMessageToVrc}, "/set/enable/send_received_message_to_vrc": {"status": True, "variable":controller.setEnableSendReceivedMessageToVrc},

9
src-ui/app/config_page/setting_section/setting_box/appearance/Appearance.jsx
View File

@@ -2,6 +2,7 @@ import clsx from "clsx";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import styles from "./Appearance.module.scss"; import styles from "./Appearance.module.scss";
import { ui_configs } from "@ui_configs";
import { useStore_SelectableFontFamilyList } from "@store"; import { useStore_SelectableFontFamilyList } from "@store";
import { import {
useUiLanguage, useUiLanguage,
@@ -38,12 +39,6 @@ export const Appearance = () => {
const UiLanguageContainer = () => { const UiLanguageContainer = () => {
const { t } = useTranslation(); const { t } = useTranslation();
const { currentUiLanguage, setUiLanguage } = useUiLanguage(); const { currentUiLanguage, setUiLanguage } = useUiLanguage();
const SELECTABLE_UI_LANGUAGES_DICT = {
en: "English",
ja: "日本語",
ko: "한국어",
"zh-Hant": "繁體中文",
};
const is_not_en_lang = currentUiLanguage.data !== "en" && currentUiLanguage.data !== undefined; const is_not_en_lang = currentUiLanguage.data !== "en" && currentUiLanguage.data !== undefined;
return ( return (
@@ -60,7 +55,7 @@ const UiLanguageContainer = () => {
</div> </div>
<div className={styles.ui_language_selector_container}> <div className={styles.ui_language_selector_container}>
{currentUiLanguage.state === "pending" && <span className={styles.loader}></span>} {currentUiLanguage.state === "pending" && <span className={styles.loader}></span>}
{Object.entries(SELECTABLE_UI_LANGUAGES_DICT).map(([key, value]) => ( {Object.entries(ui_configs.selectable_ui_languages).map(([key, value]) => (
<label key={key} className={clsx(styles.radio_button_wrapper, { [styles.is_selected]: currentUiLanguage.data === key } )}> <label key={key} className={clsx(styles.radio_button_wrapper, { [styles.is_selected]: currentUiLanguage.data === key } )}>
<input <input
className={styles.radio_button_input} className={styles.radio_button_input}

9
src-ui/app/config_page/setting_section/setting_box/device/Device.jsx
View File

@@ -1,5 +1,6 @@
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import styles from "./Device.module.scss"; import styles from "./Device.module.scss";
import { ui_configs } from "@ui_configs";
import { import {
useEnableAutoMicSelect, useEnableAutoMicSelect,
useMicHostList, useMicHostList,
@@ -120,8 +121,8 @@ const Mic_Container = () => {
<div className={styles.threshold_section}> <div className={styles.threshold_section}>
<ThresholdComponent <ThresholdComponent
id="mic_threshold" id="mic_threshold"
min="0" min={ui_configs.mic_threshold_min}
max="2000" max={ui_configs.mic_threshold_max}
/> />
</div> </div>
</div> </div>
@@ -197,8 +198,8 @@ const Speaker_Container = () => {
<div className={styles.threshold_section}> <div className={styles.threshold_section}>
<ThresholdComponent <ThresholdComponent
id="speaker_threshold" id="speaker_threshold"
min="0" min={ui_configs.speaker_threshold_min}
max="4000" max={ui_configs.speaker_threshold_max}
/> />
</div> </div>
</div> </div>

2
src-ui/logics/useReceiveRoutes.js
View File

@@ -1,4 +1,4 @@
import { translator_status } from "@data"; import { translator_status } from "@ui_configs";
import { arrayToObject } from "@utils/arrayToObject"; import { arrayToObject } from "@utils/arrayToObject";
import { import {

6
src-ui/store.js
View File

@@ -5,9 +5,11 @@ import {
} from "jotai"; } from "jotai";
import { import {
translator_status,
generateTestData, generateTestData,
} from "@data"; } from "@test_data";
import {
translator_status,
} from "@ui_configs";
export const store = { export const store = {
backend_subprocess: null, backend_subprocess: null,

21
src-ui/ui_configs.js Normal file
View File

@@ -0,0 +1,21 @@
export const translator_status = [
{ translator_id: "DeepL", translator_name: "DeepL", is_available: false },
{ translator_id: "DeepL_API", translator_name: `DeepL\nAPI`, is_available: false },
{ translator_id: "Google", translator_name: "Google", is_available: false },
{ translator_id: "Bing", translator_name: "Bing", is_available: false },
{ translator_id: "Papago", translator_name: "Papago", is_available: false },
{ translator_id: "CTranslate2", translator_name: `Internal\n(Default)`, is_available: false },
];
export const ui_configs = {
mic_threshold_min: 0,
mic_threshold_max: 2000,
speaker_threshold_min: 0,
speaker_threshold_max: 4000,
selectable_ui_languages: {
en: "English",
ja: "日本語",
ko: "한국어",
"zh-Hant": "繁體中文",
}
};

10
data.js → test_data.js
View File

@@ -1,13 +1,3 @@
export const translator_status = [
{ translator_id: "DeepL", translator_name: "DeepL", is_available: false },
{ translator_id: "DeepL_API", translator_name: `DeepL\nAPI`, is_available: false },
{ translator_id: "Google", translator_name: "Google", is_available: false },
{ translator_id: "Bing", translator_name: "Bing", is_available: false },
{ translator_id: "Papago", translator_name: "Papago", is_available: false },
{ translator_id: "CTranslate2", translator_name: `Internal\n(Default)`, is_available: false },
];
export const generateTestData = (num) => { export const generateTestData = (num) => {
const testDataArray = []; const testDataArray = [];
const messagesJa = [ const messagesJa = [

3
vite.config.js
View File

@@ -33,8 +33,9 @@ export default defineConfig(async () => ({
resolve: { resolve: {
alias: { alias: {
"@root": path.resolve(__dirname), "@root": path.resolve(__dirname),
"@data": path.resolve(__dirname, "./data.js"), "@test_data": path.resolve(__dirname, "./test_data.js"),
"@ui_configs": path.resolve(__dirname, "src-ui/ui_configs.js"),
"@scss_mixins": path.resolve(__dirname, "src-ui/utils/mixins.scss"), "@scss_mixins": path.resolve(__dirname, "src-ui/utils/mixins.scss"),
"@store": path.resolve(__dirname, "src-ui/store.js"), "@store": path.resolve(__dirname, "src-ui/store.js"),
"@images": path.resolve(__dirname, "src-ui/assets"), "@images": path.resolve(__dirname, "src-ui/assets"),