diff --git a/gui/app/public/i18n/en/translation.ftl b/gui/app/public/i18n/en/translation.ftl index 852ffbc1d..37f0b9cc8 100644 --- a/gui/app/public/i18n/en/translation.ftl +++ b/gui/app/public/i18n/en/translation.ftl @@ -429,7 +429,7 @@ mounting_selection_menu = Which way is this tracker facing? mounting_selection_menu-close = Close ## Sidebar settings -settings-sidebar-title = Settings +settings-advanced_section = Advanced settings settings-sidebar-general = General settings-sidebar-outputs = Outputs settings-sidebar-routing = Bone Routing @@ -446,7 +446,6 @@ settings-sidebar-serial = USB Serial Console settings-sidebar-appearance = Appearance settings-sidebar-home = Home Screen settings-sidebar-checklist = Tracking checklist -settings-sidebar-notifications = Notifications settings-sidebar-behavior = Behaviour settings-sidebar-firmware-tool = DIY Firmware Tool settings-sidebar-vrc_warnings = VRChat Config Warnings @@ -510,9 +509,10 @@ settings-routing-hands-warning-done = Route hands settings-driver = SteamVR / Monado settings-driver-description = Settings for the SlimeVR driver, used by SteamVR and Monado alike. +settings-driver-output_group = Output +settings-driver-data_group = Data sent settings-driver-enable = Enable settings-driver-enable-description = Send your trackers to and receive trackers from SteamVR or Monado through the SlimeVR driver. If this is off, they won't be able to connect to SlimeVR at all. -settings-driver-enable-label = Enable settings-driver-status-title = Status settings-driver-status-connection = Driver connection settings-driver-status-badge-connected = Connected @@ -531,13 +531,13 @@ settings-driver-velocity-description = Send linear and angular velocity data to ## Tracker mechanics settings-general-mounting_method = Mounting calibration method +settings-general-mounting_method-pose_only = Only used by pose mounting calibration. settings-general-mounting_method-description = What mounting calibration method to use to calibrate your trackers' mounting orientations. settings-general-tracker_mechanics-filtering = Filtering # This also cares about multilines settings-general-tracker_mechanics-filtering-description = Choose the filtering type for your trackers. Prediction predicts movement while smoothing smooths movement. -settings-general-tracker_mechanics-filtering-type = Filter type settings-general-tracker_mechanics-filtering-type-none = No filtering settings-general-tracker_mechanics-filtering-type-none-description = Use rotations as is. Will not do any filtering. settings-general-tracker_mechanics-filtering-type-smoothing = Smoothing @@ -545,30 +545,32 @@ settings-general-tracker_mechanics-filtering-type-smoothing-description = Smooth settings-general-tracker_mechanics-filtering-type-prediction = Prediction settings-general-tracker_mechanics-filtering-type-prediction-description = Reduces latency and makes movements more snappy, but may increase jitter. settings-general-tracker_mechanics-filtering-amount = Filter strength +settings-general-tracker_mechanics-filtering-amount-no_filtering = Pick a filtering type to set its strength. +settings-general-fk_settings-reset_behaviour_group = Reset behaviour settings-general-tracker_mechanics-yaw-reset-smooth-time = Yaw reset smooth time settings-general-tracker_mechanics-yaw-reset-smooth-time-description = Smooths the trackers' rotations upon doing a yaw reset. 0s disables smoothing. settings-general-tracker_mechanics-save_mounting_reset = Save automatic mounting calibration settings-general-tracker_mechanics-save_mounting_reset-description = Saves the automatic mounting calibration for the trackers between restarts. Useful when wearing a suit where trackers don't move between sessions. Not recommended for normal users! -settings-general-tracker_mechanics-save_mounting_reset-enabled-label = Save mounting calibration +settings-general-tracker_mechanics-magnetometer_group = Magnetometer +settings-general-tracker_mechanics-connection_group = Connection settings-general-tracker_mechanics-use_mag_on_all_trackers = Use magnetometer on all IMU trackers that support it settings-general-tracker_mechanics-use_mag_on_all_trackers-description = Uses magnetometer on all trackers that have a compatible firmware for it, reducing drift in stable magnetic environments. Can be disabled per tracker in the tracker's settings. Please don't shutdown any of the trackers while toggling this! -settings-general-tracker_mechanics-use_mag_on_all_trackers-label = Use magnetometer on trackers settings-general-tracker_mechanics-trackers_over_usb = Trackers over USB settings-general-tracker_mechanics-trackers_over_usb-description = Enables receiving HID tracker data over USB. Make sure connected trackers have connection over HID enabled! -settings-general-tracker_mechanics-trackers_over_usb-enabled-label = Allow HID trackers to connect directly over USB settings-general-tracker_mechanics-timeout_delay = Timeout delay settings-general-tracker_mechanics-timeout_delay-description = How long until a tracker is marked as '{ tracker-status-disconnected }' when the connection is lost. settings-stay_aligned-description = Stay Aligned reduces drift by gradually adjusting your trackers to match your relaxed poses. +settings-stay_aligned-setup_group = Setup settings-stay_aligned-setup-label = Setup Stay Aligned +settings-stay_aligned-setup-open = Open setup settings-stay_aligned-setup-description = You must complete "Setup Stay Aligned" to enable Stay Aligned. settings-stay_aligned-enabled-label = Enable Stay Aligned -settings-stay_aligned-general-label = General settings-stay_aligned-relaxed_poses-label = Relaxed Poses settings-stay_aligned-relaxed_poses-description = Stay Aligned uses your relaxed poses to keep the trackers aligned. Use "Setup Stay Aligned" to update these poses. settings-stay_aligned-relaxed_poses-standing = Adjust trackers while standing @@ -580,6 +582,7 @@ settings-stay_aligned-relaxed_poses-close = Close settings-stay_aligned-debug-label = Debugging settings-stay_aligned-debug-description = Please include your settings when reporting problems about Stay Aligned. settings-stay_aligned-debug-copy-label = Copy settings to clipboard +settings-stay_aligned-debug-copy-short = Copy ## Keybinds Page settings-keybinds = Keybind settings @@ -635,11 +638,11 @@ settings-general-fk_settings-leg_tweak-foot_plant-description = Foot-plant rotat settings-general-fk_settings-leg_fk = Leg tracking settings-general-fk_settings-leg_fk-reset_mounting_feet-v1 = Force feet mounting calibration settings-general-fk_settings-leg_fk-reset_mounting_feet-description-v1 = Force feet mounting calibration during body mounting calibration. +settings-general-fk_settings-constraints_group = Constraints settings-general-fk_settings-enforce_joint_constraints = Skeletal Limits -settings-general-fk_settings-enforce_joint_constraints-enforce_constraints = Enforce constraints settings-general-fk_settings-enforce_joint_constraints-enforce_constraints-description = Prevents joints from rotating past their limit +settings-general-fk_settings-position_group = Position tracking settings-general-fk_settings-ik = Position data -settings-general-fk_settings-ik-use_position = Use Position data settings-general-fk_settings-ik-use_position-description = Enables the use of position data from trackers that provide it. When enabling this make sure to full reset and recalibrate in game. settings-general-fk_settings-reset_settings-reset_reliable_reference_attitude = Reset HMD attitude settings-general-fk_settings-reset_settings-reset_reliable_reference_attitude-description = Reset a VR headset's vertical rotation upon doing a full reset. Useful when wearing one on the forehead for VTubing or mocap. Do not enable for VR. @@ -675,6 +678,13 @@ settings-general-gesture_control-trackers = { $amount -> [one] 1 tracker *[other] { $amount } trackers } +settings-general-gesture_control-column-reset = Reset +settings-general-gesture_control-column-tracker = Tracker +settings-general-gesture_control-column-taps = Taps +settings-general-gesture_control-column-delay = Delay +settings-general-gesture_control-yawReset-name = Yaw reset +settings-general-gesture_control-fullReset-name = Full reset +settings-general-gesture_control-mountingReset-name = Mounting calibration settings-general-gesture_control-yawResetEnabled = Enable tap to yaw reset settings-general-gesture_control-yawResetDelay = Yaw reset delay settings-general-gesture_control-yawResetTaps = Taps for yaw reset @@ -693,9 +703,11 @@ settings-general-gesture_control-numberTrackersOverThreshold-description = Incre ## Appearance settings settings-interface-appearance = Appearance +settings-interface-appearance-text_group = Text +settings-interface-appearance-language_group = Language +settings-utils-advanced-developer_group = Developer settings-general-interface-dev_mode = Developer Mode settings-general-interface-dev_mode-description = This mode can be useful if you need in-depth data or to interact with connected trackers on a more advanced level. -settings-general-interface-dev_mode-label = Developer Mode settings-general-interface-theme = Colour theme settings-general-interface-lang = Select language settings-general-interface-lang-description = Change the default language. @@ -718,29 +730,29 @@ settings-interface-appearance-font_size-description = This affects the font size ## Notification settings settings-general-interface-feedback_sound = Feedback sound settings-general-interface-feedback_sound-description = This option plays a sound when a reset is triggered. -settings-general-interface-feedback_sound-label = Feedback sound settings-general-interface-feedback_sound-volume = Feedback sound volume settings-general-interface-connected_trackers_warning = Connected trackers warning settings-general-interface-connected_trackers_warning-description = This option will show a pop-up every time you try exiting SlimeVR while having one or more connected trackers. It reminds you to turn off your trackers when you are done to preserve battery life. -settings-general-interface-connected_trackers_warning-label = Connected trackers warning on exit ## Behavior settings settings-interface-behavior = Behaviour +settings-interface-notifications = Notifications +settings-interface-behavior-desktop_group = Desktop +settings-interface-behavior-input_group = Input +settings-interface-behavior-privacy_group = Privacy settings-general-interface-dev_mode = Developer Mode settings-general-interface-dev_mode-description = This mode can be useful if you need in-depth data or need to interact with connected trackers on a more advanced level. -settings-general-interface-dev_mode-label = Developer Mode settings-general-interface-use_tray = Minimize to system tray settings-general-interface-use_tray-description = Lets you close the window without closing the SlimeVR Server so you can continue using it without having the GUI bother you. -settings-general-interface-use_tray-label = Minimize to system tray settings-general-interface-discord_presence = Share activity on Discord settings-general-interface-discord_presence-description = Tells your Discord client that you are using SlimeVR along with the number of IMU trackers you are using. -settings-general-interface-discord_presence-label = Share activity on Discord settings-general-interface-discord_presence-message = { $amount -> [0] Sliming around [one] Using 1 tracker *[other] Using { $amount } trackers } settings-interface-behavior-error_tracking = Error collection via Sentry.io +settings-interface-behavior-error_tracking-label = Send errors to developers settings-interface-behavior-error_tracking-description_v2 =

Do you consent to the collection of error and diagnostic data?

@@ -755,16 +767,16 @@ settings-interface-behavior-error_tracking-description_v2 = This data is linked to a random ID, not to your identity, and helps us detect bugs and issues with SlimeVR. It is collected via Sentry.io. -settings-interface-behavior-error_tracking-label = Send errors to developers settings-interface-behavior-bvh_directory = Directory to save BVH recordings settings-interface-behavior-bvh_directory-description = Choose a directory to save your BVH recordings instead of having to choose where to save them each time. settings-interface-behavior-bvh_directory-label = Directory for BVH recordings settings-interface-behavior-skeleton_mesh = Skeleton preview style settings-interface-behavior-skeleton_mesh-description = Draw the body preview with solid 3D shapes instead of simple lines. Turn this off on low-end machines. settings-interface-behavior-skeleton_mesh-label = Use 3D shapes +settings-interface-behavior-skeleton_mesh-lines = Lines +settings-interface-behavior-skeleton_mesh-mesh = 3D shapes settings-interface-behavior-controller_nav = Game controller navigation settings-interface-behavior-controller_nav-description = Move focus around the interface with a game controller: the D-pad or left stick move between controls, A activates, B goes back, only while a controller is connected. Holding Ctrl or Alt with the arrow keys always moves focus the same way. -settings-interface-behavior-controller_nav-label = Navigate with a controller ## Serial settings settings-serial = USB Serial Console @@ -809,9 +821,10 @@ settings-osc-vrchat-description-v1 = Change settings specific to VRChat OSC and the OSC Trackers standard used to send tracking data to applications without SteamVR (ex. Quest standalone). Make sure to enable OSC in VRChat via the Action Menu under OSC > Enabled. +settings-osc-vrchat-output_group = Output +settings-osc-vrchat-network_group = Network settings-osc-vrchat-enable = Enable settings-osc-vrchat-enable-description = Toggle the sending and receiving of data. -settings-osc-vrchat-enable-label = Enable settings-osc-vrchat-network = Network ports settings-osc-vrchat-network-port_in = .label = Port In @@ -850,8 +863,10 @@ settings-osc-vrchat-status-oscquery-searching = No VRChat clients found yet. settings-osc-vrchat-status-oscquery-discovered-title = Discovered VRChat clients: settings-osc-vrchat-status-oscquery-switch = Switch settings-osc-vrchat-status-network-mode = Network mode +settings-osc-vrchat-status-network-mode-auto = Automatic +settings-osc-vrchat-status-network-mode-manual = Manual +settings-osc-vrchat-status-network-mode-manual_only = Only used while the network mode is manual. settings-osc-vrchat-status-network-mode-description = Automatic mode discovers VRChat through OSCQuery. Manual mode uses the configured address and ports. -settings-osc-vrchat-status-network-mode-toggle = Manual network settings settings-osc-vrchat-status-network-manual-description = Configure the local input port and the VRChat OSC target manually. settings-osc-vrchat-status-badge-idle = Idle @@ -871,9 +886,10 @@ settings-osc-vmc = Virtual Motion Capture settings-osc-vmc-description = Change settings specific to the VMC (Virtual Motion Capture) protocol to send SlimeVR's bone data and receive bone data from other apps. +settings-osc-vmc-output_group = Output +settings-osc-vmc-network_group = Network settings-osc-vmc-enable = Enable settings-osc-vmc-enable-description = Toggle the sending and receiving of data. -settings-osc-vmc-enable-label = Enable settings-osc-vmc-network = Network ports settings-osc-vmc-network-description = Set the ports for listening and sending data via VMC. settings-osc-vmc-network-port_in = @@ -885,17 +901,15 @@ settings-osc-vmc-network-port_out = settings-osc-vmc-network-address = Network address settings-osc-vmc-network-address-description = Choose which address to send out data at via VMC. settings-osc-vmc-network-address-placeholder = IPV4 address +settings-osc-vmc-avatar_group = Avatar settings-osc-vmc-vrm = VRM Model settings-osc-vmc-vrm-description = Load a VRM model to use its own bone proportions and enable a higher compatibility with other applications. settings-osc-vmc-vrm-untitled_model = Untitled model settings-osc-vmc-vrm-file_select = Drag & drop a model to use, or browse settings-osc-vmc-anchor_hip = Anchor at hips settings-osc-vmc-anchor_hip-description = When enabled, the avatar stays pinned at its hips and only rotations are sent, useful for seated VTubing. When disabled, the avatar follows your head and moves around. -settings-osc-vmc-anchor_hip-label = Anchor at hips settings-osc-vmc-mirror_tracking = Mirror tracking settings-osc-vmc-mirror_tracking-description = Mirror the tracking horizontally. -settings-osc-vmc-mirror_tracking-label = Mirror tracking -settings-osc-vmc-status-title = Status settings-osc-vmc-status-input = Input settings-osc-vmc-status-output = Output settings-osc-vmc-status-vrm = VRM model @@ -911,6 +925,7 @@ settings-osc-vmc-status-output-last-frame = Last frame sent: {$elapsed}. settings-osc-vmc-status-output-no-frame = No frame sent yet. settings-osc-vmc-status-vrm-none = No model loaded, using estimated bone offsets. settings-osc-vmc-status-vrm-loaded = Model loaded, using its bone offsets. +settings-osc-vmc-status-title = Status settings-osc-vmc-status-badge-idle = Idle settings-osc-vmc-status-badge-listening = Listening settings-osc-vmc-status-badge-ready = Ready @@ -946,6 +961,7 @@ settings-utils-advanced-reset_warning = settings-utils-advanced-reset_warning-reset = Reset settings settings-utils-advanced-reset_warning-cancel = Cancel +settings-utils-advanced-folders_group = Folders settings-utils-advanced-open_data-v1 = Config folder settings-utils-advanced-open_data-description-v1 = Open SlimeVR's config folder in file explorer, containing the configuration settings-utils-advanced-open_data-label = Open folder @@ -962,6 +978,7 @@ settings-home-list-layout-table = Table settings-home-table_columns = Table columns settings-home-table_columns-desc = Choose which columns are shown in the trackers table +settings-home-display_group = Display settings-home-tracker_display = Tracker info settings-home-tracker_display-desc = Choose which extra details are shown on trackers settings-home-tracker_display-battery_voltage = Battery voltage diff --git a/gui/app/src/components/commons/BaseModal.tsx b/gui/app/src/components/commons/BaseModal.tsx index 80cbb5c5b..51ed9faba 100644 --- a/gui/app/src/components/commons/BaseModal.tsx +++ b/gui/app/src/components/commons/BaseModal.tsx @@ -58,7 +58,7 @@ export function BaseModal({ classNames( 'items-center focus:ring-transparent focus:ring-offset-transparent', 'focus:outline-transparent outline-none bg-background-60 p-6 rounded-lg m-2', - 'text-background-10', + 'text-background-10 text-standard', props.appendClasses ) } diff --git a/gui/app/src/components/commons/Checkbox.tsx b/gui/app/src/components/commons/Checkbox.tsx index ac2c705a4..4c04e24b8 100644 --- a/gui/app/src/components/commons/Checkbox.tsx +++ b/gui/app/src/components/commons/Checkbox.tsx @@ -16,6 +16,7 @@ export const CheckboxInternal = forwardRef< outlined?: boolean; loading?: boolean; name: string; + id?: string; } & Partial> >(function AppCheckbox( { @@ -28,6 +29,7 @@ export const CheckboxInternal = forwardRef< onChange, checked, name, + id, }, ref ) { @@ -85,6 +87,7 @@ export const CheckboxInternal = forwardRef< > ({ name, loading, disabled, + id, }: { - label: string; + label?: string; control: Control; name: FieldPath; + id?: string; variant?: 'checkbox' | 'toggle'; color?: 'primary' | 'secondary' | 'tertiary'; outlined?: boolean; @@ -146,6 +151,7 @@ export function CheckBox({ render={({ field: { onChange, value, ref, name } }) => ( { return (
); } diff --git a/gui/app/src/components/commons/SystemFileInput.tsx b/gui/app/src/components/commons/SystemFileInput.tsx index 3bc1a4476..d4b7e7de4 100644 --- a/gui/app/src/components/commons/SystemFileInput.tsx +++ b/gui/app/src/components/commons/SystemFileInput.tsx @@ -14,12 +14,14 @@ export function InnerSystemFileInput({ value, onChange, directory, + compact = false, refCallback: refCallback, }: { label: string; value: string | null; onChange: (...event: any[]) => void; directory: boolean; + compact?: boolean; refCallback: RefCallBack; }) { const electron = useElectron(); @@ -45,7 +47,12 @@ export function InnerSystemFileInput({ importedFileName: value, onClearPicker: () => onChange(null), }) - : FileInputContentBlank({ isDragging: false, label, directory })} + : FileInputContentBlank({ + isDragging: false, + label, + directory, + compact, + })}
); } @@ -56,6 +63,7 @@ export function SystemFileInput({ name, label, directory = false, + compact = false, }: { rules: UseControllerProps>['rules']; control: Control; @@ -65,6 +73,7 @@ export function SystemFileInput({ label: string; name: FieldPath; directory?: boolean; + compact?: boolean; disabled?: boolean; }) { return ( @@ -79,6 +88,7 @@ export function SystemFileInput({ onChange={onChange} refCallback={ref} directory={directory} + compact={compact} /> )} /> diff --git a/gui/app/src/components/settings/SettingRow.tsx b/gui/app/src/components/settings/SettingRow.tsx new file mode 100644 index 000000000..76751e9e2 --- /dev/null +++ b/gui/app/src/components/settings/SettingRow.tsx @@ -0,0 +1,157 @@ +import classNames from 'classnames'; +import { ReactNode } from 'react'; +import { Typography } from '@/components/commons/Typography'; +import { Tooltip } from '@/components/commons/Tooltip'; + +export function SettingsGroupLabel({ id }: { id: string }) { + return ( +
+ + {/* Tinted from the text colour so it shows on any surface it lands on. */} +
+
+ ); +} + +export function SettingRow({ + title, + description, + details, + control, + below, + controlId, + disabledReason, + controlWidth = 'auto', + disabled = false, + childrenDisabled = false, + children, +}: { + title: string; + description?: string; + details?: ReactNode; + control?: ReactNode; + below?: ReactNode; + controlId?: string; + disabledReason?: string; + controlWidth?: 'auto' | 'wide'; + disabled?: boolean; + childrenDisabled?: boolean; + children?: ReactNode; +}) { + const hasText = Boolean(description || details); + const band = ( + <> +
+ +
+ {hasText && ( +
+ {description && } + {details} +
+ )} + {control && ( +
+ {control} +
+ )} + + ); + const bandClasses = + 'grid grid-cols-[minmax(0,1fr)_auto] gap-x-6 gap-y-1 items-center'; + + return ( +
+ } + preferedDirection="top" + disabled={!disabled || !disabledReason} + > + {controlId ? ( + + ) : ( +
+ {band} +
+ )} +
+ {below &&
{below}
} + {children && ( +
+ {children} +
+ )} +
+ ); +} + +export function SettingsGroup({ + title, + description, + details, + children, +}: { + title?: string; + description?: string; + details?: ReactNode; + children?: ReactNode; +}) { + return ( +
+ {(title || description || details) && ( +
+ {title && } + {(description || details) && ( +
+ {description && } + {details} +
+ )} +
+ )} +
+ {children} +
+
+ ); +} + +export function SettingsAdvanced({ children }: { children?: ReactNode }) { + return ( +
+ + + +
{children}
+
+ ); +} diff --git a/gui/app/src/components/settings/SettingsLayout.tsx b/gui/app/src/components/settings/SettingsLayout.tsx index 1801c331c..a2305f74d 100644 --- a/gui/app/src/components/settings/SettingsLayout.tsx +++ b/gui/app/src/components/settings/SettingsLayout.tsx @@ -141,7 +141,7 @@ export function SettingsLayout({ children }: { children: ReactNode }) {
{isMobile && } {children} diff --git a/gui/app/src/components/settings/SettingsPagePaneLayout.tsx b/gui/app/src/components/settings/SettingsPagePaneLayout.tsx index d78f3eaf4..72804da13 100644 --- a/gui/app/src/components/settings/SettingsPagePaneLayout.tsx +++ b/gui/app/src/components/settings/SettingsPagePaneLayout.tsx @@ -1,27 +1,31 @@ import classNames from 'classnames'; import { ReactNode } from 'react'; +import { Typography } from '@/components/commons/Typography'; export function SettingsPagePaneLayout({ children, className, icon, + title, ...props }: { children: ReactNode; icon: ReactNode; + title?: string; } & React.HTMLAttributes) { return (
-
-
+
+
{icon}
+ {title && }
{children}
diff --git a/gui/app/src/components/settings/SettingsSidebar.tsx b/gui/app/src/components/settings/SettingsSidebar.tsx index 8702d059d..0256e29af 100644 --- a/gui/app/src/components/settings/SettingsSidebar.tsx +++ b/gui/app/src/components/settings/SettingsSidebar.tsx @@ -8,7 +8,7 @@ export function SettingsLink({ to, id }: { id: string; to: string }) { - classNames('pl-5 py-2 hover:bg-background-60 rounded-lg', { + classNames('pl-5 py-1.5 hover:bg-background-60 rounded-lg', { 'bg-background-60': isActive, }) } @@ -22,11 +22,10 @@ export function SettingsSidebar() { const { state: vrcConfigState } = useVRCConfig(); return ( -
- -
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- }> - <> - - {l10n.getString('settings-utils-advanced')} - + const resets = [ + { + id: 'gui', + title: 'settings-utils-advanced-reset-gui', + description: 'settings-utils-advanced-reset-gui-description', + label: 'settings-utils-advanced-reset-gui-label', + open: showWarningGUI, + setOpen: setShowWarningGUI, + accept: () => { + setConfig(guiDefaults()); + setShowWarningGUI(false); + }, + }, + { + id: 'server', + title: 'settings-utils-advanced-reset-server', + description: 'settings-utils-advanced-reset-server-description', + label: 'settings-utils-advanced-reset-server-label', + open: showWarningServer, + setOpen: setShowWarningServer, + accept: () => { + sendRPCPacket( + RpcMessage.SettingsResetRequest, + new SettingsResetRequestT() + ); + setShowWarningServer(false); + }, + }, + { + id: 'all', + title: 'settings-utils-advanced-reset-all', + description: 'settings-utils-advanced-reset-all-description', + label: 'settings-utils-advanced-reset-all-label', + open: showWarningAll, + setOpen: setShowWarningAll, + accept: () => { + sendRPCPacket( + RpcMessage.SettingsResetRequest, + new SettingsResetRequestT() + ); + setConfig(guiDefaults()); + setShowWarningAll(false); + }, + }, + ] as const; -
-
-
- - {l10n.getString('settings-general-interface-dev_mode')} - - - {l10n.getString( - 'settings-general-interface-dev_mode-description' - )} - -
-
+ return ( +
+ } + title="settings-utils-advanced" + > +
+ + + } + childrenDisabled={!config?.debug} + > +
+ {Object.entries(devToggles).map(([name, label]) => ( + } + label={l10n.getString(`widget-developer_mode-${label}`)} + /> + ))}
- {!!config?.debug && ( -
- {Object.entries(devToggles).map(([name, label]) => ( - } - label={l10n.getString(`widget-developer_mode-${label}`)} - /> - ))} -
+
+
+ + {electron.isElectron && ( + + + } + /> + + } + /> + + )} + +
+ + + +
+ +
+ + {resets.map( + ({ id, title, description, label, open, setOpen, accept }) => ( + +
- - {electron.isElectron && ( - <> -
-
- - {l10n.getString('settings-utils-advanced-open_data-v1')} - -
- - {l10n.getString( - 'settings-utils-advanced-open_data-description-v1' - )} - -
-
-
- -
-
-
-
- - {l10n.getString('settings-utils-advanced-open_logs')} - -
- - {l10n.getString( - 'settings-utils-advanced-open_logs-description' - )} - -
-
-
- -
-
- - )} - -
-
- - -
- -
-
- - {l10n.getString('settings-utils-advanced-reset-gui')} - -
- - {l10n.getString( - 'settings-utils-advanced-reset-gui-description' - )} - -
-
-
- - { - setConfig(guiDefaults()); - setShowWarningGUI(false); - }} - onClose={() => setShowWarningGUI(false)} - isOpen={showWarningGUI} - variant="gui" - /> -
-
- -
-
- - {l10n.getString('settings-utils-advanced-reset-server')} - -
- - {l10n.getString( - 'settings-utils-advanced-reset-server-description' - )} - -
-
-
- - { - sendRPCPacket( - RpcMessage.SettingsResetRequest, - new SettingsResetRequestT() - ); - setShowWarningServer(false); - }} - onClose={() => setShowWarningServer(false)} - isOpen={showWarningServer} - variant="server" - /> -
-
- -
-
- - {l10n.getString('settings-utils-advanced-reset-all')} - -
- - {l10n.getString( - 'settings-utils-advanced-reset-all-description' - )} - -
-
-
- - { - sendRPCPacket( - RpcMessage.SettingsResetRequest, - new SettingsResetRequestT() - ); - setConfig(guiDefaults()); - setShowWarningAll(false); - }} - onClose={() => setShowWarningAll(false)} - isOpen={showWarningAll} - variant="all" - /> -
-
-
-
- + + +
); diff --git a/gui/app/src/components/settings/pages/AppearanceSettings.tsx b/gui/app/src/components/settings/pages/AppearanceSettings.tsx index a5f9537ac..2b5d8b2e8 100644 --- a/gui/app/src/components/settings/pages/AppearanceSettings.tsx +++ b/gui/app/src/components/settings/pages/AppearanceSettings.tsx @@ -3,13 +3,14 @@ import { useEffect } from 'react'; import { useForm } from 'react-hook-form'; import { Typography } from '@/components/commons/Typography'; import { SettingsPagePaneLayout } from '@/components/settings/SettingsPagePaneLayout'; +import { SettingRow, SettingsGroup } from '@/components/settings/SettingRow'; import { defaultConfig, useConfig } from '@/hooks/config'; import { ThemeSelector } from '@/components/commons/ThemeSelector'; import { SquaresIcon } from '@/components/commons/icon/SquaresIcon'; import { useLocaleConfig } from '@/i18n/config'; import { LangSelector } from '@/components/commons/LangSelector'; import { Button } from '@/components/commons/Button'; -import { Range } from '@/components/commons/Range'; +import { NumberSelector } from '@/components/commons/NumberSelector'; import { Dropdown } from '@/components/commons/Dropdown'; import { useElectron } from '@/hooks/electron'; @@ -69,9 +70,22 @@ export function AppearanceSettings() { return () => subscription.unsubscribe(); }, [onSubmit]); + const themes = [ + { value: 'slime', colors: '!bg-slime' }, + { value: 'slime-green', colors: '!bg-slime-green' }, + { value: 'slime-yellow', colors: '!bg-slime-yellow' }, + { value: 'slime-orange', colors: '!bg-slime-orange' }, + { value: 'slime-red', colors: '!bg-slime-red' }, + { value: 'dark', colors: '!bg-dark' }, + { value: 'light', colors: '!bg-light' }, + { value: 'trans', colors: '!bg-trans-flag' }, + { value: 'asexual', colors: '!bg-asexual-flag' }, + { value: 'snep', colors: '!bg-snep' }, + ]; + return (
- }> - <> - - {l10n.getString('settings-interface-appearance')} - - -
- - {l10n.getString('settings-general-interface-theme')} - -
- - - - - - - - - - + } + title="settings-interface-appearance" + > +
+ +
+ {themes.map(({ value, colors }) => ( + + ))}
-
+ - - {l10n.getString('settings-interface-appearance-font')} - -
- - {l10n.getString('settings-interface-appearance-font-description')} - -
-
- ({ - label: ( - - {option.label} - - ), - value: option.value, - }))} - alignment="left" - /> -
- - - {l10n.getString('settings-interface-appearance-font_size')} - -
- - {l10n.getString( - 'settings-interface-appearance-font_size-description' - )} - -
-
- -
- - - {l10n.getString('settings-general-interface-lang')} - -
- - {l10n.getString('settings-general-interface-lang-description')} - -
-
- -
- - {electron.isElectron && ( - <> - -
- + ({ + label: ( + + {option.label} + + ), + value: option.value, + }))} + alignment="left" /> - {inContextFailed && ( - + `${Math.round(value)}pt`} + min={10} + max={15} + step={1} + /> + } + /> + + + + } + /> + {electron.isElectron && ( + + ) + } + control={ +
-
-
- - )} - + } + /> + )} + +
); diff --git a/gui/app/src/components/settings/pages/BehaviorSettings.tsx b/gui/app/src/components/settings/pages/BehaviorSettings.tsx index 6392212fe..9e4716b47 100644 --- a/gui/app/src/components/settings/pages/BehaviorSettings.tsx +++ b/gui/app/src/components/settings/pages/BehaviorSettings.tsx @@ -1,9 +1,10 @@ -import { Localized, useLocalization } from '@fluent/react'; +import { Localized } from '@fluent/react'; import { useEffect } from 'react'; import { useForm } from 'react-hook-form'; import { CheckBox, CheckboxInternal } from '@/components/commons/Checkbox'; import { Typography } from '@/components/commons/Typography'; import { SettingsPagePaneLayout } from '@/components/settings/SettingsPagePaneLayout'; +import { SettingRow, SettingsGroup } from '@/components/settings/SettingRow'; import { defaultConfig, useConfig } from '@/hooks/config'; import { ArrowRightLeftIcon } from '@/components/commons/icon/ArrowIcons'; import { NumberSelector } from '@/components/commons/NumberSelector'; @@ -31,7 +32,6 @@ interface BehaviorSettingsForm { export function BehaviorSettings() { const electron = useElectron(); - const { l10n } = useLocalization(); const { currentLocales } = useLocaleConfig(); const { config, setConfig } = useConfig(); const errorReporting = useErrorReporting(); @@ -82,205 +82,126 @@ export function BehaviorSettings() { return () => subscription.unsubscribe(); }, [onSubmit]); + const toggle = (name: keyof BehaviorSettingsForm) => ({ + controlId: `behavior-${name}`, + control: ( + + ), + }); + return ( -
- }> - <> - - {l10n.getString('settings-interface-behavior')} - -
- - {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-connected_trackers_warning' - )} - -
- - {l10n.getString( - 'settings-general-interface-connected_trackers_warning-description' - )} - -
-
- -
- - {electron.isElectron && ( - <> - - {l10n.getString('settings-general-interface-use_tray')} - -
- - {l10n.getString( - 'settings-general-interface-use_tray-description' - )} - -
-
- + } + title="settings-interface-behavior" + > +
+ + + percentageFormat.format(value)} + min={0.1} + max={1.0} + step={0.1} /> -
- - )} - - - {l10n.getString('settings-general-interface-discord_presence')} - -
- - {l10n.getString( - 'settings-general-interface-discord_presence-description' - )} - -
-
- -
- - - {l10n.getString('settings-interface-behavior-controller_nav')} - -
- - {l10n.getString( - 'settings-interface-behavior-controller_nav-description' - )} - -
-
- -
- - - {l10n.getString('settings-interface-behavior-error_tracking')} - -
- , - }} - > - - -
-
- - errorReporting.answer( - event.currentTarget.checked - ? ErrorReportingConsent.ALLOWED - : ErrorReportingConsent.DENIED - ) } /> -
+ + + + {electron.isElectron && ( - <> - - {l10n.getString('settings-interface-behavior-bvh_directory')} - -
- - - -
-
+ + )} + + {electron.isElectron && ( + -
- + } + /> )} -
- + + + + + + + + }} + > + + + } + controlId="behavior-error-reporting" + control={ + + errorReporting.answer( + event.currentTarget.checked + ? ErrorReportingConsent.ALLOWED + : ErrorReportingConsent.DENIED + ) + } + /> + } + /> + +
); diff --git a/gui/app/src/components/settings/pages/BoneRoutingSettings.tsx b/gui/app/src/components/settings/pages/BoneRoutingSettings.tsx index 75cac5ea4..3b8321876 100644 --- a/gui/app/src/components/settings/pages/BoneRoutingSettings.tsx +++ b/gui/app/src/components/settings/pages/BoneRoutingSettings.tsx @@ -36,6 +36,7 @@ import { } from '@/components/commons/StatusBadge'; import { Typography } from '@/components/commons/Typography'; import { SettingsPagePaneLayout } from '@/components/settings/SettingsPagePaneLayout'; +import { SettingsGroupLabel } from '@/components/settings/SettingRow'; import { ArrowDownIcon, ArrowUpIcon, @@ -521,9 +522,8 @@ export function BoneRoutingSettings() { setHandsWarning(null); }} /> - }> + } title="settings-routing"> <> -
- +
- -
+ +
{outputs.map((status) => ( - +
diff --git a/gui/app/src/components/settings/pages/ChecklistSettings.tsx b/gui/app/src/components/settings/pages/ChecklistSettings.tsx index 1f693375a..8c3ec29b6 100644 --- a/gui/app/src/components/settings/pages/ChecklistSettings.tsx +++ b/gui/app/src/components/settings/pages/ChecklistSettings.tsx @@ -1,12 +1,13 @@ -import { CheckIcon } from '@/components/commons/icon/CheckIcon'; -import { Typography } from '@/components/commons/Typography'; +import { Checklist } from '@/components/commons/icon/ChecklistIcon'; import { SettingsPagePaneLayout } from '@/components/settings/SettingsPagePaneLayout'; import { TrackingChecklistSettings } from './components/TrackingChecklistSettings'; export function ChecklistSettings() { return ( - }> - + } + title="tracking_checklist" + > ); diff --git a/gui/app/src/components/settings/pages/DriverSettings.tsx b/gui/app/src/components/settings/pages/DriverSettings.tsx index c530732ce..15c359cc0 100644 --- a/gui/app/src/components/settings/pages/DriverSettings.tsx +++ b/gui/app/src/components/settings/pages/DriverSettings.tsx @@ -1,4 +1,3 @@ -import { useLocalization } from '@fluent/react'; import { useEffect, useState } from 'react'; import { DefaultValues, useForm } from 'react-hook-form'; import { Button } from '@/components/commons/Button'; @@ -20,6 +19,12 @@ import { } from '@/components/commons/StatusBadge'; import { Typography } from '@/components/commons/Typography'; import { SettingsPagePaneLayout } from '@/components/settings/SettingsPagePaneLayout'; +import { + SettingRow, + SettingsAdvanced, + SettingsGroup, + SettingsGroupLabel, +} from '@/components/settings/SettingRow'; import { SteamIcon } from '@/components/commons/icon/SteamIcon'; type DriverForm = { @@ -68,10 +73,7 @@ function StatusCard({ status }: { status: DriverStatusChangeResponseT }) { /> } > - +
); @@ -84,7 +86,6 @@ export function DriverSettings() { const [status, setStatus] = useState( null ); - const { l10n } = useLocalization(); const { sendRPCPacket, useRPCPacket } = useWebsocketAPI(); const { control, watch, handleSubmit, getValues, reset } = @@ -138,61 +139,70 @@ export function DriverSettings() { ); return ( - }> - <> - SteamVR / Monado -
+ } + title="settings-sidebar-driver" + > +
+
- -
- -
-
- + + } /> -
+ + } + /> + {enabled && status && ( - <> - +
+
+ +
- +
)} - -
- -
-
-
- - -
- -
- - + + +
); } diff --git a/gui/app/src/components/settings/pages/HomeScreenSettings.tsx b/gui/app/src/components/settings/pages/HomeScreenSettings.tsx index 30932db6e..85b58a1aa 100644 --- a/gui/app/src/components/settings/pages/HomeScreenSettings.tsx +++ b/gui/app/src/components/settings/pages/HomeScreenSettings.tsx @@ -1,12 +1,10 @@ import { HomeIcon } from '@/components/commons/icon/HomeIcon'; -import { Typography } from '@/components/commons/Typography'; import { SettingsPagePaneLayout } from '@/components/settings/SettingsPagePaneLayout'; import { HomeLayoutSettings } from './components/HomeLayoutSettings'; export function HomeScreenSettings() { return ( - }> - + } title="home-settings"> ); diff --git a/gui/app/src/components/settings/pages/KeybindSettings.tsx b/gui/app/src/components/settings/pages/KeybindSettings.tsx index 43439d95a..f1f7fc391 100644 --- a/gui/app/src/components/settings/pages/KeybindSettings.tsx +++ b/gui/app/src/components/settings/pages/KeybindSettings.tsx @@ -1,6 +1,6 @@ import { KeybindRecorderModal } from '@/components/commons/KeybindRecorderModal'; import { SettingsPagePaneLayout } from '@/components/settings/SettingsPagePaneLayout'; -import { WrenchIcon } from '@/components/commons/icon/WrenchIcon'; +import { KeyboardIcon } from '@/components/commons/icon/KeyboardIcon'; import { WarningIcon } from '@/components/commons/icon/WarningIcon'; import { Typography } from '@/components/commons/Typography'; import { useLocalization } from '@fluent/react'; @@ -269,10 +269,12 @@ export function KeybindSettings() { }, [watch]); return ( - }> + } + title="settings-keybinds" + >
-
{l10n .getString('settings-keybinds-description') diff --git a/gui/app/src/components/settings/pages/ResetsSettings.tsx b/gui/app/src/components/settings/pages/ResetsSettings.tsx index fe45e3b9c..96e849211 100644 --- a/gui/app/src/components/settings/pages/ResetsSettings.tsx +++ b/gui/app/src/components/settings/pages/ResetsSettings.tsx @@ -10,6 +10,11 @@ import { Typography } from '@/components/commons/Typography'; import { MountingMethodRadio } from '@/components/mounting/MountingMethodRadio'; import { ArmsMountingResetMode, MountingMethod } from 'solarxr-protocol'; import { SettingsPagePaneLayout } from '@/components/settings/SettingsPagePaneLayout'; +import { + SettingRow, + SettingsAdvanced, + SettingsGroup, +} from '@/components/settings/SettingRow'; import { FullResetIcon } from '@/components/commons/icon/ResetIcon'; import { TapDetectionSettings } from './components/TapDetectionSettings'; @@ -72,171 +77,132 @@ export function ResetsSettings() { }, [settings]); return ( - }> -
- -
- -
- - - -
- - {isPoseMounting && ( - <> -
- - {l10n.getString( - 'settings-general-fk_settings-arms_mounting_reset_mode' - )} - - - - {l10n.getString( - 'settings-general-fk_settings-arms_mounting_reset_mode-description' - )} - - -
- - - -
-
- -
- - {l10n.getString( - 'settings-general-fk_settings-leg_fk-reset_mounting_feet-v1' - )} - - - - {l10n.getString( - 'settings-general-fk_settings-leg_fk-reset_mounting_feet-description-v1' - )} - - - -
- - )} - -
- - {l10n.getString( - 'settings-general-tracker_mechanics-yaw-reset-smooth-time' - )} - - - - {l10n.getString( - 'settings-general-tracker_mechanics-yaw-reset-smooth-time-description' - )} - - - secondsFormat.format(value)} - min={0.0} - max={0.5} - step={0.05} - /> -
- -
- - {l10n.getString( - 'settings-general-fk_settings-reset_settings-reset_reliable_reference_attitude' - )} - - - - {l10n.getString( - 'settings-general-fk_settings-reset_settings-reset_reliable_reference_attitude-description' - )} - - - -
- -
- - {l10n.getString( - 'settings-general-tracker_mechanics-save_mounting_reset' - )} - - - }} + } + title="settings-sidebar-resets" + > +
+ - - - - + +
+ {isPoseMounting && ( + <> + +
+ + + +
+
+ + } + /> + )} - /> -
+ - + + + + + secondsFormat.format(value)} + min={0.0} + max={0.5} + step={0.05} + /> + } + /> + + } + /> + }} + > + + + } + controlId="resets-save-mounting" + control={ + + } + /> + + +
); } diff --git a/gui/app/src/components/settings/pages/StayAlignedSettings.tsx b/gui/app/src/components/settings/pages/StayAlignedSettings.tsx index 5f859767b..17f32f90f 100644 --- a/gui/app/src/components/settings/pages/StayAlignedSettings.tsx +++ b/gui/app/src/components/settings/pages/StayAlignedSettings.tsx @@ -11,6 +11,11 @@ import { Button } from '@/components/commons/Button'; import { CheckBox } from '@/components/commons/Checkbox'; import { Typography } from '@/components/commons/Typography'; import { SettingsPagePaneLayout } from '@/components/settings/SettingsPagePaneLayout'; +import { + SettingRow, + SettingsAdvanced, + SettingsGroup, +} from '@/components/settings/SettingRow'; import { HorizontalAlignIcon } from '@/components/commons/icon/HorizontalAlignIcon'; import { useAtomValue, atom, useSetAtom } from 'jotai'; import { selectAtom } from 'jotai/utils'; @@ -110,8 +115,12 @@ ${trackers }; return ( - ); } @@ -119,7 +128,6 @@ ${trackers export function StayAlignedSettings() { const setSettings = useSetAtom(stayAlignedSettingsAtom); const settings = useAtomValue(stayAlignedSettingsValueAtom); - const { l10n } = useLocalization(); const { sendRPCPacket, useRPCPacket } = useWebsocketAPI(); const { control, watch, handleSubmit, getValues, reset } = @@ -207,126 +215,112 @@ export function StayAlignedSettings() { const openSitting = useState(false); const openFlat = useState(false); + const poses = [ + { + id: 'standing', + name: 'standingEnabled' as const, + hasPose: hasStandingPose, + open: openStanding, + modal: , + }, + { + id: 'sitting', + name: 'sittingEnabled' as const, + hasPose: hasSittingPose, + open: openSitting, + modal: , + }, + { + id: 'flat', + name: 'flatEnabled' as const, + hasPose: hasFlatPose, + open: openFlat, + modal: , + }, + ]; + return ( - }> - -
- - {l10n.getString('settings-stay_aligned-description')} - - - {l10n.getString('settings-stay_aligned-setup-description')} - -
- + } + title="settings-sidebar-stay_aligned" + > +
+
+ +
-
-
- - {l10n.getString('settings-stay_aligned-general-label')} - -
- + + } /> -
-
-
- - {l10n.getString('settings-stay_aligned-relaxed_poses-label')} - -
- - {l10n.getString('settings-stay_aligned-relaxed_poses-description')} - -
-
-
- - - -
-
- + + + + {poses.map(({ id, name, hasPose, open, modal }) => ( + + {modal} + +
+ } /> - - -
-
- + + + + } /> - - -
-
-
-
- - {l10n.getString('settings-stay_aligned-debug-label')} - -
- - {l10n.getString('settings-stay_aligned-debug-description')} - -
-
- -
+ +
); diff --git a/gui/app/src/components/settings/pages/TrackersSettings.tsx b/gui/app/src/components/settings/pages/TrackersSettings.tsx index c38af24f3..422a188f3 100644 --- a/gui/app/src/components/settings/pages/TrackersSettings.tsx +++ b/gui/app/src/components/settings/pages/TrackersSettings.tsx @@ -1,5 +1,8 @@ -import { Typography } from '@/components/commons/Typography'; import { SettingsPagePaneLayout } from '@/components/settings/SettingsPagePaneLayout'; +import { + SettingsAdvanced, + SettingsGroup, +} from '@/components/settings/SettingRow'; import { WrenchIcon } from '@/components/commons/icon/WrenchIcon'; import { MagnetometerToggleSetting } from './components/MagnetometerToggleSetting'; import { TimeoutSettings } from './components/TimeoutSettings'; @@ -7,14 +10,22 @@ import { HIDSettings } from './components/HIDSettings'; export function TrackersSettings() { return ( - }> -
- -
+ } + title="settings-sidebar-trackers" + > +
+ + + - - - + + + + + + +
); } diff --git a/gui/app/src/components/settings/pages/TrackingSettings.tsx b/gui/app/src/components/settings/pages/TrackingSettings.tsx index e1902a1c6..3e99424e8 100644 --- a/gui/app/src/components/settings/pages/TrackingSettings.tsx +++ b/gui/app/src/components/settings/pages/TrackingSettings.tsx @@ -1,6 +1,6 @@ import { useLocalization } from '@fluent/react'; import { useEffect } from 'react'; -import { DefaultValues, useForm } from 'react-hook-form'; +import { DefaultValues, FieldPath, useForm } from 'react-hook-form'; import { ChangeSkeletonSettingsRequestT, FilteringType, @@ -18,6 +18,11 @@ import { NumberSelector } from '@/components/commons/NumberSelector'; import { Radio } from '@/components/commons/Radio'; import { Typography } from '@/components/commons/Typography'; import { SettingsPagePaneLayout } from '@/components/settings/SettingsPagePaneLayout'; +import { + SettingRow, + SettingsAdvanced, + SettingsGroup, +} from '@/components/settings/SettingRow'; import { atom, useAtomValue, useSetAtom } from 'jotai'; import { isEqual } from '@react-hookz/deep-equal'; import { selectAtom } from 'jotai/utils'; @@ -182,19 +187,44 @@ export function TrackingSettings() { } ); + const filteringEnabled = watch('filtering.type') !== FilteringType.NONE; + const skatingCorrection = watch('toggles.skatingCorrection'); + + const stepper = (name: FieldPath, min = 0.0) => ({ + controlWidth: 'wide' as const, + control: ( + percentageFormat.format(value)} + min={min} + max={1.0} + step={0.05} + /> + ), + }); + + const toggle = (name: FieldPath) => ({ + controlId: `tracking-${name}`, + control: ( + + ), + }); + return ( - }> - <> - - -
- - {l10n.getString('settings-general-tracker_mechanics-filtering')} - -
- -
- {l10n + } + title="settings-sidebar-tracking" + > +
+ ( {line} ))} -
- - {l10n.getString('settings-general-tracker_mechanics-filtering-type')} - -
- - - -
-
- percentageFormat.format(value)} - min={0.0} - max={1.0} - step={0.05} - /> -
+ > +
+ + + +
+ {filteringEnabled && ( + + )} + -
- - {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-enforce_joint_constraints' - )} - - - {l10n.getString( - 'settings-general-fk_settings-enforce_joint_constraints-enforce_constraints-description' - )} - -
-
- -
+ + + + -
- - {l10n.getString('settings-general-fk_settings-ik')} - - - {l10n.getString( - 'settings-general-fk_settings-ik-use_position-description' - )} - -
-
- -
- -
- - {l10n.getString( - 'settings-general-fk_settings-self_localization-title' - )} - - - {l10n.getString( - 'settings-general-fk_settings-self_localization-description' - )} - -
-
- -
- -
- - {l10n.getString( - 'settings-general-fk_settings-skeleton_settings-ratios' - )} - - - {l10n.getString( - 'settings-general-fk_settings-skeleton_settings-ratios-description' - )} - -
-
- percentageFormat.format(value)} - min={0.0} - max={1.0} - step={0.05} - /> - percentageFormat.format(value)} - min={0.0} - max={1.0} - step={0.05} - /> - percentageFormat.format(value)} - min={0.0} - max={1.0} - step={0.05} - /> - percentageFormat.format(value)} - min={0.0} - max={1.0} - step={0.05} - /> -
- + + + + + + +
+
); } diff --git a/gui/app/src/components/settings/pages/VMCSettings.tsx b/gui/app/src/components/settings/pages/VMCSettings.tsx index f6e6e3e16..b9815b8f0 100644 --- a/gui/app/src/components/settings/pages/VMCSettings.tsx +++ b/gui/app/src/components/settings/pages/VMCSettings.tsx @@ -29,6 +29,12 @@ import { import { Typography } from '@/components/commons/Typography'; import { magic } from '@/utils/formatting'; import { SettingsPagePaneLayout } from '@/components/settings/SettingsPagePaneLayout'; +import { + SettingRow, + SettingsAdvanced, + SettingsGroup, + SettingsGroupLabel, +} from '@/components/settings/SettingRow'; import { error } from '@/utils/logging'; import { OSCPortsAddress, @@ -208,32 +214,22 @@ function StatusCard({ status }: { status: VMCOSCStatusChangeResponseT }) { } > {inputState === VMCOSCInputState.IDLE ? ( - + ) : ( <> {inputState === VMCOSCInputState.ERROR && status.inputError ? ( - - {status.inputError?.toString() ?? ''} - + {status.inputError?.toString() ?? ''} ) : lastInputElapsed ? ( ) : ( - + )} )} @@ -251,7 +247,6 @@ function StatusCard({ status }: { status: VMCOSCStatusChangeResponseT }) { {outputState === VMCOSCOutputState.IDLE ? ( status.targetAddress ? ( ) : ( - + ) ) : ( <> {outputState === VMCOSCOutputState.ERROR && status.outputError ? ( - - {status.outputError?.toString() ?? ''} - + {status.outputError?.toString() ?? ''} ) : lastFrameElapsed ? ( ) : ( - + )} )} @@ -308,12 +293,9 @@ function StatusCard({ status }: { status: VMCOSCStatusChangeResponseT }) { badge={} > {vrmState === VMCOSCVrmState.ERROR && status.vrmError ? ( - - {status.vrmError?.toString() ?? ''} - + {status.vrmError?.toString() ?? ''} ) : ( - }> - <> - Virtual Motion Capture -
- <> - {l10n - .getString('settings-osc-vmc-description') - .split('\n') - .map((line, i) => ( - {line} - ))} - +
+ } + title="settings-sidebar-osc_vmc" + > +
+
+ {l10n + .getString('settings-osc-vmc-description') + .split('\n') + .map((line, i) => ( + {line} + ))}
- - {l10n.getString('settings-osc-vmc-enable')} - -
- - {l10n.getString('settings-osc-vmc-enable-description')} - -
-
- + + } /> -
+ + } + /> + {enabled && status && ( - <> - +
+
+ +
- +
)} - -
- -
-
-
+ + } + /> + + } + /> + + } + /> + - - {l10n.getString('settings-osc-vmc-network')} - -
- <> - {l10n - .getString('settings-osc-vmc-network-description') - .split('\n') - .map((line, i) => ( - {line} - ))} - -
-
- - + + + {l10n + .getString('settings-osc-vmc-network-description') + .split('\n') + .map((line, i) => ( + {line} + ))} + + } + below={ +
+ + + + + + +
+ } /> -
- - + } /> - -
- - {l10n.getString('settings-osc-vmc-network-address')} - -
- - {l10n.getString('settings-osc-vmc-network-address-description')} - -
-
- -
- - {l10n.getString('settings-osc-vmc-vrm')} - -
- - {l10n.getString('settings-osc-vmc-vrm-description')} - -
-
- -
- - {l10n.getString('settings-osc-vmc-anchor_hip')} - -
- - {l10n.getString('settings-osc-vmc-anchor_hip-description')} - -
-
- -
- - {l10n.getString('settings-osc-vmc-mirror_tracking')} - -
- - {l10n.getString('settings-osc-vmc-mirror_tracking-description')} - -
-
- -
- + + +
); diff --git a/gui/app/src/components/settings/pages/VRCOSCSettings.tsx b/gui/app/src/components/settings/pages/VRCOSCSettings.tsx index bfb7c576d..4023e64dd 100644 --- a/gui/app/src/components/settings/pages/VRCOSCSettings.tsx +++ b/gui/app/src/components/settings/pages/VRCOSCSettings.tsx @@ -21,6 +21,7 @@ import { A } from '@/components/commons/A'; import { Button } from '@/components/commons/Button'; import { CheckBox } from '@/components/commons/Checkbox'; import { Input } from '@/components/commons/Input'; +import { DropdownInside } from '@/components/commons/Dropdown'; import { Typography } from '@/components/commons/Typography'; import { StatusBadge, @@ -29,6 +30,12 @@ import { } from '@/components/commons/StatusBadge'; import { VRCIcon } from '@/components/commons/icon/VRCIcon'; import { SettingsPagePaneLayout } from '@/components/settings/SettingsPagePaneLayout'; +import { + SettingRow, + SettingsAdvanced, + SettingsGroup, + SettingsGroupLabel, +} from '@/components/settings/SettingRow'; import { useWebsocketAPI } from '@/hooks/websocket-api'; import { useRelativeTime } from '@/hooks/relative-time'; import { @@ -160,32 +167,22 @@ function StatusCard({ } > {inputState === VRCOSCInputState.IDLE ? ( - + ) : ( <> {inputState === VRCOSCInputState.ERROR && status.inputError ? ( - - {status.inputError?.toString() ?? ''} - + {status.inputError?.toString() ?? ''} ) : lastInputElapsed ? ( ) : ( - + )} )} @@ -203,14 +200,12 @@ function StatusCard({ {trackingDataState === VRCOSCTrackingDataState.RECEIVED ? ( lastTrackingElapsed ? ( ) : null ) : trackingDataState === VRCOSCTrackingDataState.DISABLED_IN_VRCHAT ? ( ) : ( - + )} @@ -238,7 +230,6 @@ function StatusCard({ {outputState === VRCOSCOutputState.IDLE ? ( <> - + ) : ( <> {outputState === VRCOSCOutputState.ERROR && status.outputError ? ( - - {status.outputError?.toString() ?? ''} - + {status.outputError?.toString() ?? ''} ) : lastFrameElapsed ? ( ) : ( - + )} )} @@ -295,18 +276,12 @@ function StatusCard({ badge={} > {oscQueryState === VRCOSCOscQueryState.DISABLED ? ( - + ) : oscQueryState === VRCOSCOscQueryState.ERROR ? ( - - {status.oscqueryError?.toString() ?? ''} - + {status.oscqueryError?.toString() ?? ''} ) : ( <> 0 ? ( <> - +
    {status.discoveredTargets.map((target, index) => (
  • - + {target.name?.toString() ?? ''} ( {target.address?.toString() ?? ''}:{target.portOut}) @@ -344,10 +316,7 @@ function StatusCard({
) : ( - + )} )} @@ -436,161 +405,162 @@ export function VRCOSCSettings() { ); return ( -
- }> - <> - VRChat OSC -
- <> - {l10n - .getString('settings-osc-vrchat-description-v1') - .split('\n') - .map((line, i) => ( - {line} - ))} - + + } + title="settings-sidebar-vrchat_osc" + > +
+
+ {l10n + .getString('settings-osc-vrchat-description-v1') + .split('\n') + .map((line, i) => ( + {line} + ))}
- - {l10n.getString('settings-osc-vrchat-enable')} - -
- - {l10n.getString('settings-osc-vrchat-enable-description')} - -
-
- + + } /> -
+ + } + /> + {enabled && status && ( - <> - - {l10n.getString('settings-osc-vrchat-status-title')} - +
+
+ +
{ - setValue('useManualNetwork', true, { - shouldDirty: true, - }); + setValue('useManualNetwork', true, { shouldDirty: true }); setValue( 'portsAddress.address', target.address?.toString() ?? '', - { - shouldDirty: true, - } + { shouldDirty: true } ); setValue('portsAddress.portOut', target.portOut, { shouldDirty: true, }); }} /> - - )} - - -
- -
-
-
- - - {l10n.getString('settings-osc-vrchat-status-network-mode')} - -
- - {l10n.getString( - 'settings-osc-vrchat-status-network-mode-description' - )} - -
-
- -
- - {useManualNetwork && ( - <> - - {l10n.getString('settings-osc-vrchat-network')} - -
- - {l10n.getString( - 'settings-osc-vrchat-status-network-manual-description' - )} - -
-
- - - - - - -
- - {l10n.getString('settings-osc-vrchat-network-address')} - -
- - {l10n.getString( - 'settings-osc-vrchat-network-address-description-v1' - )} - -
-
- -
- )} - + + + + { + setValue('useManualNetwork', value === 'manual', { + shouldDirty: true, + }); + handleSubmit(onSubmit)(); + }} + items={[ + { + label: l10n.getString( + 'settings-osc-vrchat-status-network-mode-auto' + ), + value: 'auto', + }, + { + label: l10n.getString( + 'settings-osc-vrchat-status-network-mode-manual' + ), + value: 'manual', + }, + ]} + /> + } + > + {useManualNetwork && ( + <> + + + + + + + +
+ } + /> + + } + /> + + )} + + + +
); diff --git a/gui/app/src/components/settings/pages/components/HIDSettings.tsx b/gui/app/src/components/settings/pages/components/HIDSettings.tsx index 8f32035d3..1bc6e46b0 100644 --- a/gui/app/src/components/settings/pages/components/HIDSettings.tsx +++ b/gui/app/src/components/settings/pages/components/HIDSettings.tsx @@ -1,4 +1,4 @@ -import { useLocalization, Localized } from '@fluent/react'; +import { Localized } from '@fluent/react'; import { useEffect } from 'react'; import { DefaultValues, useForm } from 'react-hook-form'; import { @@ -13,6 +13,7 @@ import { Typography } from '@/components/commons/Typography'; import { atom, useAtomValue, useSetAtom } from 'jotai'; import { isEqual } from '@react-hookz/deep-equal'; import { selectAtom } from 'jotai/utils'; +import { SettingRow } from '@/components/settings/SettingRow'; type HIDForm = { trackersOverHID: boolean; @@ -32,7 +33,6 @@ const hidSettingsValueAtom = selectAtom( export function HIDSettings() { const setSettings = useSetAtom(hidSettingsAtom); const settings = useAtomValue(hidSettingsValueAtom); - const { l10n } = useLocalization(); const { sendRPCPacket, useRPCPacket } = useWebsocketAPI(); const { control, watch, handleSubmit, getValues, reset } = useForm({ @@ -73,29 +73,25 @@ export function HIDSettings() { ); return ( - <> -
- - {l10n.getString( - 'settings-general-tracker_mechanics-trackers_over_usb' - )} - + }} > -
- - + } + controlId="trackers-over-usb" + control={ + + } + /> ); } diff --git a/gui/app/src/components/settings/pages/components/HomeLayoutSettings.tsx b/gui/app/src/components/settings/pages/components/HomeLayoutSettings.tsx index d863230b2..1f544c74f 100644 --- a/gui/app/src/components/settings/pages/components/HomeLayoutSettings.tsx +++ b/gui/app/src/components/settings/pages/components/HomeLayoutSettings.tsx @@ -12,6 +12,8 @@ import { useConfig, } from '@/hooks/config'; import { useLocalization } from '@fluent/react'; +import { DropdownInside } from '@/components/commons/Dropdown'; +import { SettingRow, SettingsGroup } from '@/components/settings/SettingRow'; import classNames from 'classnames'; import { ReactNode } from 'react'; import { track } from '@/utils/sentry'; @@ -69,7 +71,7 @@ const trackersTableColumnLabel: Record< url: 'tracker-table-column-url', }; -export function TrackersTableColumnsSettings({ +export function TrackersTableColumnToggles({ variant, }: { variant: 'settings' | 'modal'; @@ -84,26 +86,36 @@ export function TrackersTableColumnsSettings({ }); }; + return ( +
+ {trackersTableColumnOrder.map((key) => ( + toggleColumn(key)} + label={l10n.getString(trackersTableColumnLabel[key])} + /> + ))} +
+ ); +} + +export function TrackersTableColumnsSettings({ + variant, +}: { + variant: 'settings' | 'modal'; +}) { return (
- -
-
- {trackersTableColumnOrder.map((key) => ( - toggleColumn(key)} - label={l10n.getString(trackersTableColumnLabel[key])} - /> - ))} +
+
); } @@ -118,7 +130,7 @@ const trackerDisplayToggleLabel: Record = { showNumericSignal: 'settings-home-tracker_display-numeric_signal', }; -export function TrackerDisplaySettings({ +export function TrackerDisplayToggles({ variant, }: { variant: 'settings' | 'modal'; @@ -134,30 +146,44 @@ export function TrackerDisplaySettings({ }; return ( -
-
- - -
-
- {trackerDisplayToggleOrder.map((key) => ( - toggle(key)} - label={l10n.getString(trackerDisplayToggleLabel[key])} - /> - ))} -
+
+ {trackerDisplayToggleOrder.map((key) => ( + toggle(key)} + label={l10n.getString(trackerDisplayToggleLabel[key])} + /> + ))}
); } -export function SkeletonPreviewSettings({ +export function TrackerDisplaySettings({ + variant, +}: { + variant: 'settings' | 'modal'; +}) { + return ( +
+
+ + +
+ +
+ ); +} + +/** + * The home screen's settings, shared by its settings page and the quick + * settings modal on the home screen so both read the same. + */ +export function HomeLayoutSettings({ variant, }: { variant: 'settings' | 'modal'; @@ -168,83 +194,92 @@ export function SkeletonPreviewSettings({ (config?.skeletonPreviewStyle ?? defaultConfig.skeletonPreviewStyle) === 'mesh'; - return ( -
-
- - -
-
- - setConfig({ skeletonPreviewStyle: mesh ? 'lines' : 'mesh' }) - } - label={l10n.getString( - 'settings-interface-behavior-skeleton_mesh-label' - )} - /> -
-
- ); -} - -export function HomeLayoutSettings({ - variant, -}: { - variant: 'settings' | 'modal'; -}) { - const { config, setConfig } = useConfig(); - const setLayout = (layout: Config['homeLayout']) => { setConfig({ homeLayout: layout }); track('change_layout', { layout, from: variant }); }; return ( -
-
- - -
-
- setLayout('default')} - > -
-
-
-
-
-
- - setLayout('table')} - > -
-
-
-
-
-
- -
- - - {config?.homeLayout === 'table' && ( - - )} +
+ +
+ setLayout('default')} + > +
+
+
+
+
+
+ + setLayout('table')} + > +
+
+
+
+
+
+ +
+ {config?.homeLayout === 'table' && ( + } + /> + )} + + + + + setConfig({ + skeletonPreviewStyle: value as Config['skeletonPreviewStyle'], + }) + } + items={[ + { + label: l10n.getString( + 'settings-interface-behavior-skeleton_mesh-lines' + ), + value: 'lines', + }, + { + label: l10n.getString( + 'settings-interface-behavior-skeleton_mesh-mesh' + ), + value: 'mesh', + }, + ]} + /> + } + /> + } + /> +
); } diff --git a/gui/app/src/components/settings/pages/components/MagnetometerToggleSetting.tsx b/gui/app/src/components/settings/pages/components/MagnetometerToggleSetting.tsx index 25bf526bf..9d04ebd3b 100644 --- a/gui/app/src/components/settings/pages/components/MagnetometerToggleSetting.tsx +++ b/gui/app/src/components/settings/pages/components/MagnetometerToggleSetting.tsx @@ -11,6 +11,7 @@ import { RpcMessage, } from 'solarxr-protocol'; import { Link } from 'react-router-dom'; +import { SettingRow } from '@/components/settings/SettingRow'; interface MagnetometerToggleForm { magToggle: boolean; @@ -76,31 +77,27 @@ export function MagnetometerToggleSetting({ }); return settingType === 'general' ? ( - <> -
- - {l10n.getString( - 'settings-general-tracker_mechanics-use_mag_on_all_trackers' - )} - + }} > -
- - + } + controlId="trackers-magnetometer" + control={ + + } + /> ) : (
diff --git a/gui/app/src/components/settings/pages/components/TapDetectionSettings.tsx b/gui/app/src/components/settings/pages/components/TapDetectionSettings.tsx index 476b0ff97..2581631e3 100644 --- a/gui/app/src/components/settings/pages/components/TapDetectionSettings.tsx +++ b/gui/app/src/components/settings/pages/components/TapDetectionSettings.tsx @@ -10,14 +10,25 @@ import { } from 'solarxr-protocol'; import { useWebsocketAPI } from '@/hooks/websocket-api'; import { NumberSelector } from '@/components/commons/NumberSelector'; -import { Typography } from '@/components/commons/Typography'; -import { CheckBox } from '@/components/commons/Checkbox'; import { Dropdown } from '@/components/commons/Dropdown'; import { TAP_DETECTION_BODY_PARTS } from '@/hooks/tracker-picker'; import { atom, useAtomValue, useSetAtom } from 'jotai'; import { isEqual } from '@react-hookz/deep-equal'; import { selectAtom } from 'jotai/utils'; import { useLocaleConfig } from '@/i18n/config'; +import classNames from 'classnames'; +import { Typography } from '@/components/commons/Typography'; +import { CheckboxInternal } from '@/components/commons/Checkbox'; +import { + FullResetIcon, + MountingResetIcon, + YawResetIcon, +} from '@/components/commons/icon/ResetIcon'; +import { + SettingRow, + SettingsGroup, + SettingsGroupLabel, +} from '@/components/settings/SettingRow'; type TapDetectionForm = { yawResetEnabled: boolean; @@ -80,7 +91,7 @@ export function TapDetectionSettings() { label: l10n.getString(`body_part-${BodyPart[value]}`), })); - const { control, watch, handleSubmit, getValues, reset } = + const { control, watch, handleSubmit, getValues, reset, setValue } = useForm({ defaultValues, mode: 'onChange', @@ -160,189 +171,160 @@ export function TapDetectionSettings() { } ); + const resetKinds = [ + { + id: 'yawReset', + enabled: watch('yawResetEnabled'), + icon: , + }, + { + id: 'fullReset', + enabled: watch('fullResetEnabled'), + icon: , + }, + { + id: 'mountingReset', + enabled: watch('mountingResetEnabled'), + icon: , + }, + ] as const; + + const column = (id: string) => ( + + ); + return ( - <> -
- - {l10n.getString('settings-general-gesture_control-subtitle')} - - - {l10n.getString('settings-general-gesture_control-description')} - +
+
+
-
-
- - - -
-
- - - -
+
+
-
- secondsFormat.format(value)} - min={0.2} - max={3.0} - step={0.2} - /> - secondsFormat.format(value)} - min={0.2} - max={3.0} - step={0.2} - /> - secondsFormat.format(value)} - 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} - /> +
+ + + + + + + + + + + {resetKinds.map(({ id, enabled, icon }) => ( + + + +
+
+ + + + + ))} + +
+ + {column('reset')} + {column('tracker')}{column('taps')}{column('delay')}
+ ) => + setValue( + `${id}Enabled` as keyof TapDetectionForm, + event.currentTarget.checked, + { shouldDirty: true } + ) + } + /> + + + + {column('tracker')} + + + {column('taps')} + + l10n.getString( + 'settings-general-gesture_control-taps', + { amount: Math.round(value) } + ) + } + min={2} + max={10} + step={1} + /> + + {column('delay')} + secondsFormat.format(value)} + min={0.2} + max={3.0} + step={0.2} + /> +
-
- - {l10n.getString( - 'settings-general-gesture_control-numberTrackersOverThreshold' - )} - - - {l10n.getString( - 'settings-general-gesture_control-numberTrackersOverThreshold-description' - )} - - -
- - l10n.getString('settings-general-gesture_control-trackers', { - amount: Math.round(value), - }) - } - min={1} - max={20} - step={1} - /> -
-
- + + + l10n.getString('settings-general-gesture_control-trackers', { + amount: Math.round(value), + }) + } + min={1} + max={20} + step={1} + /> + } + /> + +
); } diff --git a/gui/app/src/components/settings/pages/components/TimeoutSettings.tsx b/gui/app/src/components/settings/pages/components/TimeoutSettings.tsx index 4a1a1c924..821cda821 100644 --- a/gui/app/src/components/settings/pages/components/TimeoutSettings.tsx +++ b/gui/app/src/components/settings/pages/components/TimeoutSettings.tsx @@ -1,4 +1,4 @@ -import { useLocalization, Localized } from '@fluent/react'; +import { Localized } from '@fluent/react'; import { useEffect, useState } from 'react'; import { DefaultValues, useForm } from 'react-hook-form'; import { @@ -11,6 +11,7 @@ import { useWebsocketAPI } from '@/hooks/websocket-api'; import { Typography } from '@/components/commons/Typography'; import { NumberSelector } from '@/components/commons/NumberSelector'; import { useLocaleConfig } from '@/i18n/config'; +import { SettingRow } from '@/components/settings/SettingRow'; type TimeoutForm = { delay: number; @@ -22,7 +23,6 @@ const defaultValues: TimeoutForm = { export function TimeoutSettings() { const [settings, setSettings] = useState(new TimeoutSettingsResponseT()); - const { l10n } = useLocalization(); const { sendRPCPacket, useRPCPacket } = useWebsocketAPI(); const { currentLocales } = useLocaleConfig(); @@ -75,26 +75,27 @@ export function TimeoutSettings() { ); return ( - <> -
- - {l10n.getString('settings-general-tracker_mechanics-timeout_delay')} - + }} > -
- secondsFormat.format(value)} - min={0.0} - max={3600} - step={1.0} - /> - + } + controlWidth="wide" + control={ + secondsFormat.format(value)} + min={0.0} + max={3600} + step={1.0} + /> + } + /> ); } diff --git a/gui/app/src/components/settings/pages/components/TrackingChecklistSettings.tsx b/gui/app/src/components/settings/pages/components/TrackingChecklistSettings.tsx index 69f15af83..14f5fdae5 100644 --- a/gui/app/src/components/settings/pages/components/TrackingChecklistSettings.tsx +++ b/gui/app/src/components/settings/pages/components/TrackingChecklistSettings.tsx @@ -1,5 +1,4 @@ import { CheckBox } from '@/components/commons/Checkbox'; -import { Typography } from '@/components/commons/Typography'; import { trackingchecklistIdtoLabel, useTrackingChecklist, @@ -8,6 +7,7 @@ import { useLocalization } from '@fluent/react'; import { useEffect } from 'react'; import { FieldPath, useForm } from 'react-hook-form'; import { TrackingChecklistStepId } from 'solarxr-protocol'; +import { SettingsGroup } from '@/components/settings/SettingRow'; type StepsForm = { steps: Record }; export function TrackingChecklistSettings({ @@ -55,16 +55,12 @@ export function TrackingChecklistSettings({ }; return ( -
-
- - -
+
{steps @@ -82,6 +78,6 @@ export function TrackingChecklistSettings({
))} -
+ ); } diff --git a/gui/app/src/components/vrc/VRCWarningsPage.tsx b/gui/app/src/components/vrc/VRCWarningsPage.tsx index f16d90b49..6413df597 100644 --- a/gui/app/src/components/vrc/VRCWarningsPage.tsx +++ b/gui/app/src/components/vrc/VRCWarningsPage.tsx @@ -130,7 +130,6 @@ export function VRCWarningsPage() { return ( } className="w-full min-w-fit">
-