mirror of
https://github.com/ckaczor/FeedCenter.git
synced 2026-02-11 10:38:36 -05:00
Merge branch 'main' into prerelease
# Conflicts: # Application/FeedCenter.csproj # Application/Properties/Resources.resx
This commit is contained in:
@@ -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" />
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user