More Results Panel Shortcuts

Added more options for results panel shortcuts.
Fixed a bug of results panel context menu not updating shortcut key texts.

Author: wise0704

External/Plugins/ResultsPanel/PluginMain.cs

@@ -29,6 +29,8 @@ public class PluginMain : IPlugin
         public Keys PrevError = Keys.Shift | Keys.F12;
         public Keys CopyEntry = Keys.Control | Keys.C;
         public Keys IgnoreEntry = Keys.Delete;
+        public Keys ClearResults = Keys.None;
+        public Keys ClearIgnoredEntries = Keys.None;
 
         #region Required Properties
 
@@ -157,35 +159,31 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
 
                 case EventType.Keys:
                     KeyEvent ke = (KeyEvent)e;
-                    if (ke.Value == this.NextError)
+                    if (ke.Value == this.pluginUI.nextEntry.ShortcutKeys)
                     {
                         ke.Handled = true;
                         this.pluginUI.NextEntry(null, null);
                     }
-                    else if (ke.Value == this.PrevError)
+                    else if (ke.Value == this.pluginUI.previousEntry.ShortcutKeys)
                     {
                         ke.Handled = true;
                         this.pluginUI.PreviousEntry(null, null);
                     }
-                    else if (ke.Value == this.CopyEntry)
+                    else if (ke.Value == this.pluginUI.copyEntryContextMenuItem.ShortcutKeys)
                     {
                         ke.Handled = pluginUI.CopyTextShortcut();
                     }
-                    else if (ke.Value == this.IgnoreEntry)
+                    else if (ke.Value == this.pluginUI.ignoreEntryContextMenuItem.ShortcutKeys)
                     {
                         ke.Handled = pluginUI.IgnoreEntryShortcut();
                     }
-                    break;
-
-                case EventType.Shortcut:
-                    DataEvent de = (DataEvent)e;
-                    if (de.Action == "ResultsPanel.ShowNextResult")
+                    else if (ke.Value == this.pluginUI.clearEntriesContextMenuItem.ShortcutKeys)
                     {
-                        this.NextError = (Keys)de.Data;
+                        ke.Handled = pluginUI.ClearOutput();
                     }
-                    else if (de.Action == "ResultsPanel.ShowPrevResult")
+                    else if (ke.Value == this.pluginUI.clearIgnoredEntriesContextMenuItem.ShortcutKeys)
                     {
-                        this.PrevError = (Keys)de.Data;
+                        ke.Handled = pluginUI.ClearIgnoredEntries();
                     }
                     break;
             }
@@ -246,8 +244,11 @@ public void CreateMenuItem()
             String title = TextHelper.GetString("Label.ViewMenuItem");
             ToolStripMenuItem viewMenu = (ToolStripMenuItem)PluginBase.MainForm.FindMenuItem("ViewMenu");
             ToolStripMenuItem viewItem = new ToolStripMenuItem(title, this.pluginImage, new EventHandler(this.OpenPanel));
-            PluginBase.MainForm.RegisterShortcutItem("ResultsPanel.ShowNextResult", this.NextError);
-            PluginBase.MainForm.RegisterShortcutItem("ResultsPanel.ShowPrevResult", this.PrevError);
+            PluginBase.MainForm.RegisterShortcutItem("ResultsPanel.ShowNextResult", this.pluginUI.nextEntry);
+            PluginBase.MainForm.RegisterShortcutItem("ResultsPanel.ShowPrevResult", this.pluginUI.previousEntry);
+            PluginBase.MainForm.RegisterShortcutItem("ResultsPanel.IgnoreEntry", this.pluginUI.ignoreEntryContextMenuItem);
+            PluginBase.MainForm.RegisterShortcutItem("ResultsPanel.ClearResults", this.pluginUI.clearEntriesContextMenuItem);
+            PluginBase.MainForm.RegisterShortcutItem("ResultsPanel.ClearIgnoredEntries", this.pluginUI.clearIgnoredEntriesContextMenuItem);
             PluginBase.MainForm.RegisterShortcutItem("ViewMenu.ShowResults", viewItem);
             viewMenu.DropDownItems.Add(viewItem);
         }
@@ -261,7 +262,7 @@ public void CreatePluginPanel()
             this.pluginUI.Text = TextHelper.GetString("Title.PluginPanel");
             this.pluginPanel = PluginBase.MainForm.CreateDockablePanel(this.pluginUI, this.pluginGuid, this.pluginImage, DockState.DockBottomAutoHide);
         }
-
+        
         /// <summary>
         /// Opens the plugin panel if closed
         /// </summary>

External/Plugins/ResultsPanel/PluginUI.cs

@@ -19,18 +19,19 @@ namespace ResultsPanel
 {
     public class PluginUI : DockPanelControl
     {
+        public ToolStripMenuItem clearEntriesContextMenuItem;
+        public ToolStripMenuItem copyEntryContextMenuItem;
+        public ToolStripMenuItem ignoreEntryContextMenuItem;
+        public ToolStripMenuItem clearIgnoredEntriesContextMenuItem;
+        public ToolStripMenuItem nextEntry;
+        public ToolStripMenuItem previousEntry;
+
         private ListViewEx entriesView;
         private ColumnHeader entryFile;
         private ColumnHeader entryDesc;
         private ColumnHeader entryLine;
         private ColumnHeader entryPath;
         private ColumnHeader entryType;
-        private ToolStripMenuItem nextEntry;
-        private ToolStripMenuItem previousEntry;
-        private ToolStripMenuItem ignoreEntriesContextMenuItem;
-        private ToolStripMenuItem ignoreEntryContextMenuItem;
-        private ToolStripMenuItem copyEntryContextMenuItem;
-        private ToolStripMenuItem clearIgnoredEntriesContextMenuItem;
         private IDictionary<String, Boolean> ignoredEntries;
         private List<ListViewItem> allListViewItems = new List<ListViewItem>();
         private ToolStripButton toolStripButtonError;
@@ -267,22 +268,24 @@ public void InitializeGraphics()
         public void InitializeContextMenu()
         {
             ContextMenuStrip menu = new ContextMenuStrip();
-            this.ignoreEntriesContextMenuItem = new ToolStripMenuItem(TextHelper.GetString("Label.ClearEntries"), null, new EventHandler(this.ClearOutputClick));
-            menu.Items.Add(this.ignoreEntriesContextMenuItem);
+            this.clearEntriesContextMenuItem = new ToolStripMenuItem(TextHelper.GetString("Label.ClearEntries"), null, new EventHandler(this.ClearOutputClick));
+            this.clearEntriesContextMenuItem.ShortcutKeys = this.pluginMain.ClearResults;
+            menu.Items.Add(this.clearEntriesContextMenuItem);
             this.copyEntryContextMenuItem = new ToolStripMenuItem(TextHelper.GetString("Label.CopyEntry"), null, new EventHandler(this.CopyTextClick));
-            this.copyEntryContextMenuItem.ShortcutKeyDisplayString = DataConverter.KeysToString(this.pluginMain.CopyEntry);
+            this.copyEntryContextMenuItem.ShortcutKeys = this.pluginMain.CopyEntry;
             menu.Items.Add(this.copyEntryContextMenuItem);
             this.ignoreEntryContextMenuItem = new ToolStripMenuItem(TextHelper.GetString("Label.IgnoreEntry"), null, new EventHandler(this.IgnoreEntryClick));
-            this.ignoreEntryContextMenuItem.ShortcutKeyDisplayString = DataConverter.KeysToString(this.pluginMain.IgnoreEntry);
+            this.ignoreEntryContextMenuItem.ShortcutKeys = this.pluginMain.IgnoreEntry;
             menu.Items.Add(this.ignoreEntryContextMenuItem);
-            this.clearIgnoredEntriesContextMenuItem = new ToolStripMenuItem(TextHelper.GetString("Label.ClearIgnoredEntries"), null, new EventHandler(this.ClearIgnoredEntries));
+            this.clearIgnoredEntriesContextMenuItem = new ToolStripMenuItem(TextHelper.GetString("Label.ClearIgnoredEntries"), null, new EventHandler(this.ClearIgnoredEntriesClick));
+            this.clearIgnoredEntriesContextMenuItem.ShortcutKeys = this.pluginMain.ClearIgnoredEntries;
             menu.Items.Add(this.clearIgnoredEntriesContextMenuItem);
             menu.Items.Add(new ToolStripSeparator());
             this.nextEntry = new ToolStripMenuItem(TextHelper.GetString("Label.NextEntry"), null, new EventHandler(this.NextEntry));
-            this.nextEntry.ShortcutKeyDisplayString = DataConverter.KeysToString(this.pluginMain.NextError);
+            this.nextEntry.ShortcutKeys = this.pluginMain.NextError;
             menu.Items.Add(this.nextEntry);
             this.previousEntry = new ToolStripMenuItem(TextHelper.GetString("Label.PreviousEntry"), null, new EventHandler(this.PreviousEntry));
-            this.previousEntry.ShortcutKeyDisplayString = DataConverter.KeysToString(this.pluginMain.PrevError);
+            this.previousEntry.ShortcutKeys = this.pluginMain.PrevError;
             menu.Items.Add(this.previousEntry);
             this.entriesView.ContextMenuStrip = menu;
             menu.Font = PluginBase.Settings.DefaultFont;
@@ -389,10 +392,17 @@ public void CopyTextClick(Object sender, System.EventArgs e)
         /// <summary>
         /// Clears any result entries that are ignored. Invoked from the context menu.
         /// </summary>
-        public void ClearIgnoredEntries(Object sender, System.EventArgs e)
+        public void ClearIgnoredEntriesClick(Object sender, System.EventArgs e)
+        {
+            ClearIgnoredEntries();
+        }
+
+        public bool ClearIgnoredEntries()
         {
+            if (this.ignoredEntries.Count == 0) return false;
             this.ignoredEntries.Clear();
             this.FilterResults(false);
+            return true;
         }
 
         /// <summary>
@@ -452,7 +462,7 @@ private void PluginUIResize(object sender, EventArgs e)
         /// </summary>
         private void ContextMenuOpening(object sender, System.ComponentModel.CancelEventArgs e)
         {
-            this.nextEntry.Enabled = this.previousEntry.Enabled = this.ignoreEntriesContextMenuItem.Enabled = this.entriesView.Items.Count > 0;
+            this.nextEntry.Enabled = this.previousEntry.Enabled = this.clearEntriesContextMenuItem.Enabled = this.entriesView.Items.Count > 0;
             this.ignoreEntryContextMenuItem.Enabled = this.copyEntryContextMenuItem.Enabled = this.entriesView.SelectedItems.Count > 0;
             this.clearIgnoredEntriesContextMenuItem.Enabled = this.ignoredEntries.Count > 0;
         }
@@ -556,8 +566,10 @@ private void MBSafeSetSelAndFocus(ScintillaControl sci, Int32 line, Int32 startP
         /// <summary>
         /// Clears the output
         /// </summary>
-        public void ClearOutput()
+        public bool ClearOutput()
         {
+            if (!this.clearEntriesContextMenuItem.Enabled) return false;
+
             this.ClearSquiggles();
             this.allListViewItems.Clear();
             this.toolStripTextBoxFilter.Text = "";
@@ -566,6 +578,7 @@ public void ClearOutput()
             this.DisableContextMenuItems();
             this.entryIndex = -1;
             this.UpdateButtons();
+            return true;
         }
 
         /// <summary>