Merge #3446 Show context menu on menu key press

CHANGELOG.md

@@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file.
 - [GUI] Label ordering buttons (#3416 by: HebaruSan; reviewed: DasSkelett)
 - [GUI] Suppress incompatibility warning at game launch (#3453 by: HebaruSan; reviewed: DasSkelett)
 - [CLI] Options for ckan show to hide sections (#3461 by: HebaruSan; reviewed: DasSkelett)
+- [Multiple] Show context menu on menu key press (#3446 by: HebaruSan; reviewed: DasSkelett)
 
 ### Bugfixes
 

ConsoleUI/Toolkit/ConsolePopupMenu.cs

@@ -76,6 +76,7 @@ public bool Run(ConsoleTheme theme, int right, int top)
                         break;
                     case ConsoleKey.F10:
                     case ConsoleKey.Escape:
+                    case ConsoleKey.Applications:
                         done = true;
                         break;
                 }

ConsoleUI/Toolkit/ConsoleScreen.cs

@@ -18,7 +18,7 @@ protected ConsoleScreen()
                 "F10", MenuTip(),
                 () => mainMenu != null
             );
-            AddBinding(Keys.F10, (object sender, ConsoleTheme theme) => {
+            AddBinding(new ConsoleKeyInfo[] {Keys.F10, Keys.Apps}, (object sender, ConsoleTheme theme) => {
                 bool val = true;
                 if (mainMenu != null) {
                     DrawSelectedHamburger(theme);

ConsoleUI/Toolkit/Keys.cs

@@ -74,6 +74,13 @@ public static class Keys {
             (System.Char)0, ConsoleKey.F10, false, false, false
         );
 
+        /// <summary>
+        /// Representation of Apps for key bindings
+        /// </summary>
+        public static readonly ConsoleKeyInfo Apps = new ConsoleKeyInfo(
+            (System.Char)0, ConsoleKey.Applications, false, false, false
+        );
+
         /// <summary>
         /// Representation of down arrow for key bindings
         /// </summary>

ConsoleUI/Toolkit/ScreenContainer.cs

@@ -75,6 +75,18 @@ public void AddBinding(ConsoleKeyInfo k, KeyAction a)
             }
         }
 
+        /// <summary>
+        /// Add custom key bindings
+        /// </summary>
+        /// <param name="keys">Keys to bind</param>
+        /// <param name="a">Action to bind to key</param>
+        public void AddBinding(IEnumerable<ConsoleKeyInfo> keys, KeyAction a)
+        {
+            foreach (ConsoleKeyInfo k in keys) {
+                AddBinding(k, a);
+            }
+        }
+
         /// <summary>
         /// Add a screen tip to show in the FooterBg
         /// </summary>
@@ -247,7 +259,7 @@ private void Blur(ScreenObject source, bool forward)
                 } while (!objects[focusIndex].Focusable());
             }
         }
-        
+
         private bool done = false;
 
         private List<ScreenObject> objects    = new List<ScreenObject>();

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)

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);

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;
+            }
+        }
+
     }
 }

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();