Shortcut for Friendly results #741

rappen · Jun 26, 2022 · 991a17e · 991a17e
1 parent 87200cd
commit 991a17e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 13 deletions.
diff --git a/FetchXmlBuilder/AppCode/Extensions.cs b/FetchXmlBuilder/AppCode/Extensions.cs
@@ -125,8 +125,10 @@ internal static string TriToString(this CheckState state, string uncheck, string
             {
                 case CheckState.Unchecked:
                     return uncheck;
+
                 case CheckState.Checked:
                     return check;
+
                 case CheckState.Indeterminate:
                     return indeterminate;
             }
@@ -141,5 +143,10 @@ internal static string RemoveEnd(this string text, string remove)
             }
             return text.Substring(0, text.Length - remove.Length);
         }
+
+        internal static bool KeyDown(this KeyEventArgs keyevent, Keys key, bool shift, bool control, bool alt)
+        {
+            return keyevent.KeyCode == key && keyevent.Shift == shift && keyevent.Control == control && keyevent.Alt == alt;
+        }
     }
 }
diff --git a/FetchXmlBuilder/DockControls/ResultGrid.Designer.cs b/FetchXmlBuilder/DockControls/ResultGrid.Designer.cs
diff --git a/FetchXmlBuilder/DockControls/ResultGrid.cs b/FetchXmlBuilder/DockControls/ResultGrid.cs
@@ -41,7 +41,7 @@ internal void SetData(QueryInfo queryinfo)
             RefreshData();
         }
 
-        private void ApplySettingsToGrid()
+        internal void ApplySettingsToGrid()
         {
             crmGridView1.ShowFriendlyNames = form.settings.Results.Friendly;
             crmGridView1.ShowIdColumn = form.settings.Results.Id;

diff --git a/FetchXmlBuilder/FXBInterfaces.cs b/FetchXmlBuilder/FXBInterfaces.cs
@@ -1,4 +1,5 @@
-using Cinteros.Xrm.FetchXmlBuilder.Forms;
+using Cinteros.Xrm.FetchXmlBuilder.AppCode;
+using Cinteros.Xrm.FetchXmlBuilder.Forms;
 using System;
 using System.Reflection;
 using System.Windows.Forms;
@@ -71,43 +72,48 @@ public void OnIncomingMessage(MessageBusEventArgs message)
 
         public void ReceiveKeyDownShortcut(KeyEventArgs e)
         {
-            if (e.KeyCode == Keys.F5 && tsbExecute.Enabled)
+            if (e.KeyDown(Keys.F5, false, false, false) && tsbExecute.Enabled)
             {
                 tsbExecute_Click(null, null);
             }
-            else if (e.Control && e.KeyCode == Keys.E && tsmiShowFetchXML.Enabled)
+            else if (e.KeyDown(Keys.E, false, true, false) && tsmiShowFetchXML.Enabled)
             {
                 tsmiShowFetchXML_Click(null, null);
             }
-            else if (e.Control && e.KeyCode == Keys.N && tsbNew.Enabled)
+            else if (e.KeyDown(Keys.N, false, true, false) && tsbNew.Enabled)
             {
                 tsbNew_Click(null, null);
             }
-            else if (e.Control && e.KeyCode == Keys.O && tsmiOpenFile.Enabled)
+            else if (e.KeyDown(Keys.O, false, true, false) && tsmiOpenFile.Enabled)
             {
                 tsmiOpenFile_Click(null, null);
             }
-            else if (e.Control && e.KeyCode == Keys.S && tsmiSaveFile.Enabled)
+            else if (e.KeyDown(Keys.S, false, true, false) && tsmiSaveFile.Enabled)
             {
                 tsmiSaveFile_Click(null, null);
             }
-            else if (e.KeyCode == Keys.F12 && tsmiSaveFileAs.Enabled)
+            else if (e.KeyDown(Keys.F12, false, false, false) && tsmiSaveFileAs.Enabled)
             {
                 tsmiSaveFileAs_Click(null, null);
             }
-            else if (e.Control && e.KeyCode == Keys.Z && tsbUndo.Enabled)
+            else if (e.KeyDown(Keys.Z, false, true, false) && tsbUndo.Enabled)
             {
                 tsbUndo_Click(null, null);
             }
-            else if (e.Control && e.KeyCode == Keys.Y && tsbRedo.Enabled)
+            else if (e.KeyDown(Keys.Y, false, true, false) && tsbRedo.Enabled)
             {
                 tsbRedo_Click(null, null);
             }
-            else if (e.Control && e.KeyCode == Keys.F)
+            else if (e.KeyDown(Keys.F, false, true, false))
             {
                 settings.UseFriendlyNames = !settings.UseFriendlyNames;
                 dockControlBuilder.ApplyCurrentSettings();
             }
+            else if (e.KeyDown(Keys.F, true, true, false))
+            {
+                settings.Results.Friendly = !settings.Results.Friendly;
+                dockControlGrid?.ApplySettingsToGrid();
+            }
         }
 
         public void ReceiveKeyPressShortcut(KeyPressEventArgs e)
@@ -212,6 +218,5 @@ private void ReturnToCaller()
             }
             OnOutgoingMessage(this, message);
         }
-
     }
-}
+}