Merge branch 'main' into prerelease

# Conflicts:
#	Application/FeedCenter.csproj
#	Application/Properties/Resources.resx
This commit is contained in:
2025-09-25 12:53:39 -04:00
11 changed files with 40 additions and 6 deletions

View File

@@ -13,6 +13,10 @@
Name="CheckVersionOnStartupCheckBox"
IsChecked="{Binding Source={x:Static properties:Settings.Default}, Path=CheckVersionAtStartup}"
Click="OnSaveSettings" />
<CheckBox Content="{x:Static properties:Resources.includePrereleaseCheckBox}"
Name="IncludePrereleaseCheckBox"
IsChecked="{Binding Source={x:Static properties:Settings.Default}, Path=IncludePrerelease}"
Click="OnSaveSettings" />
<Button Content="{x:Static properties:Resources.checkVersionNowButton}"
HorizontalAlignment="Left"
Click="HandleCheckVersionNowButtonClick" />

View File

@@ -15,7 +15,7 @@ public partial class UpdateOptionsPanel
private void HandleCheckVersionNowButtonClick(object sender, RoutedEventArgs e)
{
UpdateCheck.DisplayUpdateInformation(true);
UpdateCheck.DisplayUpdateInformation(true, Settings.Default.IncludePrerelease);
}
private void OnSaveSettings(object sender, RoutedEventArgs e)