-
- {l10n.getString('settings-general-interface-theme')}
-
-
-
-
-
-
-
-
-
-
+
+ {l10n
+ .getString('settings-general-steamvr-description')
+ .split('\n')
+ .map((line, i) => (
+
+ {line}
+
+ ))}
-
-
- {l10n.getString('settings-general-interface-lang')}
-
-
-
- {l10n.getString('settings-general-interface-lang-description')}
+
+
+
+
+
+
+
+
+ >
+
+ } id="mechanics">
+ <>
+
+ {l10n.getString('settings-general-tracker_mechanics')}
-
-
-
-
- >
-
-
+
+ {l10n.getString('settings-general-tracker_mechanics-filtering')}
+
+
+ {l10n
+ .getString(
+ 'settings-general-tracker_mechanics-filtering-description'
+ )
+ .split('\n')
+ .map((line, i) => (
+
+ {line}
+
+ ))}
+
+
+ {l10n.getString(
+ 'settings-general-tracker_mechanics-filtering-type'
+ )}
+
+
+
+
+
+
+
+ percentageFormat.format(value)}
+ min={0.1}
+ max={1.0}
+ step={0.1}
+ />
+
+
+
+ {l10n.getString(
+ 'settings-general-tracker_mechanics-drift_compensation'
+ )}
+
+
+ {l10n
+ .getString(
+ 'settings-general-tracker_mechanics-drift_compensation-description'
+ )
+ .split('\n')
+ .map((line, i) => (
+
+ {line}
+
+ ))}
+
+
+
+ percentageFormat.format(value)}
+ min={0.1}
+ max={1.0}
+ step={0.1}
+ />
+
+
+
+
+ >
+
+
}
+ id="fksettings"
+ >
+ <>
+
+ {l10n.getString('settings-general-fk_settings')}
+
+
+
+ {l10n.getString(
+ 'settings-general-fk_settings-leg_tweak-skating_correction'
+ )}
+
+
+ {l10n.getString(
+ 'settings-general-fk_settings-leg_tweak-skating_correction-description'
+ )}
+
+
+
+
+ percentageFormat.format(value)}
+ min={0.1}
+ max={1.0}
+ step={0.1}
+ />
+
+
+
+
+ {l10n.getString('settings-general-fk_settings-leg_fk')}
+
+
+
+
+ {l10n.getString(
+ 'settings-general-fk_settings-leg_tweak-floor_clip-description'
+ )}
+
+
+
+
+
+
+
+ {l10n.getString(
+ 'settings-general-fk_settings-leg_tweak-foot_plant-description'
+ )}
+
+
+
+
+
+
+
+ {l10n.getString(
+ 'settings-general-fk_settings-leg_tweak-toe_snap-description'
+ )}
+
+
+
+
+
+
+
+
+ {l10n.getString('settings-general-fk_settings-arm_fk')}
+
+
+ {l10n.getString(
+ 'settings-general-fk_settings-arm_fk-description'
+ )}
+
+
+
+
+
+ {config?.debug && (
+ <>
+
+
+ {l10n.getString(
+ 'settings-general-fk_settings-skeleton_settings'
+ )}
+
+
+ {l10n.getString(
+ 'settings-general-fk_settings-skeleton_settings-description'
+ )}
+
+
+
+
+
+
+
+
+
+ {l10n.getString(
+ 'settings-general-fk_settings-vive_emulation-title'
+ )}
+
+
+ {l10n.getString(
+ 'settings-general-fk_settings-vive_emulation-description'
+ )}
+
+
+
+
+
+ >
+ )}
+ >
+
+
+
}
+ id="gestureControl"
+ >
+ <>
+
+ {l10n.getString('settings-general-gesture_control')}
+
+
+ {l10n.getString('settings-general-gesture_control-subtitle')}
+
+
+
+ {l10n.getString('settings-general-gesture_control-description')}
+
+
+
+
+
+
+
+
+ `${Math.round(value * 10) / 10} s`}
+ min={0.2}
+ max={3.0}
+ step={0.2}
+ />
+ `${Math.round(value * 10) / 10} s`}
+ min={0.2}
+ max={3.0}
+ step={0.2}
+ />
+ `${Math.round(value * 10) / 10} s`}
+ min={0.2}
+ max={3.0}
+ step={0.2}
+ />
+
+
+
+ l10n.getString('settings-general-gesture_control-taps', {
+ amount: Math.round(value),
+ })
+ }
+ min={2}
+ max={10}
+ step={1}
+ />
+
+ l10n.getString('settings-general-gesture_control-taps', {
+ amount: Math.round(value),
+ })
+ }
+ min={2}
+ max={10}
+ step={1}
+ />
+
+ l10n.getString('settings-general-gesture_control-taps', {
+ amount: Math.round(value),
+ })
+ }
+ min={2}
+ max={10}
+ step={1}
+ />
+
+ >
+
+
+
}
+ id="interface"
+ >
+ <>
+
+ {l10n.getString('settings-general-interface')}
+
+
+
+ {l10n.getString('settings-general-interface-dev_mode')}
+
+
+
+ {l10n.getString(
+ 'settings-general-interface-dev_mode-description'
+ )}
+
+
+
+
+
+
+
+ {l10n.getString('settings-general-interface-serial_detection')}
+
+
+
+ {l10n.getString(
+ 'settings-general-interface-serial_detection-description'
+ )}
+
+
+
+
+
+
+
+ {l10n.getString('settings-general-interface-feedback_sound')}
+
+
+
+ {l10n.getString(
+ 'settings-general-interface-feedback_sound-description'
+ )}
+
+
+
+
+
+
+ percentageFormat.format(value)}
+ min={0.1}
+ max={1.0}
+ step={0.1}
+ />
+
+
+
+ {l10n.getString('settings-general-interface-theme')}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {l10n.getString('settings-general-interface-lang')}
+
+
+
+ {l10n.getString('settings-general-interface-lang-description')}
+
+
+
+
+
+ >
+
+
+
);
}
diff --git a/gui/src/components/settings/pages/OSCRouterSettings.tsx b/gui/src/components/settings/pages/OSCRouterSettings.tsx
index 39a2f4685..b4fab07c0 100644
--- a/gui/src/components/settings/pages/OSCRouterSettings.tsx
+++ b/gui/src/components/settings/pages/OSCRouterSettings.tsx
@@ -1,7 +1,6 @@
import { Localized, useLocalization } from '@fluent/react';
-import { useEffect, useRef } from 'react';
+import { useEffect } from 'react';
import { useForm } from 'react-hook-form';
-import { useLocation } from 'react-router-dom';
import {
ChangeSettingsRequestT,
OSCRouterSettingsT,
@@ -15,7 +14,10 @@ import { CheckBox } from '../../commons/Checkbox';
import { RouterIcon } from '../../commons/icon/RouterIcon';
import { Input } from '../../commons/Input';
import { Typography } from '../../commons/Typography';
-import { SettingsPageLayout } from '../SettingsPageLayout';
+import {
+ SettingsPageLayout,
+ SettingsPagePaneLayout,
+} from '../SettingsPageLayout';
interface OSCRouterSettingsForm {
router: {
@@ -42,8 +44,6 @@ const defaultValues = {
export function OSCRouterSettings() {
const { l10n } = useLocalization();
const { sendRPCPacket, useRPCPacket } = useWebsocketAPI();
- const { state } = useLocation();
- const pageRef = useRef
(null);
const { reset, control, watch, handleSubmit } =
useForm({
@@ -96,125 +96,115 @@ export function OSCRouterSettings() {
reset(formData);
});
- // Handle scrolling to selected page
- useEffect(() => {
- const typedState: { scrollTo: string } = state as any;
- if (!pageRef.current || !typedState || !typedState.scrollTo) {
- return;
- }
- const elem = pageRef.current.querySelector(`#${typedState.scrollTo}`);
- if (elem) {
- elem.scrollIntoView({ behavior: 'smooth' });
- }
- }, [state]);
-
return (
-
+
+ >
+
+