+
+);
+
export const useOnMouseLeaveDropdownMenu = () => {
const { updateIsOpenedDropdownMenu } = useStore_IsOpenedDropdownMenu();
@@ -29,7 +37,6 @@ export const useOnMouseLeaveDropdownMenu = () => {
export const DropdownMenuContainer = (props) => {
const { onMouseLeaveFunction } = useOnMouseLeaveDropdownMenu();
-
return (
-
+
+export const CheckboxContainer = (props) => (
+
+);
-export const EntryContainer = (props) => {
- return (
-
+
+);
-export const SwitchBoxContainer = (props) => {
- return (
-
-
- );
-};
+export const ActionButtonContainer = (props) => (
+
-
- );
-};
-
-export const RadioButtonContainer = (props) => {
- return (
-
-
- );
-};
-
-export const DeeplAuthKeyContainer = (props) => {
- return (
-
-
);
};
@@ -311,4 +319,21 @@ const OtherControls = ({settings, onchangeFunction, ui_configs}) => {
+export const WordFilterContainer = (props) => (
+
+
+
+);
-export const ActionButtonContainer = (props) => {
- return (
-
+
- );
-};
+
+
+
-
- );
-};
-
-export const WordFilterContainer = (props) => {
- return (
-
-
- );
-};
-
-export const DownloadModelsContainer = (props) => {
- return (
-
-
-
-
-
-
-
-
-
- );
-};
\ No newline at end of file
+export const DownloadModelsContainer = (props) => (
+
+
+ );
};
\ No newline at end of file
diff --git a/src-ui/app/config_page/setting_section/setting_box/vr/Vr.module.scss b/src-ui/app/config_page/setting_section/setting_box/vr/Vr.module.scss
index ba202ee0..e32a0fb2 100644
--- a/src-ui/app/config_page/setting_section/setting_box/vr/Vr.module.scss
+++ b/src-ui/app/config_page/setting_section/setting_box/vr/Vr.module.scss
@@ -6,6 +6,7 @@
position: relative;
padding: 2rem;
width: 100%;
+ gap: 4rem;
}
.wrapper {
@@ -187,4 +188,12 @@
position: absolute;
font-size: 1.6rem;
width: 100%;
+}
+
+.common_container {
+ width: 100%;
+}
+
+.common_label {
+ font-size: 1.4rem;
}
\ No newline at end of file
diff --git a/src-ui/app/modal_controller/update_modal/UpdateModal.jsx b/src-ui/app/modal_controller/update_modal/UpdateModal.jsx
index e158a65f..37f2fe0f 100644
--- a/src-ui/app/modal_controller/update_modal/UpdateModal.jsx
+++ b/src-ui/app/modal_controller/update_modal/UpdateModal.jsx
@@ -2,18 +2,25 @@ import styles from "./UpdateModal.module.scss";
import { useTranslation } from "react-i18next";
import { useStore_OpenedQuickSetting } from "@store";
import { useUpdateSoftware } from "@logics_common";
+import { useIsSoftwareUpdating } from "@logics_common";
export const UpdateModal = () => {
const { t } = useTranslation();
const { updateOpenedQuickSetting } = useStore_OpenedQuickSetting();
const { updateSoftware } = useUpdateSoftware();
+ const { updateIsSoftwareUpdating } = useIsSoftwareUpdating();
+
+ const onClickUpdateSoftware = () => {
+ updateIsSoftwareUpdating(true);
+ updateSoftware();
+ };
return (
{t("main_page.confirmation_message.update_software")}
-
+
+
+ );
+};
\ No newline at end of file
diff --git a/src-ui/app/updating_component/UpdatingComponent.module.scss b/src-ui/app/updating_component/UpdatingComponent.module.scss
new file mode 100644
index 00000000..87d7e39f
--- /dev/null
+++ b/src-ui/app/updating_component/UpdatingComponent.module.scss
@@ -0,0 +1,52 @@
+.container {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-direction: column;
+ gap: 4rem;
+ position: relative;
+}
+
+.label {
+ position: absolute;
+ top: 60%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ font-size: 2rem;
+}
+
+.circular_box {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+}
+
+.chato_box {
+ position: relative;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+}
+
+.chato_img {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ width: 4.8rem;
+ animation: infinite-rotation 20s linear infinite 0.5s;
+}
+@keyframes infinite-rotation {
+ from {
+ transform: translate(-50%, -50%) rotate(0deg);
+ }
+ to {
+ transform: translate(-50%, -50%) rotate(360deg);
+ }
+}
\ No newline at end of file
diff --git a/src-ui/logics/common/index.js b/src-ui/logics/common/index.js
index 33ef2251..8f1cd737 100644
--- a/src-ui/logics/common/index.js
+++ b/src-ui/logics/common/index.js
@@ -4,6 +4,7 @@ export { useIsBackendReady } from "./useIsBackendReady";
export { useWindow } from "./useWindow";
export { useIsOpenedConfigPage } from "./useIsOpenedConfigPage";
export { useIsSoftwareUpdateAvailable } from "./useIsSoftwareUpdateAvailable";
+export { useIsSoftwareUpdating } from "./useIsSoftwareUpdating";
export { useOpenFolder } from "./useOpenFolder";
export { useMessage } from "./useMessage";
export { useUpdateSoftware } from "./useUpdateSoftware";
diff --git a/src-ui/logics/common/useIsSoftwareUpdating.js b/src-ui/logics/common/useIsSoftwareUpdating.js
new file mode 100644
index 00000000..04507514
--- /dev/null
+++ b/src-ui/logics/common/useIsSoftwareUpdating.js
@@ -0,0 +1,10 @@
+import { useStore_IsSoftwareUpdating } from "@store";
+
+export const useIsSoftwareUpdating = () => {
+ const { currentIsSoftwareUpdating, updateIsSoftwareUpdating } = useStore_IsSoftwareUpdating();
+
+ return {
+ currentIsSoftwareUpdating,
+ updateIsSoftwareUpdating,
+ };
+};
\ No newline at end of file
diff --git a/src-ui/logics/common/useWindow.js b/src-ui/logics/common/useWindow.js
index 1ca764eb..7d04fd74 100644
--- a/src-ui/logics/common/useWindow.js
+++ b/src-ui/logics/common/useWindow.js
@@ -1,8 +1,14 @@
-import { useStdoutToPython } from "@logics/useStdoutToPython";
import { useEffect } from "react";
import { appWindow, currentMonitor, availableMonitors, LogicalPosition, LogicalSize } from "@tauri-apps/api/window";
+import { useStdoutToPython } from "@logics/useStdoutToPython";
+import { useStore_IsBreakPoint } from "@store";
+import { useUiScaling } from "@logics_configs";
+
export const useWindow = () => {
const { asyncStdoutToPython } = useStdoutToPython();
+ const { currentUiScaling } = useUiScaling();
+ const { updateIsBreakPoint } = useStore_IsBreakPoint();
+
const asyncGetWindowGeometry = async () => {
try {
const position = await appWindow.outerPosition();
@@ -82,13 +88,23 @@ export const useWindow = () => {
}
};
+ const asyncUpdateBreakPoint = async () => {
+ const size = await appWindow.innerSize();
+ const dynamicBreakPoint = 800 * (currentUiScaling.data / 100);
+ updateIsBreakPoint(size.width <= dynamicBreakPoint);
+ };
const WindowGeometryController = () => {
useEffect(() => {
let resizeTimeout;
+ const asyncFunction = () => {
+ asyncSaveWindowGeometry();
+ asyncUpdateBreakPoint();
+ };
+
const unlistenResize = appWindow.onResized(() => {
clearTimeout(resizeTimeout);
- resizeTimeout = setTimeout(asyncSaveWindowGeometry, 200);
+ resizeTimeout = setTimeout(asyncFunction, 200);
});
return () => {
@@ -115,5 +131,6 @@ export const useWindow = () => {
WindowGeometryController,
asyncSaveWindowGeometry,
restoreWindowGeometry,
+ asyncUpdateBreakPoint,
};
};
diff --git a/src-ui/logics/configs/index.js b/src-ui/logics/configs/index.js
index c38eda18..aff6b450 100644
--- a/src-ui/logics/configs/index.js
+++ b/src-ui/logics/configs/index.js
@@ -47,6 +47,7 @@ export { useSelectedCTranslate2ComputeDevice } from "./translation/useSelectedCT
export { useIsEnabledOverlaySmallLog } from "./vr/useIsEnabledOverlaySmallLog";
export { useOverlaySmallLogSettings } from "./vr/useOverlaySmallLogSettings";
export { useIsEnabledOverlayLargeLog } from "./vr/useIsEnabledOverlayLargeLog";
+export { useOverlayShowOnlyTranslatedMessages } from "./vr/useOverlayShowOnlyTranslatedMessages";
export { useOverlayLargeLogSettings } from "./vr/useOverlayLargeLogSettings";
export { useOscIpAddress } from "./advanced_settings/useOscIpAddress";
diff --git a/src-ui/logics/configs/vr/useOverlayShowOnlyTranslatedMessages.js b/src-ui/logics/configs/vr/useOverlayShowOnlyTranslatedMessages.js
new file mode 100644
index 00000000..895581ae
--- /dev/null
+++ b/src-ui/logics/configs/vr/useOverlayShowOnlyTranslatedMessages.js
@@ -0,0 +1,28 @@
+import { useStore_OverlayShowOnlyTranslatedMessages } from "@store";
+import { useStdoutToPython } from "@logics/useStdoutToPython";
+
+export const useOverlayShowOnlyTranslatedMessages = () => {
+ const { asyncStdoutToPython } = useStdoutToPython();
+ const { currentOverlayShowOnlyTranslatedMessages, updateOverlayShowOnlyTranslatedMessages, pendingOverlayShowOnlyTranslatedMessages } = useStore_OverlayShowOnlyTranslatedMessages();
+
+ const getOverlayShowOnlyTranslatedMessages = () => {
+ pendingOverlayShowOnlyTranslatedMessages();
+ asyncStdoutToPython("/get/data/overlay_show_only_translated_messages");
+ };
+
+ const toggleOverlayShowOnlyTranslatedMessages = () => {
+ pendingOverlayShowOnlyTranslatedMessages();
+ if (currentOverlayShowOnlyTranslatedMessages.data) {
+ asyncStdoutToPython("/set/disable/overlay_show_only_translated_messages");
+ } else {
+ asyncStdoutToPython("/set/enable/overlay_show_only_translated_messages");
+ }
+ };
+
+ return {
+ currentOverlayShowOnlyTranslatedMessages,
+ getOverlayShowOnlyTranslatedMessages,
+ updateOverlayShowOnlyTranslatedMessages,
+ toggleOverlayShowOnlyTranslatedMessages,
+ };
+};
\ No newline at end of file
diff --git a/src-ui/logics/useReceiveRoutes.js b/src-ui/logics/useReceiveRoutes.js
index f09c55e6..748b5061 100644
--- a/src-ui/logics/useReceiveRoutes.js
+++ b/src-ui/logics/useReceiveRoutes.js
@@ -64,6 +64,7 @@ import {
useOverlaySmallLogSettings,
useIsEnabledOverlayLargeLog,
useOverlayLargeLogSettings,
+ useOverlayShowOnlyTranslatedMessages,
useOscIpAddress,
useOscPort,
} from "@logics_configs";
@@ -161,6 +162,7 @@ export const useReceiveRoutes = () => {
const { updateIsEnabledOverlaySmallLog } = useIsEnabledOverlaySmallLog();
const { updateOverlayLargeLogSettings } = useOverlayLargeLogSettings();
const { updateIsEnabledOverlayLargeLog } = useIsEnabledOverlayLargeLog();
+ const { updateOverlayShowOnlyTranslatedMessages } = useOverlayShowOnlyTranslatedMessages();
const { updateOscIpAddress } = useOscIpAddress();
const { updateOscPort } = useOscPort();
@@ -414,6 +416,10 @@ export const useReceiveRoutes = () => {
"/get/data/overlay_large_log_settings": updateOverlayLargeLogSettings,
"/set/data/overlay_large_log_settings": updateOverlayLargeLogSettings,
+ "/get/data/overlay_show_only_translated_messages": updateOverlayShowOnlyTranslatedMessages,
+ "/set/enable/overlay_show_only_translated_messages": updateOverlayShowOnlyTranslatedMessages,
+ "/set/disable/overlay_show_only_translated_messages": updateOverlayShowOnlyTranslatedMessages,
+
// Others Tab
"/get/data/auto_clear_message_box": updateEnableAutoClearMessageInputBox,
"/set/enable/auto_clear_message_box": updateEnableAutoClearMessageInputBox,
diff --git a/src-ui/store.js b/src-ui/store.js
index bdbd17ec..cf63e236 100644
--- a/src-ui/store.js
+++ b/src-ui/store.js
@@ -113,6 +113,8 @@ export const { atomInstance: Atom_MainFunctionsStateMemory, useHook: useStore_Ma
export const { atomInstance: Atom_OpenedQuickSetting, useHook: useStore_OpenedQuickSetting } = createAtomWithHook("", "OpenedQuickSetting");
export const { atomInstance: Atom_IsSoftwareUpdateAvailable, useHook: useStore_IsSoftwareUpdateAvailable } = createAtomWithHook(false, "IsSoftwareUpdateAvailable");
export const { atomInstance: Atom_InitProgress, useHook: useStore_InitProgress } = createAtomWithHook(0, "InitProgress");
+export const { atomInstance: Atom_IsBreakPoint, useHook: useStore_IsBreakPoint } = createAtomWithHook(false, "IsBreakPoint");
+export const { atomInstance: Atom_IsSoftwareUpdating, useHook: useStore_IsSoftwareUpdating } = createAtomWithHook(false, "IsSoftwareUpdating");
// Main Page
// Functions
@@ -242,6 +244,7 @@ export const { atomInstance: Atom_OverlayLargeLogSettings, useHook: useStore_Ove
tracker: "HMD",
}, "OverlayLargeLogSettings");
export const { atomInstance: Atom_IsEnabledOverlayLargeLog, useHook: useStore_IsEnabledOverlayLargeLog } = createAtomWithHook(false, "IsEnabledOverlayLargeLog");
+export const { atomInstance: Atom_OverlayShowOnlyTranslatedMessages, useHook: useStore_OverlayShowOnlyTranslatedMessages } = createAtomWithHook(false, "OverlayShowOnlyTranslatedMessages");
// Others
export const { atomInstance: Atom_EnableAutoClearMessageInputBox, useHook: useStore_EnableAutoClearMessageInputBox } = createAtomWithHook(true, "EnableAutoClearMessageInputBox");
+ 
+
+
+
+ {t("main_page.confirmation_message.updating")}
+