From 7342c5bf32f3591609e1118184aaa5db637359cb Mon Sep 17 00:00:00 2001 From: jcm Date: Sat, 7 Oct 2023 21:14:37 -0500 Subject: [PATCH] revise naming, UX to conform closer to legacy --- src/Ryujinx.Ava/Assets/Locales/en_US.json | 20 +++++++++---------- .../UI/ViewModels/MainWindowViewModel.cs | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Ryujinx.Ava/Assets/Locales/en_US.json b/src/Ryujinx.Ava/Assets/Locales/en_US.json index bfe855e2f..0dcf1b343 100644 --- a/src/Ryujinx.Ava/Assets/Locales/en_US.json +++ b/src/Ryujinx.Ava/Assets/Locales/en_US.json @@ -124,16 +124,16 @@ "SettingsTabSystemSystemLanguageTraditionalChinese": "Traditional Chinese", "SettingsTabSystemSystemTimeZone": "System Time Zone:", "SettingsTabSystemSystemTime": "System Time:", - "SettingsTabSystemPresentIntervalState": "Present Interval Mode (VSync):", - "SettingsTabSystemEnableCustomPresentInterval": "Enable toggle for custom present interval", - "SettingsTabSystemPresentIntervalStateSwitch": "60 (VSync ON)", - "SettingsTabSystemPresentIntervalStateUnbounded": "Unbounded (VSync OFF)", - "SettingsTabSystemPresentIntervalStateCustom": "Custom", - "SettingsTabSystemPresentIntervalStateTooltip": "Previously VSync. Use the Custom mode to set a specific refresh interval target. In some titles, the custom mode will act as an FPS cap. In others, it may lead to unpredictable behavior or do nothing at all. \n\nLeave at 60 (VSync ON) if unsure.", - "SettingsTabSystemEnableCustomPresentIntervalTooltip": "The present interval mode toggle will also cycle through the custom interval mode.", - "SettingsTabSystemCustomPresentIntervalValueTooltip": "The custom present interval target value.", - "SettingsTabSystemCustomPresentIntervalSliderTooltip": "The custom present interval target, as a percentage of the normal Switch interval.", - "SettingsTabSystemCustomPresentIntervalValue": "Custom Present Interval Value:", + "SettingsTabSystemPresentIntervalState": "VSync:", + "SettingsTabSystemEnableCustomPresentInterval": "Enable toggle through custom refresh rate", + "SettingsTabSystemPresentIntervalStateSwitch": "On", + "SettingsTabSystemPresentIntervalStateUnbounded": "Off", + "SettingsTabSystemPresentIntervalStateCustom": "Custom Refresh Rate", + "SettingsTabSystemPresentIntervalStateTooltip": "Emulated Vertical Sync. 'On' emulates the Switch's refresh rate of 60Hz. 'Off' is an unbounded refresh rate. 'Custom' allows the user to specify a custom emulated refresh rate. In some titles, the custom rate will act as an FPS cap. In others, it may lead to unpredictable behavior. \n\nLeave ON if unsure.", + "SettingsTabSystemEnableCustomPresentIntervalTooltip": "The VSync toggle will also cycle through the custom refresh rate mode.", + "SettingsTabSystemCustomPresentIntervalValueTooltip": "The custom refresh rate target value.", + "SettingsTabSystemCustomPresentIntervalSliderTooltip": "The custom refresh rate, as a percentage of the normal Switch refresh rate.", + "SettingsTabSystemCustomPresentIntervalValue": "Custom Refresh Rate Value:", "SettingsTabSystemEnablePptc": "PPTC (Profiled Persistent Translation Cache)", "SettingsTabSystemEnableFsIntegrityChecks": "FS Integrity Checks", "SettingsTabSystemAudioBackend": "Audio Backend:", diff --git a/src/Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs index f377a765d..d4db0694d 100644 --- a/src/Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs +++ b/src/Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs @@ -1282,7 +1282,7 @@ private void Update_StatusBar(object sender, StatusUpdatedEventArgs args) PresentIntervalStateColor = new SolidColorBrush((Color)color); } - PresentIntervalStateText = args.PresentIntervalState; + PresentIntervalStateText = args.PresentIntervalState == "Custom" ? "Custom" : "VSync"; ShowCustomPresentIntervalPicker = args.PresentIntervalState == PresentIntervalState.Custom.ToString(); DockedStatusText = args.DockedMode;