Merge #4302 Make versions tab non-interactive inside install flow

KSP-CKAN · Feb 7, 2025 · 8ec3b2c · 8ec3b2c
2 parents 8ea7868 + 4033929
commit 8ec3b2c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,6 +31,7 @@ All notable changes to this project will be documented in this file.
 - [Core] Handle missing indexes in Steam vdf file lists (#4279 by: HebaruSan)
 - [Core] Fix cloning instances with shared stock files on Windows (#4297 by: HebaruSan)
 - [Core] Handle paths without DriveInfo (#4300 by: HebaruSan)
+- [GUI] Make versions tab non-interactive inside install flow (#4302 by: HebaruSan)
 
 ### Internal
 

diff --git a/GUI/Controls/ModInfoTabs/Versions.cs b/GUI/Controls/ModInfoTabs/Versions.cs
@@ -70,6 +70,7 @@ public GUIMod? SelectedModule
         private static GameInstance?        currentInstance => Main.Instance?.CurrentInstance;
         private static GameInstanceManager? manager         => Main.Instance?.Manager;
         private static IUser?               user            => Main.Instance?.currentUser;
+        private static bool                 interactive     => !Main.Instance?.Waiting ?? false;
 
         private readonly RepositoryDataManager    repoData;
         private          GUIMod?                  visibleGuiModule;
@@ -171,7 +172,7 @@ private void visibleGuiModule_PropertyChanged(object? sender, PropertyChangedEve
 
         private void UpdateSelection()
         {
-            if (visibleGuiModule != null)
+            if (visibleGuiModule != null && interactive)
             {
                 bool prevIgnore = ignoreItemCheck;
                 ignoreItemCheck = true;
@@ -256,7 +257,7 @@ private ListViewItem[] getItems(GUIMod gmod, List<CkanModule> versions)
                     {
                         toRet.BackColor = PrereleaseLabel.BackColor;
                     }
-                    if (module.Equals(gmod.SelectedMod))
+                    if (module.Equals(gmod.SelectedMod) && interactive)
                     {
                         toRet.Checked = true;
                     }
@@ -322,6 +323,8 @@ private void Refresh(GUIMod gmod)
         {
             if (currentInstance != null)
             {
+                StabilityToleranceLabel.Visible = interactive;
+                StabilityToleranceComboBox.Visible = interactive;
                 // checkInstallable needs this to stop background threads on switch to another mod
                 cancelTokenSrc     = new CancellationTokenSource();
                 var startingModule = gmod;
@@ -342,7 +345,7 @@ private void Refresh(GUIMod gmod)
                     if (startingModule.Equals(visibleGuiModule))
                     {
                         // Only show checkboxes for non-DLC modules
-                        VersionsListView.CheckBoxes = !gmod.ToModule().IsDLC;
+                        VersionsListView.CheckBoxes = interactive && !gmod.ToModule().IsDLC;
                         ignoreItemCheck = true;
                         VersionsListView.Items.AddRange(items);
                         VersionsListView.AutoResizeColumns(ColumnHeaderAutoResizeStyle.ColumnContent);
@@ -359,7 +362,7 @@ private void Refresh(GUIMod gmod)
 
         private void UpdateStabilityToleranceComboBox(GUIMod gmod)
         {
-            if (currentInstance != null)
+            if (currentInstance != null && interactive)
             {
                 StabilityToleranceComboBox.Items.Clear();
                 StabilityToleranceComboBox.Items.AddRange(

diff --git a/GUI/Controls/Wait.cs b/GUI/Controls/Wait.cs
@@ -43,6 +43,8 @@ public void StartWaiting(Action<object?, DoWorkEventArgs?>             mainWork,
         public event Action? OnCancel;
         public event Action? OnOk;
 
+        public bool Busy => bgWorker.IsBusy;
+
         #pragma warning disable IDE0027
 
         public bool RetryEnabled

diff --git a/GUI/Main/Main.cs b/GUI/Main/Main.cs
@@ -38,6 +38,7 @@ public partial class Main : Form, IMessageFilter
         private readonly RepositoryDataManager repoData;
         private readonly string? userAgent;
         private readonly AutoUpdate updater = new AutoUpdate();
+        public bool Waiting => Wait.Busy;
 
         // Stuff we set when the game instance changes
         public GUIConfiguration? configuration;