diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml index 6cdf8a72cc..8302ebee3a 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml @@ -14,6 +14,7 @@ + @@ -84,20 +85,42 @@ Grid.Row="2" VerticalAlignment="Top" IsClosable="False" - IsOpen="False" - IsTabStop="True" - Severity="Error" /> + IsTabStop="False" + Severity="Error"> + + + + + IsTabStop="False" + Severity="Warning"> + + + + - + GetReleaseNotesMarkdown() { @@ -127,12 +127,19 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views private async Task Reload() { + if (_loadingReleaseNotes) + { + return; + } + try { + _loadingReleaseNotes = true; + ReleaseNotesMarkdown.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed; + LoadingProgressRing.Visibility = Microsoft.UI.Xaml.Visibility.Visible; string releaseNotesMarkdown = await GetReleaseNotesMarkdown(); - - ProxyWarningInfoBar.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed; - ErrorInfoBar.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed; + ProxyWarningInfoBar.IsOpen = false; + ErrorInfoBar.IsOpen = false; ReleaseNotesMarkdown.Text = releaseNotesMarkdown; ReleaseNotesMarkdown.Visibility = Microsoft.UI.Xaml.Visibility.Visible; @@ -143,21 +150,22 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views Logger.LogError("Exception when loading the release notes", httpEx); if (httpEx.Message.Contains("407", StringComparison.CurrentCulture)) { - ProxyWarningInfoBar.Visibility = Microsoft.UI.Xaml.Visibility.Visible; + ProxyWarningInfoBar.IsOpen = true; } else { - ErrorInfoBar.Visibility = Microsoft.UI.Xaml.Visibility.Visible; + ErrorInfoBar.IsOpen = true; } } catch (Exception ex) { Logger.LogError("Exception when loading the release notes", ex); - ErrorInfoBar.Visibility = Microsoft.UI.Xaml.Visibility.Visible; + ErrorInfoBar.IsOpen = true; } finally { LoadingProgressRing.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed; + _loadingReleaseNotes = false; } } @@ -248,5 +256,10 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views { Common.UI.SettingsDeepLink.OpenSettings(Common.UI.SettingsDeepLink.SettingsWindow.Overview, true); } + + private async void LoadReleaseNotes_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e) + { + await Reload(); + } } } diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw index 04d9d7b170..67b0a4ec9e 100644 --- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw +++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw @@ -4941,6 +4941,12 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m NEW - Must be all caps + Must be all caps + + + Retry + + + Retry \ No newline at end of file