mirror of
https://github.com/ckaczor/FeedCenter.git
synced 2026-02-14 12:08:33 -05:00
Merge branch 'main' into prerelease
# Conflicts: # Application/FeedCenter.csproj # Application/Properties/Resources.resx
This commit is contained in:
9
Application/Properties/Resources.Designer.cs
generated
9
Application/Properties/Resources.Designer.cs
generated
@@ -1101,6 +1101,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>
|
||||
|
||||
@@ -612,4 +612,7 @@ All feeds currently in category "{0}" will be moved to the default category.</va
|
||||
<data name="AccountTypeGoogleReader" xml:space="preserve">
|
||||
<value>Google Reader</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>
|
||||
Reference in New Issue
Block a user