Merge #4277 Fix broken version label in About dialog

KSP-CKAN · Dec 13, 2024 · 4a232bd · 4a232bd
2 parents 3e61fbe + 22e3edc
commit 4a232bd
Show file tree

Hide file tree

Showing 19 changed files with 83 additions and 57 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       unsigned-artifact-id: ${{ steps.upload-unsigned-artifact.outputs.artifact-id }}
     steps:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
     uses: ./.github/workflows/build.yml
   test-build:
     needs: build-debug
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Install runtime dependencies

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@ All notable changes to this project will be documented in this file.
 - [Core] Exclude dependencies in the changeset from supported by list (#4261 by: HebaruSan)
 - [GUI] Optimize label searches and handle spaces in names (#4270 by: HebaruSan)
 - [Core] Small performance tweaks for DLL scanning (#4275 by: HebaruSan)
+- [GUI] Fix broken version label in About dialog (#4277 by: HebaruSan)
 
 ### Internal
 

diff --git a/GUI/Controls/ModInfoTabs/Metadata.cs b/GUI/Controls/ModInfoTabs/Metadata.cs
@@ -153,10 +153,10 @@ private void LinkLabel_KeyDown(object? sender, KeyEventArgs? e)
         {
             if (sender is LinkLabel lbl)
             {
-                switch (e?.KeyCode)
+                switch (e)
                 {
-                    case Keys.Apps:
-                        Util.LinkContextMenu(lbl.Text);
+                    case {KeyCode: Keys.Apps}:
+                        Util.LinkContextMenu(lbl.Text, lbl);
                         e.Handled = true;
                         break;
                 }

diff --git a/GUI/Dialogs/AboutDialog.Designer.cs b/GUI/Dialogs/AboutDialog.Designer.cs
diff --git a/GUI/Dialogs/AboutDialog.cs b/GUI/Dialogs/AboutDialog.cs
@@ -14,7 +14,6 @@ public AboutDialog()
         {
             InitializeComponent();
             ApplyFormCompatibilityFixes();
-            StartPosition = FormStartPosition.CenterScreen;
             versionLabel.Text = string.Format(Properties.Resources.AboutDialogLabel2Text, Meta.GetVersion());
         }
 
@@ -30,10 +29,10 @@ private void linkLabel_KeyDown(object? sender, KeyEventArgs? e)
         {
             if (sender is LinkLabel l)
             {
-                switch (e?.KeyCode)
+                switch (e)
                 {
-                    case Keys.Apps:
-                        Util.LinkContextMenu(l.Text);
+                    case {KeyCode: Keys.Apps}:
+                        Util.LinkContextMenu(l.Text, l);
                         e.Handled = true;
                         break;
                 }

diff --git a/GUI/Main/Main.cs b/GUI/Main/Main.cs
@@ -162,7 +162,7 @@ public Main(string[]             cmdlineArgs,
             OnCacheChanged(null);
 
             tabController = new TabController(MainTabControl);
-            tabController.ShowTab("ManageModsTabPage");
+            tabController.ShowTab(ManageModsTabPage.Name);
 
             // Disable the modinfo controls until a mod has been choosen. This has an effect if the modlist is empty.
             ActiveModInfo = null;
@@ -235,7 +235,7 @@ protected override void OnShown(EventArgs e)
         {
             actuallyVisible = true;
 
-            tabController.RenameTab("WaitTabPage", Properties.Resources.MainLoadingGameInstance);
+            tabController.RenameTab(WaitTabPage.Name, Properties.Resources.MainLoadingGameInstance);
             ShowWaitDialog();
             DisableMainWindow();
             Wait.StartWaiting(
@@ -898,7 +898,7 @@ private void InstallFromCkanFiles(string[] files)
                 UpdateChangesDialog(toInstall.Select(m => new ModChange(m, GUIModChangeType.Install))
                                              .ToList(),
                                     null);
-                tabController.ShowTab("ChangesetTabPage", 1);
+                tabController.ShowTab(ChangesetTabPage.Name, 1);
             }
         }
 
@@ -992,7 +992,7 @@ private void ManageMods_OnChangeSetChanged(List<ModChange> changeset, Dictionary
         {
             if (changeset != null && changeset.Count != 0)
             {
-                tabController.ShowTab("ChangesetTabPage", 1, false);
+                tabController.ShowTab(ChangesetTabPage.Name, 1, false);
                 UpdateChangesDialog(
                     changeset,
                     conflicts.ToDictionary(item => item.Key.ToCkanModule(),
@@ -1001,7 +1001,7 @@ private void ManageMods_OnChangeSetChanged(List<ModChange> changeset, Dictionary
             }
             else
             {
-                tabController.HideTab("ChangesetTabPage");
+                tabController.HideTab(ChangesetTabPage.Name);
                 auditRecommendationsMenuItem.Enabled = true;
             }
         }
@@ -1153,12 +1153,12 @@ private void ManageMods_StartChangeSet(List<ModChange> changeset, Dictionary<GUI
             UpdateChangesDialog(changeset,
                                 conflicts?.ToDictionary(item => item.Key.ToCkanModule(),
                                                         item => item.Value));
-            tabController.ShowTab("ChangesetTabPage", 1);
+            tabController.ShowTab(ChangesetTabPage.Name, 1);
         }
 
         private void RefreshModList(bool allowAutoUpdate, Dictionary<string, bool>? oldModules = null)
         {
-            tabController.RenameTab("WaitTabPage", Properties.Resources.MainModListWaitTitle);
+            tabController.RenameTab(WaitTabPage.Name, Properties.Resources.MainModListWaitTitle);
             ShowWaitDialog();
             DisableMainWindow();
             ActiveModInfo = null;

diff --git a/GUI/Main/MainAutoUpdate.cs b/GUI/Main/MainAutoUpdate.cs
@@ -82,7 +82,7 @@ public void UpdateCKAN()
         {
             ShowWaitDialog();
             DisableMainWindow();
-            tabController.RenameTab("WaitTabPage", Properties.Resources.MainUpgradingWaitTitle);
+            tabController.RenameTab(WaitTabPage.Name, Properties.Resources.MainUpgradingWaitTitle);
             var mainConfig = ServiceLocator.Container.Resolve<IConfiguration>();
             var update = updater.GetUpdate(mainConfig.DevBuilds ?? false, userAgent);
             Wait.SetDescription(string.Format(Properties.Resources.MainUpgradingTo,

diff --git a/GUI/Main/MainChangeset.cs b/GUI/Main/MainChangeset.cs
@@ -36,7 +36,7 @@ private void Changeset_OnCancelChanges(bool reset)
             {
                 ManageMods.ClearChangeSet();
             }
-            tabController.ShowTab("ManageModsTabPage");
+            tabController.ShowTab(ManageModsTabPage.Name);
         }
 
         private void Changeset_OnConfirmChanges(List<ModChange> changeset)

diff --git a/GUI/Main/MainExport.cs b/GUI/Main/MainExport.cs
@@ -26,14 +26,14 @@ private void exportModPackToolStripMenuItem_Click(object? sender, EventArgs? e)
                 Task.Factory.StartNew(() =>
                 {
                     currentUser.RaiseMessage("");
-                    tabController.ShowTab("EditModpackTabPage", 2);
+                    tabController.ShowTab(EditModpackTabPage.Name, 2);
                     DisableMainWindow();
                     var mgr = RegistryManager.Instance(CurrentInstance, repoData);
                     EditModpack.LoadModule(mgr.GenerateModpack(false, true), mgr.registry);
                     // This will block till the user is done
                     EditModpack.Wait(currentUser);
-                    tabController.ShowTab("ManageModsTabPage");
-                    tabController.HideTab("EditModpackTabPage");
+                    tabController.ShowTab(ManageModsTabPage.Name);
+                    tabController.HideTab(EditModpackTabPage.Name);
                     EnableMainWindow();
                 });
             }

diff --git a/GUI/Main/MainHistory.cs b/GUI/Main/MainHistory.cs
@@ -13,7 +13,7 @@ private void installationHistoryStripMenuItem_Click(object? sender, EventArgs? e
             if (CurrentInstance != null && configuration != null)
             {
                 InstallationHistory.LoadHistory(CurrentInstance, configuration, repoData);
-                tabController.ShowTab("InstallationHistoryTabPage", 2);
+                tabController.ShowTab(InstallationHistoryTabPage.Name, 2);
             }
         }
 
@@ -30,15 +30,15 @@ private void InstallationHistory_Install(CkanModule[] modules)
                     CurrentInstance.StabilityToleranceConfig,
                     CurrentInstance.VersionCriteria());
                 UpdateChangesDialog(tuple.Item1.ToList(), tuple.Item2);
-                tabController.ShowTab("ChangesetTabPage", 1);
+                tabController.ShowTab(ChangesetTabPage.Name, 1);
             }
         }
 
         private void InstallationHistory_Done()
         {
             UpdateStatusBar();
-            tabController.ShowTab("ManageModsTabPage");
-            tabController.HideTab("InstallationHistoryTabPage");
+            tabController.ShowTab(ManageModsTabPage.Name);
+            tabController.HideTab(InstallationHistoryTabPage.Name);
         }
 
         private void InstallationHistory_OnSelectedModuleChanged(CkanModule m)

diff --git a/GUI/Main/MainImport.cs b/GUI/Main/MainImport.cs
@@ -36,7 +36,7 @@ private void ImportModules()
                         && dlg.FileNames.Length > 0)
                 {
                     // Show WaitTabPage (status page) and lock it.
-                    tabController.RenameTab("WaitTabPage", Properties.Resources.MainImportWaitTitle);
+                    tabController.RenameTab(WaitTabPage.Name, Properties.Resources.MainImportWaitTitle);
                     ShowWaitDialog();
                     DisableMainWindow();
                     Wait.StartWaiting(