From a21be00e3e7a701023111b9737d0cb1ac991984a Mon Sep 17 00:00:00 2001 From: wookieejedi Date: Mon, 3 Feb 2025 16:07:13 -0500 Subject: [PATCH 1/2] Allow TC Mode to Hide QuickStart Button Fixes #291 --- Knossos.NET/Models/CustomLauncher.cs | 15 ++++++++++++--- Knossos.NET/ViewModels/GlobalSettingsViewModel.cs | 3 +++ Knossos.NET/Views/GlobalSettingsView.axaml | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Knossos.NET/Models/CustomLauncher.cs b/Knossos.NET/Models/CustomLauncher.cs index 8e907989..34758611 100644 --- a/Knossos.NET/Models/CustomLauncher.cs +++ b/Knossos.NET/Models/CustomLauncher.cs @@ -161,6 +161,11 @@ public static class CustomLauncher /// public static bool MenuDisplayGlobalSettingsEntry { get; private set; } = false; + /// + /// Display the QuickStart button in the Knossos settings menu + /// + public static bool SettingsDisplayQuickStartButton { get; private set; } = true; + /// /// Add custom buttons to the menu /// @@ -321,11 +326,14 @@ private static void ReadCustomFile() if (customData.MenuDisplayNebulaLoginEntry.HasValue) MenuDisplayNebulaLoginEntry = customData.MenuDisplayNebulaLoginEntry.Value; + if (customData.MenuDisplayCommunityEntry.HasValue) + MenuDisplayCommunityEntry = customData.MenuDisplayCommunityEntry.Value; + if (customData.MenuDisplayGlobalSettingsEntry.HasValue) MenuDisplayGlobalSettingsEntry = customData.MenuDisplayGlobalSettingsEntry.Value; - if (customData.MenuDisplayCommunityEntry.HasValue) - MenuDisplayCommunityEntry = customData.MenuDisplayCommunityEntry.Value; + if (customData.SettingsDisplayQuickStartButton.HasValue) + SettingsDisplayQuickStartButton = customData.SettingsDisplayQuickStartButton.Value; CustomMenuButtons = customData.CustomMenuButtons; @@ -380,8 +388,9 @@ struct CustomFileData public bool? MenuDisplayEngineEntry { get; set; } public bool? MenuDisplayDebugEntry { get; set; } public bool? MenuDisplayNebulaLoginEntry { get; set; } - public bool? MenuDisplayGlobalSettingsEntry { get; set; } public bool? MenuDisplayCommunityEntry { get; set; } + public bool? MenuDisplayGlobalSettingsEntry { get; set; } + public bool? SettingsDisplayQuickStartButton { get; set; } public string[]? CustomCmdlineArray { get; set; } public bool? UseNebulaServices { get; set; } public bool? WriteLogFile { get; set; } diff --git a/Knossos.NET/ViewModels/GlobalSettingsViewModel.cs b/Knossos.NET/ViewModels/GlobalSettingsViewModel.cs index 54019739..6fd51c3f 100644 --- a/Knossos.NET/ViewModels/GlobalSettingsViewModel.cs +++ b/Knossos.NET/ViewModels/GlobalSettingsViewModel.cs @@ -62,6 +62,8 @@ public partial class GlobalSettingsViewModel : ViewModelBase internal bool isAVX2 = false; [ObservableProperty] internal bool displaySettingsWarning = true; + [ObservableProperty] + internal bool quickStartButtonVisibility = true; /* Knossos Settings */ [ObservableProperty] @@ -580,6 +582,7 @@ public void LoadData() LogLevel= Knossos.globalSettings.logLevel; Fs2RootPack = Knossos.retailFs2RootFound; NumberOfMods = Knossos.GetInstalledModList(null).Count.ToString(); + QuickStartButtonVisibility = CustomLauncher.IsCustomMode ? CustomLauncher.SettingsDisplayQuickStartButton : true; NumberOfBuilds = Knossos.GetInstalledBuildsList(null).Count.ToString(); if(KnUtils.IsWindows) { diff --git a/Knossos.NET/Views/GlobalSettingsView.axaml b/Knossos.NET/Views/GlobalSettingsView.axaml index 898440cd..d89009b3 100644 --- a/Knossos.NET/Views/GlobalSettingsView.axaml +++ b/Knossos.NET/Views/GlobalSettingsView.axaml @@ -14,7 +14,7 @@ - + From 2ed0135ab3ebe83e1138acdb63af76aa4fca053f Mon Sep 17 00:00:00 2001 From: wookieejedi Date: Tue, 4 Feb 2025 18:11:25 -0500 Subject: [PATCH 2/2] merge conflicts --- Knossos.NET/ViewModels/GlobalSettingsViewModel.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Knossos.NET/ViewModels/GlobalSettingsViewModel.cs b/Knossos.NET/ViewModels/GlobalSettingsViewModel.cs index 05722b7c..e4f1b6b8 100644 --- a/Knossos.NET/ViewModels/GlobalSettingsViewModel.cs +++ b/Knossos.NET/ViewModels/GlobalSettingsViewModel.cs @@ -64,6 +64,7 @@ public partial class GlobalSettingsViewModel : ViewModelBase internal bool displaySettingsWarning = true; [ObservableProperty] internal bool quickStartButtonVisibility = true; + [ObservableProperty] internal bool expandKnossosSettings = false; /* Knossos Settings */