Update KeyDefinition importer

Author: Invvard

src/InvvardDev.EZLayoutDisplay.Desktop/InvvardDev.EZLayoutDisplay.Desktop.csproj

@@ -83,11 +83,12 @@
     </ApplicationDefinition>
     <Compile Include="Helper\KeyContentTemplateSelector.cs" />
     <Compile Include="Helper\LoggerHelper.cs" />
-    <Compile Include="Model\Enum\KeyDisplayType.cs" />
+    <Compile Include="Model\Enum\KeyDisplayMode.cs" />
     <Compile Include="Model\Ez\Content\BaseContent.cs" />
     <Compile Include="Model\Ez\Content\ColorPicker.cs" />
     <Compile Include="Model\Ez\Content\Glyph.cs" />
     <Compile Include="Model\Ez\Content\Layer.cs" />
+    <Compile Include="Model\Enum\KeyCategory.cs" />
     <Compile Include="Model\ZsaModels\ErgodoxTag.cs" />
     <Compile Include="Model\ZsaModels\ErgodoxKeyFeature.cs" />
     <Compile Include="Model\KeyTemplate.cs" />
@@ -109,7 +110,6 @@
     <Compile Include="Model\Ez\Key.cs" />
     <Compile Include="Model\EZLayout.cs" />
     <Compile Include="Model\EZModifier.cs" />
-    <Compile Include="Model\Enum\KeyCategory.cs" />
     <Compile Include="Model\Dictionary\KeyDefinitionDictionary.cs" />
     <Compile Include="Model\Enum\SettingsName.cs" />
     <Compile Include="Model\EZLayer.cs" />

src/InvvardDev.EZLayoutDisplay.Desktop/Model/Enum/KeyCategory.cs

@@ -1,12 +1,75 @@
-namespace InvvardDev.EZLayoutDisplay.Desktop.Model.Enum
+/// <summary>
+/// KeyCategory.cs auto generated enumeration
+/// Generated on : 01/17/2022 00:00:29 (UTC)
+/// </summary>
+namespace InvvardDev.EZLayoutDisplay.Desktop.Model.Enum
 {
     public enum KeyCategory
     {
-        Base = 0,
-        DualFunction,
-        Macro,
-        CustomLabel,
-        Modifier,
-        ColorControl
+        Letters = 61,
+        Digit = 62,
+        Modifier = 63,
+        DualFunction = 64,
+        Layer = 65,
+        Punct = 66,
+        ShiftedPunct = 67,
+        Autoshift = 68,
+        Fn = 69,
+        Fw = 70,
+        Lang = 71,
+        LayerShortcuts = 72,
+        Media = 73,
+        Momentary = 74,
+        Mouse = 75,
+        Nav = 76,
+        Numpad = 77,
+        Int = 78,
+        Other = 79,
+        Shine = 80,
+        Spacing = 81,
+        Special = 82,
+        System = 83,
+        Audio = 84,
+        Macro = 85,
+        Toggle = 86,
+        Belgian = 87,
+        Bepo = 88,
+        Brazilian = 89,
+        Cms = 90,
+        French = 91,
+        Frenchca = 92,
+        German = 93,
+        Hungarian = 94,
+        Icelandic = 95,
+        Italian = 96,
+        Lithuanian = 97,
+        Danish = 98,
+        Slovenian = 99,
+        Portuguese = 100,
+        PortugueseOsx = 101,
+        Norwegian = 102,
+        Japanese = 103,
+        Korean = 104,
+        Nordic = 105,
+        Spanish = 106,
+        Spanishla = 107,
+        Swedish = 108,
+        SwissFrench = 109,
+        SwissGerman = 110,
+        Polish = 111,
+        Kazakh = 112,
+        Czech = 113,
+        Romanian = 114,
+        Russian = 115,
+        Uk = 116,
+        Ukranian = 117,
+        Usint = 118,
+        Estonian = 119,
+        Stenography = 120,
+        Disable = 121,
+        Croatian = 122,
+        Slovak = 123,
+        Turkish = 124,
     }
-}
+}
+

src/InvvardDev.EZLayoutDisplay.Desktop/Model/Enum/KeyDisplayMode.cs

@@ -0,0 +1,12 @@
+namespace InvvardDev.EZLayoutDisplay.Desktop.Model.Enum
+{
+    public enum KeyDisplayMode
+    {
+        Base = 0,
+        DualFunction = 1,
+        Macro = 2,
+        CustomLabel = 3,
+        Modifier = 4,
+        ColorControl = 5
+    }
+}

src/InvvardDev.EZLayoutDisplay.Desktop/Model/Enum/KeyDisplayType.cs

@@ -17,6 +17,6 @@ public class Key
         /// <summary>
         /// Gets or sets the key category.
         /// </summary>
-        public KeyCategory Category { get; set; }
+        public KeyDisplayMode DisplayMode { get; set; }
     }
 }

src/InvvardDev.EZLayoutDisplay.Desktop/Model/Ez/Key.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using InvvardDev.EZLayoutDisplay.Desktop.Model.Enum;
+using Newtonsoft.Json;
 
 namespace InvvardDev.EZLayoutDisplay.Desktop.Model
 {
@@ -27,5 +28,8 @@ public class KeyDefinition
         /// </summary>
         [JsonProperty("is_glyph", DefaultValueHandling = DefaultValueHandling.Ignore)]
         public bool IsGlyph { get; set; }
+
+        [JsonProperty("category")]
+        public KeyCategory Category { get; set; }
     }
 }

src/InvvardDev.EZLayoutDisplay.Desktop/Model/KeyDefinition.cs

@@ -11,12 +11,14 @@
 using InvvardDev.EZLayoutDisplay.Desktop.Helper;
 using InvvardDev.EZLayoutDisplay.Desktop.Model;
 using InvvardDev.EZLayoutDisplay.Desktop.Model.Enum;
+using InvvardDev.EZLayoutDisplay.Desktop.Model.Ez.Content;
 using InvvardDev.EZLayoutDisplay.Desktop.Model.Messenger;
 using InvvardDev.EZLayoutDisplay.Desktop.Properties;
 using InvvardDev.EZLayoutDisplay.Desktop.Service.Interface;
 using InvvardDev.EZLayoutDisplay.Desktop.View;
 using Newtonsoft.Json;
 using NLog;
+using Key = InvvardDev.EZLayoutDisplay.Desktop.Model.Ez.Key;
 
 namespace InvvardDev.EZLayoutDisplay.Desktop.ViewModel
 {
@@ -182,29 +184,25 @@ public bool IsWindowPinned
         /// Lost focus command.
         /// </summary>
         public ICommand LostFocusCommand =>
-            _lostFocusCommand
-            ?? (_lostFocusCommand = new RelayCommand(LostFocus, LostFocusCanExecute));
+            _lostFocusCommand ??= new RelayCommand(LostFocus, LostFocusCanExecute);
 
         /// <summary>
         /// Hide window command.
         /// </summary>
         public ICommand HideWindowCommand =>
-            _hideWindowCommand
-            ?? (_hideWindowCommand = new RelayCommand(LostFocus));
+            _hideWindowCommand ??= new RelayCommand(LostFocus);
 
         /// <summary>
         /// Next layer command.
         /// </summary>
         public ICommand NextLayerCommand =>
-            _nextLayerCommand
-            ?? (_nextLayerCommand = new RelayCommand(NextLayer, NextLayerCanExecute));
+            _nextLayerCommand ??= new RelayCommand(NextLayer, NextLayerCanExecute);
 
         /// <summary>
         /// Next layer command.
         /// </summary>
         public ICommand ScrollLayerCommand =>
-            _scrollLayerCommand
-            ?? (_scrollLayerCommand = new RelayCommand<MouseWheelEventArgs>(ScrollLayer));
+            _scrollLayerCommand ??= new RelayCommand<MouseWheelEventArgs>(ScrollLayer);
 
         #endregion
 
@@ -302,28 +300,28 @@ private void LoadDesignTimeModel()
 
             // ReSharper disable once UseObjectOrCollectionInitializer
             CurrentLayoutTemplate = new ObservableCollection<KeyTemplate>(layoutDefinition);
-            CurrentLayoutTemplate[0].EZKey = new EZKey
+            CurrentLayoutTemplate[0].Key = new Key
             {
-                Primary = new KeyFeature ("=", modifier: "Shift"),
-                DisplayMode = KeyDisplayMode.SingleFeature,
-                Color = "#111"
+                Primary = new BaseContent { Label = "Shift + =" },
+                DisplayMode = KeyDisplayMode.Base,
+                GlowColor = "#111"
             };
 
-            CurrentLayoutTemplate[1].EZKey = new EZKey
+            CurrentLayoutTemplate[1].Key = new Key
             {
-                Primary = new KeyFeature("LT \u2192 1"),
-                Secondary = new KeyFeature("LT \u2192 1"),
-                DisplayMode = KeyDisplayMode.DoubleFeature,
-                Color = "#BBB"
+                Primary = new Layer { Label = "\u2192", Id = 1 },
+                Secondary = new Layer { Label = "\u2192", Id = 2 },
+                DisplayMode = KeyDisplayMode.DualFunction,
+                GlowColor = "#BBB"
             };
 
             for (int i = 2; i < CurrentLayoutTemplate.Count; i++)
             {
-                CurrentLayoutTemplate[i].EZKey = new EZKey
+                CurrentLayoutTemplate[i].Key = new Key
                 {
-                    Primary = new KeyFeature("E", modifier: "Shift", tag: "fr"),
-                    DisplayMode = KeyDisplayMode.SingleFeature,
-                    Color = "#777"
+                    Primary = new BaseContent { Label = "Shift + E", Tag = "fr" },
+                    DisplayMode = KeyDisplayMode.Base,
+                    GlowColor = "#777"
                 };
             }
         }
@@ -334,13 +332,14 @@ private async Task PopulateLayoutTemplates(string geometry)
 
             foreach (var ezLayer in _ezLayout.EZLayers)
             {
-                if (!(await LoadLayoutDefinition(geometry) is List<KeyTemplate> layoutTemplate)) break;
+                if (await LoadLayoutDefinition(geometry) is not List<KeyTemplate> layoutTemplate)
+                    break;
 
                 if (layoutTemplate.Count == 0) return;
 
                 for (int j = 0; j < layoutTemplate.Count; j++)
                 {
-                    layoutTemplate[j].EZKey = ezLayer.Keys[j];
+                    layoutTemplate[j].Key = ezLayer.Keys[j];
                 }
 
                 _layoutTemplates.Add(layoutTemplate);

src/InvvardDev.EZLayoutDisplay.Desktop/Properties/keyDefinitions.json

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -15,4 +15,23 @@
     <ProjectReference Include="..\InvvardDev.EZLayoutDisplay.Desktop\InvvardDev.EZLayoutDisplay.Desktop.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="KeyCategory.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>KeyCategory.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="KeyCategory.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>KeyCategory.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+
 </Project>

src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs

@@ -0,0 +1,3 @@
+/// <summary>
+/// Moved to <see cref="InvvardDev.EZLayoutDisplay.Desktop.Model.Enum.KeyCategory">
+/// </summary>