From 18de0e026066b90c3da2cd689720a1fd23f4e597 Mon Sep 17 00:00:00 2001 From: Randy Date: Tue, 8 Jan 2019 21:32:10 -0800 Subject: [PATCH] Update for 2.9 Removal of the triple-byte keys as they are not supported by Windows --- SharpKeys/AssemblyInfo.cs | 4 +-- SharpKeys/Dialog_Main.cs | 53 +++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/SharpKeys/AssemblyInfo.cs b/SharpKeys/AssemblyInfo.cs index 548e0da..f10feb6 100644 --- a/SharpKeys/AssemblyInfo.cs +++ b/SharpKeys/AssemblyInfo.cs @@ -11,7 +11,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("RandyRants.com")] [assembly: AssemblyProduct("SharpKeys")] -[assembly: AssemblyCopyright("Copyright 2004 - 2018 RandyRants.com")] +[assembly: AssemblyCopyright("Copyright 2004 - 2019 RandyRants.com")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -26,4 +26,4 @@ // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("3.8.0.0")] +[assembly: AssemblyVersion("3.9.0.0")] diff --git a/SharpKeys/Dialog_Main.cs b/SharpKeys/Dialog_Main.cs index 05223a3..9ca328e 100644 --- a/SharpKeys/Dialog_Main.cs +++ b/SharpKeys/Dialog_Main.cs @@ -277,7 +277,7 @@ private void InitializeComponent() this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(379, 17); this.label1.TabIndex = 9; - this.label1.Text = "SharpKeys 3.8.0 - Copyright 2004 - 2018 RandyRants.com"; + this.label1.Text = "SharpKeys 3.9.0 - Copyright 2004 - 2019 RandyRants.com"; // // label2 // @@ -945,15 +945,15 @@ private void BuildParseTables() m_hashKeys.Add("00_64", "Function: F13"); m_hashKeys.Add("00_65", "Function: F14"); m_hashKeys.Add("00_66", "Function: F15"); - m_hashKeys.Add("00_67", "Function: F16"); // Mac keyboard - m_hashKeys.Add("00_68", "Function: F17"); // Mac keyboard - m_hashKeys.Add("00_69", "Function: F18"); // Mac keyboard - m_hashKeys.Add("00_6A", "Function: F19"); // Mac keyboard - m_hashKeys.Add("00_6B", "Function: F20"); // IBM Model F 122-keys - m_hashKeys.Add("00_6C", "Function: F21"); // IBM Model F 122-keys - m_hashKeys.Add("00_6D", "Function: F22"); // IBM Model F 122-keys - m_hashKeys.Add("00_6E", "Function: F23"); // IBM Model F 122-keys - m_hashKeys.Add("00_6F", "Function: F24"); // IBM Model F 122-keys + m_hashKeys.Add("00_67", "Function: F16"); // Mac keyboard + m_hashKeys.Add("00_68", "Function: F17"); // Mac keyboard + m_hashKeys.Add("00_69", "Function: F18"); // Mac keyboard + m_hashKeys.Add("00_6A", "Function: F19"); // Mac keyboard + m_hashKeys.Add("00_6B", "Function: F20"); // IBM Model F 122-keys + m_hashKeys.Add("00_6C", "Function: F21"); // IBM Model F 122-keys + m_hashKeys.Add("00_6D", "Function: F22"); // IBM Model F 122-keys + m_hashKeys.Add("00_6E", "Function: F23"); // IBM Model F 122-keys + m_hashKeys.Add("00_6F", "Function: F24"); // IBM Model F 122-keys m_hashKeys.Add("00_70", "Unknown: 0x0070"); m_hashKeys.Add("00_71", "Unknown: 0x0071"); @@ -978,8 +978,8 @@ private void BuildParseTables() m_hashKeys.Add("E0_04", "Unknown: 0xE004"); m_hashKeys.Add("E0_05", "Unknown: 0xE005"); m_hashKeys.Add("E0_06", "Unknown: 0xE006"); - m_hashKeys.Add("E0_07", "F-Lock: Redo"); // F3 - Redo - m_hashKeys.Add("E0_08", "F-Lock: Undo"); // F2 - Undo + m_hashKeys.Add("E0_07", "F-Lock: Redo"); + m_hashKeys.Add("E0_08", "F-Lock: Undo"); m_hashKeys.Add("E0_09", "Unknown: 0xE009"); m_hashKeys.Add("E0_0A", "Unknown: 0xE00A"); m_hashKeys.Add("E0_0B", "Unknown: 0xE00B"); @@ -1008,14 +1008,13 @@ private void BuildParseTables() m_hashKeys.Add("E0_20", "Media: Mute"); m_hashKeys.Add("E0_21", "App: Calculator"); m_hashKeys.Add("E0_22", "Media: Play/Pause"); - m_hashKeys.Add("E0_23", "F-Lock: Spell"); // F10 + m_hashKeys.Add("E0_23", "F-Lock: Spell"); m_hashKeys.Add("E0_24", "Media: Stop"); m_hashKeys.Add("E0_25", "Unknown: 0xE025"); m_hashKeys.Add("E0_26", "Unknown: 0xE026"); m_hashKeys.Add("E0_27", "Unknown: 0xE027"); m_hashKeys.Add("E0_28", "Unknown: 0xE028"); m_hashKeys.Add("E0_29", "Unknown: 0xE029"); - // m_hashKeys.Add("E0_2A", "Special: PrtSc"); // removed due to conflict m_hashKeys.Add("E0_2B", "Unknown: 0xE02B"); m_hashKeys.Add("E0_2C", "Unknown: 0xE02C"); m_hashKeys.Add("E0_2D", "Unknown: 0xE02D"); @@ -1034,18 +1033,18 @@ private void BuildParseTables() m_hashKeys.Add("E0_2038", "Special: Alt Gr"); m_hashKeys.Add("E0_39", "Unknown: 0xE039"); m_hashKeys.Add("E0_3A", "Unknown: 0xE03A"); - m_hashKeys.Add("E0_3B", "F-Lock: Help"); // F1 - m_hashKeys.Add("E0_3C", "F-Lock: Office Home"); // F2 - Office Home - m_hashKeys.Add("E0_3D", "F-Lock: Task Pane"); // F3 - Task pane - m_hashKeys.Add("E0_3E", "F-Lock: New"); // F4 - m_hashKeys.Add("E0_3F", "F-Lock: Open"); // F5 - - m_hashKeys.Add("E0_40", "F-Lock: Close"); // F6 - m_hashKeys.Add("E0_41", "F-Lock: Reply"); // F7 - m_hashKeys.Add("E0_42", "F-Lock: Fwd"); // F8 - m_hashKeys.Add("E0_43", "F-Lock: Send"); // F9 + m_hashKeys.Add("E0_3B", "F-Lock: Help"); + m_hashKeys.Add("E0_3C", "F-Lock: Office Home"); + m_hashKeys.Add("E0_3D", "F-Lock: Task Pane"); + m_hashKeys.Add("E0_3E", "F-Lock: New"); + m_hashKeys.Add("E0_3F", "F-Lock: Open"); + + m_hashKeys.Add("E0_40", "F-Lock: Close"); + m_hashKeys.Add("E0_41", "F-Lock: Reply"); + m_hashKeys.Add("E0_42", "F-Lock: Fwd"); + m_hashKeys.Add("E0_43", "F-Lock: Send"); m_hashKeys.Add("E0_44", "Unknown: 0xE044"); - m_hashKeys.Add("E0_45", "Special: €"); // Euro + m_hashKeys.Add("E0_45", "Special: €"); m_hashKeys.Add("E0_46", "Special: Break"); m_hashKeys.Add("E0_47", "Special: Home"); m_hashKeys.Add("E0_48", "Arrow: Up"); @@ -1064,8 +1063,8 @@ private void BuildParseTables() m_hashKeys.Add("E0_54", "Unknown: 0xE054"); m_hashKeys.Add("E0_55", "Unknown: 0xE055"); m_hashKeys.Add("E0_56", "Special: < > |"); - m_hashKeys.Add("E0_57", "F-Lock: Save"); // F11 - m_hashKeys.Add("E0_58", "F-Lock: Print"); // F12 + m_hashKeys.Add("E0_57", "F-Lock: Save"); + m_hashKeys.Add("E0_58", "F-Lock: Print"); m_hashKeys.Add("E0_59", "Unknown: 0xE059"); m_hashKeys.Add("E0_5A", "Unknown: 0xE05A"); m_hashKeys.Add("E0_5B", "Special: Left Windows");