Core - Renamed ProfileConfigurationHotkey to Hotkey

Avalonia - Added HotkeyBox

src/Artemis.Core/Models/ProfileConfiguration/Hotkey.cs

@@ -6,18 +6,18 @@ namespace Artemis.Core
     /// <summary>
     ///     Represents a key or combination of keys that changes the suspension status of a <see cref="ProfileConfiguration"/>
     /// </summary>
-    public class ProfileConfigurationHotkey : CorePropertyChanged, IStorageModel
+    public class Hotkey : CorePropertyChanged, IStorageModel
     {
 
         /// <summary>
-        ///     Creates a new instance of <see cref="ProfileConfigurationHotkey" />
+        ///     Creates a new instance of <see cref="Hotkey" />
         /// </summary>
-        public ProfileConfigurationHotkey()
+        public Hotkey()
         {
             Entity = new ProfileConfigurationHotkeyEntity();
         }
 
-        internal ProfileConfigurationHotkey(ProfileConfigurationHotkeyEntity entity)
+        internal Hotkey(ProfileConfigurationHotkeyEntity entity)
         {
             Entity = entity;
             Load();

src/Artemis.Core/Models/ProfileConfiguration/ProfileConfiguration.cs

@@ -104,12 +104,12 @@ namespace Artemis.Core
         /// <summary>
         ///     Gets or sets the hotkey used to enable or toggle the profile
         /// </summary>
-        public ProfileConfigurationHotkey? EnableHotkey { get; set; }
+        public Hotkey? EnableHotkey { get; set; }
 
         /// <summary>
         ///     Gets or sets the hotkey used to disable the profile
         /// </summary>
-        public ProfileConfigurationHotkey? DisableHotkey { get; set; }
+        public Hotkey? DisableHotkey { get; set; }
 
         /// <summary>
         ///     Gets the ID of the profile of this profile configuration
@@ -246,8 +246,8 @@ namespace Artemis.Core
                 ? new NodeScript<bool>("Activate profile", "Whether or not the profile should be active", Entity.ActivationCondition, this) 
                 : new NodeScript<bool>("Activate profile", "Whether or not the profile should be active", this);
 
-            EnableHotkey = Entity.EnableHotkey != null ? new ProfileConfigurationHotkey(Entity.EnableHotkey) : null;
-            DisableHotkey = Entity.DisableHotkey != null ? new ProfileConfigurationHotkey(Entity.DisableHotkey) : null;
+            EnableHotkey = Entity.EnableHotkey != null ? new Hotkey(Entity.EnableHotkey) : null;
+            DisableHotkey = Entity.DisableHotkey != null ? new Hotkey(Entity.DisableHotkey) : null;
         }
 
         /// <inheritdoc />

src/Artemis.Core/Services/Input/Enums/KeyboardModifierKey.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 
 namespace Artemis.Core.Services
 {
@@ -9,18 +10,23 @@ namespace Artemis.Core.Services
     public enum KeyboardModifierKey
     {
         /// <summary>No modifiers are pressed.</summary>
+        [Description("None")]
         None = 0,
 
         /// <summary>The ALT key.</summary>
+        [Description("Alt")]
         Alt = 1,
 
         /// <summary>The CTRL key.</summary>
+        [Description("Ctrl")]
         Control = 2,
 
         /// <summary>The SHIFT key.</summary>
+        [Description("Shift")]
         Shift = 4,
 
         /// <summary>The Windows logo key.</summary>
+        [Description("Win")]
         Windows = 8
     }
 }