added custom keyboard json support

Aurora-RGB · Jan 17, 2023 · 2cf5dc7 · 2cf5dc7
1 parent 2ae3fe4
commit 2cf5dc7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/Project-Aurora/Project-Aurora/Settings/Configuration.cs b/Project-Aurora/Project-Aurora/Settings/Configuration.cs
@@ -166,6 +166,9 @@ public enum PreferredKeyboard
         [Description("Additional Lights (Debug)")]
         Debug = 3,
 
+        [Description("Custom Json")]
+        Custom = 4,
+
         /*
         [Description("Logitech")]
         Logitech = 1,

diff --git a/Project-Aurora/Project-Aurora/Settings/KeyboardLayoutManager.cs b/Project-Aurora/Project-Aurora/Settings/KeyboardLayoutManager.cs
@@ -8,15 +8,21 @@
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Forms;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using Aurora.Devices;
 using Aurora.Settings.Keycaps;
 using Aurora.Utils;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
+using Application = System.Windows.Application;
 using Color = System.Drawing.Color;
+using HorizontalAlignment = System.Windows.HorizontalAlignment;
 using Image = System.Windows.Controls.Image;
+using Label = System.Windows.Controls.Label;
+using MessageBox = System.Windows.MessageBox;
+using UserControl = System.Windows.Controls.UserControl;
 
 namespace Aurora.Settings;
 
@@ -591,6 +597,7 @@ private void LoadKeyboard(string layoutConfigPath)
     {
         if (!File.Exists(layoutConfigPath))
         {
+            MessageBox.Show( layoutConfigPath + " could not be found", "Layout not found", MessageBoxButton.OK);
             return;
         }
 

diff --git a/Project-Aurora/Project-Aurora/Settings/PeripheralLayoutMap.cs b/Project-Aurora/Project-Aurora/Settings/PeripheralLayoutMap.cs
@@ -46,6 +46,7 @@ public static class PeripheralLayoutMap
         {PreferredKeyboard.GenericLaptop, "generic_laptop.json"},
         {PreferredKeyboard.GenericLaptopNumpad, "generic_laptop_numpad.json"},
         {PreferredKeyboard.Debug, "additional_lights.json"},
+        {PreferredKeyboard.Custom, "custom_keyboard.json"},
         {PreferredKeyboard.Drevo_BladeMaster, "drevo_blademaster.json"},
         {PreferredKeyboard.Wooting_Two, "wooting_two.json"},
         {PreferredKeyboard.MSI_GP66_US, "msi_gp66_us.json"},