Show mod context menu on menu key press

KSP-CKAN · Sep 5, 2021 · ef4ee26 · ef4ee26
1 parent 2a2b12e
commit ef4ee26
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 7 deletions.
diff --git a/GUI/Controls/ManageMods.cs b/GUI/Controls/ManageMods.cs
@@ -643,6 +643,11 @@ private void ModList_KeyDown(object sender, KeyEventArgs e)
                         }
                     }
                     break;
+
+                case Keys.Apps:
+                    ShowModContextMenu();
+                    e.Handled = true;
+                    break;
             }
         }
 
@@ -908,23 +913,31 @@ private void ModList_MouseDown(object sender, MouseEventArgs e)
         {
             var rowIndex = ModGrid.HitTest(e.X, e.Y).RowIndex;
 
-            // Ignore header column to prevent errors.
+            // Ignore header column to prevent errors
             if (rowIndex != -1 && e.Button == MouseButtons.Right)
             {
-                // Detect the clicked cell and select the row.
+                // Detect the clicked cell and select the row
                 ModGrid.ClearSelection();
                 ModGrid.Rows[rowIndex].Selected = true;
 
-                // Show the context menu.
-                ModListContextMenuStrip.Show(ModGrid, new Point(e.X, e.Y));
-
-                // Set the menu options.
-                var guiMod = (GUIMod)ModGrid.Rows[rowIndex].Tag;
+                // Show the context menu
+                ShowModContextMenu();
+            }
+        }
 
+        private bool ShowModContextMenu()
+        {
+            var guiMod = SelectedModule;
+            if (guiMod != null)
+            {
+                ModListContextMenuStrip.Show(Cursor.Position);
+                // Set the menu options
                 downloadContentsToolStripMenuItem.Enabled = !guiMod.ToModule().IsMetapackage &&  !guiMod.IsCached;
                 purgeContentsToolStripMenuItem.Enabled = !guiMod.ToModule().IsMetapackage && guiMod.IsCached;
                 reinstallToolStripMenuItem.Enabled = guiMod.IsInstalled && !guiMod.IsAutodetected;
+                return true;
             }
+            return false;
         }
 
         private void ModList_Resize(object sender, EventArgs e)

diff --git a/GUI/Controls/ModInfo.cs b/GUI/Controls/ModInfo.cs
@@ -118,6 +118,17 @@ private void LinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
             Util.HandleLinkClicked((sender as LinkLabel).Text, e);
         }
 
+        private void LinkLabel_KeyDown(object sender, KeyEventArgs e)
+        {
+            switch (e.KeyCode)
+            {
+                case Keys.Apps:
+                    Util.LinkContextMenu((sender as LinkLabel).Text);
+                    e.Handled = true;
+                    break;
+            }
+        }
+
         private void UpdateModInfo(GUIMod gui_module)
         {
             CkanModule module = gui_module.ToModule();
@@ -254,6 +265,7 @@ private void AddResourceLink(string label, Uri link)
                     Text     = link.ToString(),
                 };
                 llbl.LinkClicked += new LinkLabelLinkClickedEventHandler(LinkLabel_LinkClicked);
+                llbl.KeyDown += new KeyEventHandler(LinkLabel_KeyDown);
                 int row = MetaDataLowerLayoutPanel.RowCount;
                 MetaDataLowerLayoutPanel.Controls.Add(lbl,  0, row);
                 MetaDataLowerLayoutPanel.Controls.Add(llbl, 1, row);

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
@@ -17,5 +17,17 @@ private void linkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
             string url = (sender as LinkLabel).Text;
             Util.HandleLinkClicked(url, e);
         }
+
+        private void linkLabel_KeyDown(object sender, KeyEventArgs e)
+        {
+            switch (e.KeyCode)
+            {
+                case Keys.Apps:
+                    Util.LinkContextMenu((sender as LinkLabel).Text);
+                    e.Handled = true;
+                    break;
+            }
+        }
+
     }
 }
diff --git a/GUI/Dialogs/ManageGameInstancesDialog.Designer.cs b/GUI/Dialogs/ManageGameInstancesDialog.Designer.cs
diff --git a/GUI/Dialogs/ManageGameInstancesDialog.cs b/GUI/Dialogs/ManageGameInstancesDialog.cs
@@ -232,6 +232,17 @@ private void GameInstancesListView_Click(object sender, MouseEventArgs e)
             }
         }
 
+        private void GameInstancesListView_KeyDown(object sender, KeyEventArgs e)
+        {
+            switch (e.KeyCode)
+            {
+                case Keys.Apps:
+                    InstanceListContextMenuStrip.Show(Cursor.Position);
+                    e.Handled = true;
+                    break;
+            }
+        }
+
         private void OpenDirectoryMenuItem_Click(object sender, EventArgs e)
         {
             string path = _manager.Instances[(string) GameInstancesListView.SelectedItems[0].Tag].GameDir();