调整移动部分设置到启动器设置页面下、添加本地化资源

natsurainko · natsurainko · commit f4acdcac7b99 · 2025-08-26T16:17:35.000+08:00
diff --git a/FluentLauncher.Infra.Localization b/FluentLauncher.Infra.Localization
@@ -1 +1 @@
-Subproject commit 5dd76247af44583a9f3aac450a4ef01f2577889d
+Subproject commit 78f0bb0cca8ce402face0e393c52b5cb6155599c
diff --git a/Natsurainko.FluentLauncher/Services/Settings/SettingsService.cs b/Natsurainko.FluentLauncher/Services/Settings/SettingsService.cs
@@ -1,4 +1,5 @@
-﻿using FluentLauncher.Infra.Settings;
+﻿using CommunityToolkit.Mvvm.ComponentModel;
+using FluentLauncher.Infra.Settings;
 using FluentLauncher.Infra.Settings.Converters;
 using Natsurainko.FluentLauncher.Services.Storage;
 using Natsurainko.FluentLauncher.Utils;
@@ -9,7 +10,6 @@
 using System.Text.Json.Nodes;
 using Windows.Storage;
 using Windows.Win32.UI.WindowsAndMessaging;
-using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace Natsurainko.FluentLauncher.Services.Settings;
 
@@ -66,13 +66,6 @@ public partial class SettingsService : SettingsContainer
 
     #endregion
 
-    #region Quick Launch Settings
-
-    [SettingItem(Default = 6, Converter = typeof(JsonStringConverter<int>))]
-    public partial int MaxQuickLaunchLatestItem { get; set; }
-
-    #endregion
-
     [SettingItem]
     public partial Guid? ActiveAccountUuid { get; set; }
 
@@ -155,8 +148,21 @@ public partial class SettingsService : SettingsContainer
     [SettingItem(Default = 1, Converter = typeof(JsonStringConverter<int>))]
     public partial int HomeLaunchButtonSize { get; set; }
 
-    [SettingItem(Default = false, Converter = typeof(JsonStringConverter<bool>))]
-    public partial bool EnableHomeLaunchTaskTrack { get; set; }
+    #endregion
+
+    #region Launcher Settings
+
+    [SettingItem(Default = 1, Converter = typeof(JsonStringConverter<int>))]
+    public partial int HomePageLaunchButtonBehavior { get; set; }
+
+    [SettingItem(Default = 0, Converter = typeof(JsonStringConverter<int>))]
+    public partial int AfterInstanceLaunchedBehavior { get; set; }
+
+    [SettingItem(Default = true, Converter = typeof(JsonStringConverter<bool>))]
+    public partial bool EnableLocalizedResourceSuggestions { get; set; }
+
+    [SettingItem(Default = 6, Converter = typeof(JsonStringConverter<int>))]
+    public partial int MaxQuickLaunchLatestItem { get; set; }
 
     #endregion
 
diff --git a/Natsurainko.FluentLauncher/ViewModels/Downloads/Modpacks/DefaultViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/Downloads/Modpacks/DefaultViewModel.cs
@@ -1,4 +1,5 @@
 ﻿using FluentLauncher.Infra.UI.Navigation;
+using Natsurainko.FluentLauncher.Services.Settings;
 using Natsurainko.FluentLauncher.Services.UI;
 using Nrk.FluentCore.Resources;
 using System.Collections.Generic;
@@ -8,8 +9,10 @@ namespace Natsurainko.FluentLauncher.ViewModels.Downloads.Modpacks;
 internal partial class DefaultViewModel(
     CurseForgeClient curseForgeClient,
     ModrinthClient modrinthClient,
+    SettingsService settingsService,
     INavigationService navigationService,
-    SearchProviderService searchProviderService) : ResourceDefaultViewModel(curseForgeClient, modrinthClient, navigationService, searchProviderService)
+    SearchProviderService searchProviderService) : ResourceDefaultViewModel(
+        curseForgeClient, modrinthClient, settingsService, navigationService, searchProviderService)
 {
     protected override CurseForgeResourceType CurseForgeResourceType => CurseForgeResourceType.ModPack;
 
diff --git a/Natsurainko.FluentLauncher/ViewModels/Downloads/Mods/DefaultViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/Downloads/Mods/DefaultViewModel.cs
@@ -1,4 +1,5 @@
 ﻿using FluentLauncher.Infra.UI.Navigation;
+using Natsurainko.FluentLauncher.Services.Settings;
 using Natsurainko.FluentLauncher.Services.UI;
 using Nrk.FluentCore.Resources;
 using System.Collections.Generic;
@@ -8,8 +9,10 @@ namespace Natsurainko.FluentLauncher.ViewModels.Downloads.Mods;
 internal partial class DefaultViewModel(
     CurseForgeClient curseForgeClient,
     ModrinthClient modrinthClient,
+    SettingsService settingsService,
     INavigationService navigationService,
-    SearchProviderService searchProviderService) : ResourceDefaultViewModel(curseForgeClient, modrinthClient, navigationService, searchProviderService)
+    SearchProviderService searchProviderService) : ResourceDefaultViewModel(
+        curseForgeClient, modrinthClient, settingsService, navigationService, searchProviderService)
 {
     protected override CurseForgeResourceType CurseForgeResourceType => CurseForgeResourceType.McMod;
 
diff --git a/Natsurainko.FluentLauncher/ViewModels/Downloads/ResourceDefaultViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/Downloads/ResourceDefaultViewModel.cs
@@ -2,6 +2,7 @@
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.WinUI;
 using FluentLauncher.Infra.UI.Navigation;
+using Natsurainko.FluentLauncher.Services.Settings;
 using Natsurainko.FluentLauncher.Services.UI;
 using Natsurainko.FluentLauncher.Utils;
 using Nrk.FluentCore.Resources;
@@ -17,6 +18,7 @@ namespace Natsurainko.FluentLauncher.ViewModels.Downloads;
 internal abstract partial class ResourceDefaultViewModel(
     CurseForgeClient curseForgeClient,
     ModrinthClient modrinthClient,
+    SettingsService settingsService,
     INavigationService navigationService,
     SearchProviderService searchProviderService) : PageVM, INavigationAware
 {
@@ -183,6 +185,9 @@ protected override void OnUnloaded()
 
     private IEnumerable<Suggestion> SuggestionProvider(string query)
     {
+        if (!settingsService.EnableLocalizedResourceSuggestions)
+            return [];
+
         if (CurseForgeResourceType != CurseForgeResourceType.McMod || string.IsNullOrEmpty(query))
             return [];
 
diff --git a/Natsurainko.FluentLauncher/ViewModels/Downloads/Shaders/DefaultViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/Downloads/Shaders/DefaultViewModel.cs
@@ -1,4 +1,5 @@
 ﻿using FluentLauncher.Infra.UI.Navigation;
+using Natsurainko.FluentLauncher.Services.Settings;
 using Natsurainko.FluentLauncher.Services.UI;
 using Nrk.FluentCore.Resources;
 using System.Collections.Generic;
@@ -8,8 +9,10 @@ namespace Natsurainko.FluentLauncher.ViewModels.Downloads.Shaders;
 internal partial class DefaultViewModel(
     CurseForgeClient curseForgeClient,
     ModrinthClient modrinthClient,
+    SettingsService settingsService,
     INavigationService navigationService,
-    SearchProviderService searchProviderService) : ResourceDefaultViewModel(curseForgeClient, modrinthClient, navigationService, searchProviderService)
+    SearchProviderService searchProviderService) : ResourceDefaultViewModel(
+        curseForgeClient, modrinthClient, settingsService, navigationService, searchProviderService)
 {
     protected override CurseForgeResourceType CurseForgeResourceType => CurseForgeResourceType.Shader;
 
diff --git a/Natsurainko.FluentLauncher/ViewModels/Downloads/TexturePacks/DefaultViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/Downloads/TexturePacks/DefaultViewModel.cs
@@ -1,4 +1,5 @@
 ﻿using FluentLauncher.Infra.UI.Navigation;
+using Natsurainko.FluentLauncher.Services.Settings;
 using Natsurainko.FluentLauncher.Services.UI;
 using Nrk.FluentCore.Resources;
 using System.Collections.Generic;
@@ -8,8 +9,10 @@ namespace Natsurainko.FluentLauncher.ViewModels.Downloads.TexturePacks;
 internal partial class DefaultViewModel(
     CurseForgeClient curseForgeClient,
     ModrinthClient modrinthClient,
+    SettingsService settingsService,
     INavigationService navigationService,
-    SearchProviderService searchProviderService) : ResourceDefaultViewModel(curseForgeClient, modrinthClient, navigationService, searchProviderService)
+    SearchProviderService searchProviderService) : ResourceDefaultViewModel(
+        curseForgeClient, modrinthClient, settingsService, navigationService, searchProviderService)
 {
     protected override CurseForgeResourceType CurseForgeResourceType => CurseForgeResourceType.TexturePack;
 
diff --git a/Natsurainko.FluentLauncher/ViewModels/Home/HomeViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/Home/HomeViewModel.cs
@@ -131,7 +131,7 @@ partial void OnActiveMinecraftInstanceChanged(MinecraftInstance value)
     [RelayCommand(CanExecute = nameof(CanExecuteLaunch))]
     async Task Launch()
     {
-        if (!_settingsService.EnableHomeLaunchTaskTrack)
+        if (_settingsService.HomePageLaunchButtonBehavior == 0)
         {
             _launchService.LaunchFromUI(ActiveMinecraftInstance);
             return;
diff --git a/Natsurainko.FluentLauncher/ViewModels/Settings/AppearanceViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/Settings/AppearanceViewModel.cs
@@ -82,10 +82,6 @@ public AppearanceViewModel(
     [BindToSetting(Path = nameof(SettingsService.HomeLaunchButtonSize))]
     public partial int HomeLaunchButtonSize { get; set; }
 
-    [ObservableProperty]
-    [BindToSetting(Path = nameof(SettingsService.EnableHomeLaunchTaskTrack))]
-    public partial bool EnableHomeLaunchTaskTrack { get; set; }
-
     public Color CurrentThemeColor => UseSystemAccentColor ? (Color)App.Current.Resources["RawSystemAccentColor"] : CustomThemeColor.GetValueOrDefault();
 
     public bool AcrylicIsSupported => DesktopAcrylicController.IsSupported();
diff --git a/Natsurainko.FluentLauncher/ViewModels/Settings/LaunchViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/Settings/LaunchViewModel.cs
@@ -77,10 +77,6 @@ internal partial class LaunchViewModel : SettingsPageVM, ISettingsViewModel
     [BindToSetting(Path = nameof(SettingsService.EnableIndependencyCore))]
     public partial bool EnableIndependencyCore { get; set; }
 
-    [ObservableProperty]
-    [BindToSetting(Path = nameof(SettingsService.MaxQuickLaunchLatestItem))]
-    public partial int MaxQuickLaunchLatestItem { get; set; }
-
     [ObservableProperty]
     [BindToSetting(Path = nameof(SettingsService.GameFilePreferredVerificationMethod))]
     public partial int GameFilePreferredVerificationMethod { get; set; }
diff --git a/Natsurainko.FluentLauncher/ViewModels/Settings/LauncherViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/Settings/LauncherViewModel.cs
@@ -1,21 +1,45 @@
 ﻿using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using FluentLauncher.Infra.Settings.Mvvm;
 using Natsurainko.FluentLauncher.Services.Settings;
+using Natsurainko.FluentLauncher.Services.Storage;
+using Natsurainko.FluentLauncher.Utils;
 
 namespace Natsurainko.FluentLauncher.ViewModels.Settings;
 
 internal partial class LauncherViewModel : SettingsPageVM, ISettingsViewModel
 {
     [SettingsProvider]
     private readonly SettingsService _settingsService;
+    private readonly LocalStorageService _localStorageService;
 
     [ObservableProperty]
-    public partial int AfterInstanceLaunched { get; set; }
+    [BindToSetting(Path = nameof(SettingsService.HomePageLaunchButtonBehavior))]
+    public partial int HomePageLaunchButtonBehavior { get; set; }
 
-    public LauncherViewModel(SettingsService settingsService)
+    [ObservableProperty]
+    [BindToSetting(Path = nameof(SettingsService.AfterInstanceLaunchedBehavior))]
+    public partial int AfterInstanceLaunchedBehavior { get; set; }
+
+    [ObservableProperty]
+    [BindToSetting(Path = nameof(SettingsService.EnableLocalizedResourceSuggestions))]
+    public partial bool EnableLocalizedResourceSuggestions { get; set; }
+
+    [ObservableProperty]
+    [BindToSetting(Path = nameof(SettingsService.MaxQuickLaunchLatestItem))]
+    public partial int MaxQuickLaunchLatestItem { get; set; }
+
+    public LauncherViewModel(SettingsService settingsService, LocalStorageService localStorageService)
     {
         _settingsService = settingsService;
+        _localStorageService = localStorageService;
 
         (this as ISettingsViewModel).InitializeSettings();
     }
+
+    [RelayCommand]
+    void OpenStorageFolder() => ExplorerHelper.OpenFolder(LocalStorageService.LocalFolderPath);
+
+    [RelayCommand]
+    void OpenLogFolder() => ExplorerHelper.OpenFolder(_localStorageService.GetDirectory("launcher-logs").FullName);
 }
diff --git a/Natsurainko.FluentLauncher/ViewModels/TaskViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/TaskViewModel.cs
@@ -16,6 +16,7 @@
 using Natsurainko.FluentLauncher.Models.UI;
 using Natsurainko.FluentLauncher.Services.Launch;
 using Natsurainko.FluentLauncher.Services.Network;
+using Natsurainko.FluentLauncher.Services.Settings;
 using Natsurainko.FluentLauncher.Services.UI.Messaging;
 using Natsurainko.FluentLauncher.Services.UI.Notification;
 using Natsurainko.FluentLauncher.Utils;
@@ -35,6 +36,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Timers;
+using WinUIEx;
 using static Natsurainko.FluentLauncher.Services.Launch.LaunchProgress;
 using static Natsurainko.FluentLauncher.ViewModels.LaunchStageProgress;
 
@@ -916,6 +918,20 @@ await App.DispatcherQueue.EnqueueAsync(() =>
             ProcessLaunched = true;
         });
 
+        App.DispatcherQueue.EnqueueAsync(() =>
+        {
+            switch (App.GetService<SettingsService>().AfterInstanceLaunchedBehavior)
+            {
+                case 1:
+                    App.MainWindow.Minimize();
+                    break;
+                case 2:
+                    App.MainWindow.Minimize();
+                    ShowLogger();
+                    break;
+            }
+        }).Forget();
+
         Task.Run(async () =>
         {
             McProcess.Process.WaitForInputIdle(15 * 1000);
diff --git a/Natsurainko.FluentLauncher/Views/Settings/AppearancePage.xaml b/Natsurainko.FluentLauncher/Views/Settings/AppearancePage.xaml
@@ -688,14 +688,6 @@
                     HeaderIcon="{xh:FontIcon Glyph=&#xe743;}">
                     <ComboBox ItemsSource="{xh:ComboBox ResourceKey=_Items3}" SelectedIndex="{x:Bind VM.HomeLaunchButtonSize, Mode=TwoWay}" />
                 </controls:SettingsCard>
-
-                <controls:SettingsCard
-                    x:Uid="Settings_AppearancePage_Card6"
-                    Description="Clicking the launch button on the home page will not navigate to the launch task page, but will directly display the progress info of the current item (at most one) on the page. At the same time, the button can be used to cancel the task."
-                    Header="Use the Home Launch Button to Control Launch Tasks"
-                    HeaderIcon="{xh:FontIcon Glyph=&#xe724;}">
-                    <ToggleSwitch IsOn="{x:Bind VM.EnableHomeLaunchTaskTrack, Mode=TwoWay}" />
-                </controls:SettingsCard>
             </StackPanel>
         </Border>
 
diff --git a/Natsurainko.FluentLauncher/Views/Settings/LaunchPage.xaml b/Natsurainko.FluentLauncher/Views/Settings/LaunchPage.xaml
@@ -322,40 +322,12 @@
                 </controls:SettingsCard>
 
                 <controls:SettingsCard
-                    x:Uid="Settings_LaunchPage_Card12"
+                    x:Uid="Settings_LaunchPage_Card11"
                     Description="File verification methods will affect the launch time. Verifying the file Sha1 is more accurate, but much slower than verifying the file size."
                     Header="Preferred Game File Verification Method"
                     HeaderIcon="{xh:FontIcon Glyph=&#xE721;}">
                     <ComboBox ItemsSource="{xh:ComboBox ResourceKey=_Items1}" SelectedIndex="{x:Bind VM.GameFilePreferredVerificationMethod, Mode=TwoWay}" />
                 </controls:SettingsCard>
-
-                <TextBlock
-                    x:Uid="Settings_LaunchPage_T4"
-                    Style="{ThemeResource SettingsSectionHeaderTextBlockStyle}"
-                    Text="Quick Launch Settings" />
-
-                <controls:SettingsCard
-                    x:Uid="Settings_LaunchPage_Card11"
-                    Description="Maximum number of items in the Latest group to keep in the taskbar"
-                    Header="Latest item maximum number"
-                    HeaderIcon="{xh:FontIcon Glyph=&#xebc6;}">
-                    <StackPanel Orientation="Horizontal" Spacing="10">
-                        <TextBlock
-                            VerticalAlignment="Center"
-                            Style="{ThemeResource BaseTextBlockStyle}"
-                            Text="{x:Bind VM.MaxQuickLaunchLatestItem, Mode=OneWay}" />
-
-                        <Slider
-                            Width="128"
-                            Maximum="16"
-                            Minimum="3"
-                            Value="{x:Bind VM.MaxQuickLaunchLatestItem, Mode=TwoWay}">
-                            <i:Interaction.Behaviors>
-                                <behaviors:SettingsCardContentMaxWidthBehavior AscendentType="Grid" AutoMaxWidth="True" />
-                            </i:Interaction.Behaviors>
-                        </Slider>
-                    </StackPanel>
-                </controls:SettingsCard>
             </StackPanel>
         </Border>
 
diff --git a/Natsurainko.FluentLauncher/Views/Settings/LauncherPage.xaml b/Natsurainko.FluentLauncher/Views/Settings/LauncherPage.xaml

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ partial void OnActiveMinecraftInstanceChanged(MinecraftInstance value)`
`131`	`131`	`[RelayCommand(CanExecute = nameof(CanExecuteLaunch))]`
`132`	`132`	`async Task Launch()`
`133`	`133`	`{`
`134`		`- if (!_settingsService.EnableHomeLaunchTaskTrack)`
	`134`	`+ if (_settingsService.HomePageLaunchButtonBehavior == 0)`
`135`	`135`	`{`
`136`	`136`	`_launchService.LaunchFromUI(ActiveMinecraftInstance);`
`137`	`137`	`return;`