change the field name of 'EnabledAdvanced'

This commit is contained in:
x3zF Love U
2023-03-15 19:12:41 +08:00
parent 4de01d2f62
commit 0cd6bf95a9
7 changed files with 24 additions and 24 deletions

View File

@@ -34,7 +34,7 @@ internal sealed class SettingEntry
/// <summary>
/// 启用高级功能
/// </summary>
public const string EnabledAdvanced = "EnabledAdvanced";
public const string IsAdvancedLaunchOptionsEnabled = "IsAdvancedLaunchOptionsEnabled";
/// <summary>
/// 实时便笺刷新时间

View File

@@ -4203,18 +4203,18 @@ namespace Snap.Hutao.Resource.Localization {
/// <summary>
/// 查找类似 在完整阅读原神和胡桃工具箱用户协议后,我选择启用「启动游戏-高级功能」 的本地化字符串。
/// </summary>
internal static string ViewPageSettingEnabledAdvancedDescription {
internal static string ViewPageSettingIsAdvancedLaunchOptionsEnabledDescription {
get {
return ResourceManager.GetString("ViewPageSettingEnabledAdvancedDescription", resourceCulture);
return ResourceManager.GetString("ViewPageSettingIsAdvancedLaunchOptionsEnabledDescription", resourceCulture);
}
}
/// <summary>
/// 查找类似 启动高级功能 的本地化字符串。
/// </summary>
internal static string ViewPageSettingEnabledAdvancedHeader {
internal static string ViewPageSettingIsAdvancedLaunchOptionsEnabledHeader {
get {
return ResourceManager.GetString("ViewPageSettingEnabledAdvancedHeader", resourceCulture);
return ResourceManager.GetString("ViewPageSettingIsAdvancedLaunchOptionsEnabledHeader", resourceCulture);
}
}

View File

@@ -1497,10 +1497,10 @@
<data name="ViewPageSettingEmptyHistoryVisibleOn" xml:space="preserve">
<value>显示</value>
</data>
<data name="ViewPageSettingEnabledAdvancedDescription" xml:space="preserve">
<data name="ViewPageSettingIsAdvancedLaunchOptionsEnabledDescription" xml:space="preserve">
<value>在完整阅读原神和胡桃工具箱用户协议后,我选择启用「启动游戏-高级功能」</value>
</data>
<data name="ViewPageSettingEnabledAdvancedHeader" xml:space="preserve">
<data name="ViewPageSettingIsAdvancedLaunchOptionsEnabledHeader" xml:space="preserve">
<value>启动高级功能</value>
</data>
<data name="ViewPageSettingFeaturesDangerousHint" xml:space="preserve">

View File

@@ -25,7 +25,7 @@ internal sealed class AppOptions : ObservableObject, IOptions<AppOptions>
private bool? isEmptyHistoryWishVisible;
private Core.Windowing.BackdropType? backdropType;
private CultureInfo? currentCulture;
private bool? enabledAdvanced;
private bool? isAdvancedLaunchOptionsEnabled;
/// <summary>
/// 构造一个新的应用程序选项
@@ -176,32 +176,32 @@ internal sealed class AppOptions : ObservableObject, IOptions<AppOptions>
/// <summary>
/// 是否启用高级功能
/// </summary>
public bool EnabledAdvanced
public bool IsAdvancedLaunchOptionsEnabled
{
get
{
if (enabledAdvanced == null)
if (isAdvancedLaunchOptionsEnabled == null)
{
using (IServiceScope scope = serviceScopeFactory.CreateScope())
{
AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
string? value = appDbContext.Settings.SingleOrDefault(e => e.Key == SettingEntry.EnabledAdvanced)?.Value;
_ = Activation.GetElevated() == true ? enabledAdvanced = value != null && bool.Parse(value) : enabledAdvanced = false;
string? value = appDbContext.Settings.SingleOrDefault(e => e.Key == SettingEntry.IsAdvancedLaunchOptionsEnabled)?.Value;
_ = Activation.GetElevated() == true ? isAdvancedLaunchOptionsEnabled = value != null && bool.Parse(value) : IsAdvancedLaunchOptionsEnabled = false;
}
}
return enabledAdvanced.Value;
return isAdvancedLaunchOptionsEnabled.Value;
}
set
{
if (SetProperty(ref enabledAdvanced, value))
if (SetProperty(ref isAdvancedLaunchOptionsEnabled, value))
{
using (IServiceScope scope = serviceScopeFactory.CreateScope())
{
AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
appDbContext.Settings.ExecuteDeleteWhere(e => e.Key == SettingEntry.EnabledAdvanced);
appDbContext.Settings.AddAndSave(new(SettingEntry.EnabledAdvanced, value.ToString()));
appDbContext.Settings.ExecuteDeleteWhere(e => e.Key == SettingEntry.IsAdvancedLaunchOptionsEnabled);
appDbContext.Settings.AddAndSave(new(SettingEntry.IsAdvancedLaunchOptionsEnabled, value.ToString()));
}
}
}

View File

@@ -301,7 +301,7 @@ internal sealed class GameService : IGameService
try
{
Interlocked.Increment(ref runningGamesCounter);
bool isPassCheck = Activation.GetElevated() == appOptions.EnabledAdvanced ? true : false;
bool isPassCheck = Activation.GetElevated() == appOptions.IsAdvancedLaunchOptionsEnabled ? true : false;
game.Start();

View File

@@ -251,16 +251,16 @@
</wsc:Setting>
</wsc:SettingsGroup>
<wsc:SettingsGroup Header="{shcm:ResourceString Name=ViewPageLaunchGameAdvanceHeader}" IsEnabled="{Binding AppOptions.EnabledAdvanced}">
<wsc:SettingsGroup Header="{shcm:ResourceString Name=ViewPageLaunchGameAdvanceHeader}" IsEnabled="{Binding AppOptions.IsAdvancedLaunchOptionsEnabled}">
<InfoBar
IsClosable="False"
IsOpen="{Binding AppOptions.EnabledAdvanced}"
IsOpen="{Binding AppOptions.IsAdvancedLaunchOptionsEnabled}"
Message="{shcm:ResourceString Name=ViewPageLaunchGameAdvanceHint}"
Severity="Error"/>
<InfoBar
Margin="0,2,0,0"
IsClosable="False"
IsOpen="{Binding AppOptions.EnabledAdvanced, Converter={StaticResource BoolNegationConverter}}"
IsOpen="{Binding AppOptions.IsAdvancedLaunchOptionsEnabled, Converter={StaticResource BoolNegationConverter}}"
Message="{shcm:ResourceString Name=ViewPageLaunchGameAdvancedFeatureElevationHint}"
Severity="Warning"/>
<wsc:Setting

View File

@@ -211,7 +211,7 @@
<wsc:SettingsGroup Foreground="{ThemeResource SystemFillColorCriticalBrush}" Header="{shcm:ResourceString Name=ViewPageSettingDangerousHeader}">
<InfoBar
IsClosable="False"
IsOpen="{Binding Options.EnabledAdvanced}"
IsOpen="{Binding Options.IsAdvancedLaunchOptionsEnabled}"
Message="{shcm:ResourceString Name=ViewPageSettingFeaturesDangerousHint}"
Severity="Error"/>
<InfoBar
@@ -223,14 +223,14 @@
<wsc:Setting
Background="{StaticResource SystemFillColorCriticalBackgroundBrush}"
Description="{shcm:ResourceString Name=ViewPageSettingEnabledAdvancedDescription}"
Header="{shcm:ResourceString Name=ViewPageSettingEnabledAdvancedHeader}"
Description="{shcm:ResourceString Name=ViewPageSettingIsAdvancedLaunchOptionsEnabledDescription}"
Header="{shcm:ResourceString Name=ViewPageSettingIsAdvancedLaunchOptionsEnabledHeader}"
Icon="&#xE730;">
<wsc:Setting.ActionContent>
<ToggleSwitch
Width="120"
IsEnabled="{Binding IsElevated}"
IsOn="{Binding Options.EnabledAdvanced, Mode=TwoWay}"
IsOn="{Binding Options.IsAdvancedLaunchOptionsEnabled, Mode=TwoWay}"
Style="{StaticResource ToggleSwitchSettingStyle}"/>
</wsc:Setting.ActionContent>
</wsc:Setting>