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-python/config.py b/src-python/config.py index b4a248df..175ffa0f 100644 --- a/src-python/config.py +++ b/src-python/config.py @@ -956,7 +956,7 @@ class Config: def init_config(self): # Read Only - self._VERSION = "3.1.0" + self._VERSION = "3.1.1" if getattr(sys, 'frozen', False): self._PATH_LOCAL = os_path.dirname(sys.executable) else: diff --git a/src-ui/app/_app_controllers/CornerRadiusController.jsx b/src-ui/app/_app_controllers/CornerRadiusController.jsx index 1b84b9ad..b56d20c5 100644 --- a/src-ui/app/_app_controllers/CornerRadiusController.jsx +++ b/src-ui/app/_app_controllers/CornerRadiusController.jsx @@ -1,10 +1,12 @@ import { useState, useEffect } from "react"; -import { getCurrentWindow } from "@tauri-apps/api/window"; +import { store } from "@store"; export const CornerRadiusController = () => { const [is_win11, setIsWin11] = useState(false); const [is_maximized, setIsMaximized] = useState(false); + const appWindow = store.appWindow; + // OS 判定(Win11 なら platformVersion の major ≥13) useEffect(() => { if (navigator.userAgentData?.getHighEntropyValues) { @@ -27,12 +29,11 @@ export const CornerRadiusController = () => { useEffect(() => { let unlisten; const setup = async () => { - const window = await getCurrentWindow(); // 初期状態取得 - setIsMaximized(await window.isMaximized()); + setIsMaximized(await appWindow.isMaximized()); // リサイズ時にも再取得 - const updateMax = () => window.isMaximized().then(setIsMaximized); - unlisten = await window.listen("tauri://resize", updateMax); + const updateMax = () => appWindow.isMaximized().then(setIsMaximized); + unlisten = await appWindow.listen("tauri://resize", updateMax); } setup(); 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/error_boundary/AppErrorBoundary.jsx b/src-ui/app/error_boundary/AppErrorBoundary.jsx index 0cc5dfb2..4aeb34a2 100644 --- a/src-ui/app/error_boundary/AppErrorBoundary.jsx +++ b/src-ui/app/error_boundary/AppErrorBoundary.jsx @@ -1,5 +1,4 @@ import { useState } from "react"; -import { getCurrentWindow } from "@tauri-apps/api/window"; import { ErrorBoundary } from "react-error-boundary"; import XMarkSvg from "@images/cancel.svg?react"; import CopySvg from "@images/copy.svg?react"; @@ -7,6 +6,8 @@ import CheckMarkSvg from "@images/check_mark.svg?react"; import { ContactsContainer } from "./contacts_container/ContactsContainer"; +import { useWindow } from "@logics_common"; + import styles from "./AppErrorBoundary.module.scss"; export const AppErrorBoundary = ({children}) => { @@ -65,14 +66,9 @@ const ErrorContainer = ({error}) => { }; const CloseButtonContainer = () => { - - const asyncClose = async () => { - const appWindow = await getCurrentWindow(); - appWindow.close(); - }; - + const { asyncCloseApp } = useWindow(); return ( -