mirror of
https://github.com/ckaczor/FeedCenter.git
synced 2026-01-13 17:22:48 -05:00
Add prerelease option
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
<None Remove="Resources\Warning.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="ChrisKaczor.ApplicationUpdate" Version="1.0.5" />
|
||||
<PackageReference Include="ChrisKaczor.ApplicationUpdate" Version="1.0.7" />
|
||||
<PackageReference Include="ChrisKaczor.GenericSettingsProvider" Version="1.0.4" />
|
||||
<PackageReference Include="ChrisKaczor.InstalledBrowsers" Version="1.0.4" />
|
||||
<PackageReference Include="ChrisKaczor.Wpf.Application.SingleInstance" Version="1.0.5" />
|
||||
|
||||
@@ -178,7 +178,7 @@ public partial class MainWindow
|
||||
if (DateTime.Now - Settings.Default.LastVersionCheck >= Settings.Default.VersionCheckInterval)
|
||||
{
|
||||
// Get the update information
|
||||
UpdateCheck.CheckForUpdate().Wait();
|
||||
UpdateCheck.CheckForUpdate(Settings.Default.IncludePrerelease).Wait();
|
||||
|
||||
// Update the last check time
|
||||
Settings.Default.LastVersionCheck = DateTime.Now;
|
||||
|
||||
@@ -90,7 +90,7 @@ public partial class MainWindow : IDisposable
|
||||
|
||||
// Check for update
|
||||
if (Settings.Default.CheckVersionAtStartup)
|
||||
await UpdateCheck.CheckForUpdate();
|
||||
await UpdateCheck.CheckForUpdate(Settings.Default.IncludePrerelease);
|
||||
|
||||
// Show the link if updates are available
|
||||
if (UpdateCheck.UpdateAvailable)
|
||||
|
||||
@@ -34,6 +34,6 @@ public partial class MainWindow
|
||||
|
||||
private void HandleNewVersionLinkClick(object sender, RoutedEventArgs e)
|
||||
{
|
||||
UpdateCheck.DisplayUpdateInformation(true);
|
||||
UpdateCheck.DisplayUpdateInformation(true, Settings.Default.IncludePrerelease);
|
||||
}
|
||||
}
|
||||
@@ -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)
|
||||
|
||||
9
Application/Properties/Resources.Designer.cs
generated
9
Application/Properties/Resources.Designer.cs
generated
@@ -957,6 +957,15 @@ namespace FeedCenter.Properties {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Include _prerelease.
|
||||
/// </summary>
|
||||
public static string includePrereleaseCheckBox {
|
||||
get {
|
||||
return ResourceManager.GetString("includePrereleaseCheckBox", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Last Updated.
|
||||
/// </summary>
|
||||
|
||||
@@ -561,4 +561,7 @@ All feeds currently in category "{0}" will be moved to the default category.</va
|
||||
<data name="FeedReadResult_TooManyRequests" xml:space="preserve">
|
||||
<value>Too many requests</value>
|
||||
</data>
|
||||
<data name="includePrereleaseCheckBox" xml:space="preserve">
|
||||
<value>Include _prerelease</value>
|
||||
</data>
|
||||
</root>
|
||||
14
Application/Properties/Settings.Designer.cs
generated
14
Application/Properties/Settings.Designer.cs
generated
@@ -12,7 +12,7 @@ namespace FeedCenter.Properties {
|
||||
|
||||
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")]
|
||||
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
||||
|
||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
||||
@@ -302,5 +302,17 @@ namespace FeedCenter.Properties {
|
||||
return ((string)(this["DatabaseFile"]));
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.UserScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("False")]
|
||||
public bool IncludePrerelease {
|
||||
get {
|
||||
return ((bool)(this["IncludePrerelease"]));
|
||||
}
|
||||
set {
|
||||
this["IncludePrerelease"] = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,5 +74,8 @@
|
||||
<Setting Name="DatabaseFile" Type="System.String" Scope="Application">
|
||||
<Value Profile="(Default)">FeedCenter.realm</Value>
|
||||
</Setting>
|
||||
<Setting Name="IncludePrerelease" Type="System.Boolean" Scope="User">
|
||||
<Value Profile="(Default)">False</Value>
|
||||
</Setting>
|
||||
</Settings>
|
||||
</SettingsFile>
|
||||
@@ -49,6 +49,9 @@
|
||||
<setting name="DefaultUserAgent" serializeAs="String">
|
||||
<value />
|
||||
</setting>
|
||||
<setting name="IncludePrerelease" serializeAs="String">
|
||||
<value>False</value>
|
||||
</setting>
|
||||
</FeedCenter.Properties.Settings>
|
||||
</userSettings>
|
||||
<applicationSettings>
|
||||
|
||||
Reference in New Issue
Block a user