1.1 --- a/Server/Events/EventHid.cs	Sat Aug 20 21:00:35 2016 +0200
     1.2 +++ b/Server/Events/EventHid.cs	Sun Aug 21 16:11:40 2016 +0200
     1.3 @@ -12,7 +12,7 @@
     1.4  namespace SharpDisplayManager
     1.5  {
     1.6      [DataContract]
     1.7 -    [Ear.AttributeObject(Id = "Event.Hid", Name = "HID", Description = "Corresponding HID message received.")]
     1.8 +    [Ear.AttributeObject(Id = "Event.Hid", Name = "HID", Description = "Handle input from Keyboards and Remotes.")]
     1.9      public class EventHid: Ear.Event
    1.10      {
    1.11          public EventHid()
    1.12 @@ -62,7 +62,7 @@
    1.13          public bool HasModifierWindows { get; set; } = false;
    1.14  
    1.15          [DataMember]
    1.16 -        public string PersistedBrief { get; set; } = "Press a key";
    1.17 +        public string UsageName { get; set; } = "Press a key";
    1.18  
    1.19  
    1.20  
    1.21 @@ -111,7 +111,7 @@
    1.22              }
    1.23              else if (IsGeneric)
    1.24              {
    1.25 -                brief += PersistedBrief;
    1.26 +                brief += UsageName;
    1.27              }
    1.28  
    1.29              if (IsKeyUp)
    1.30 @@ -133,15 +133,21 @@
    1.31          /// <returns></returns>
    1.32          public override bool Equals(object obj)
    1.33          {
    1.34 -            if (obj is EventHidKeyboard)
    1.35 +            if (obj is EventHid)
    1.36              {
    1.37 -                EventHidKeyboard e = (EventHidKeyboard)obj;
    1.38 +                EventHid e = (EventHid)obj;
    1.39                  return e.Key == Key
    1.40 -                        && e.IsKeyUp == IsKeyUp
    1.41 -                        && e.HasModifierAlt == HasModifierAlt
    1.42 -                        && e.HasModifierControl == HasModifierControl
    1.43 -                        && e.HasModifierShift == HasModifierShift
    1.44 -                        && e.HasModifierWindows == HasModifierWindows;
    1.45 +                    && e.Usage == Usage
    1.46 +                    && e.UsagePage == UsagePage
    1.47 +                    && e.UsageCollection == UsageCollection
    1.48 +                    && e.IsKeyUp == IsKeyUp
    1.49 +                    && e.IsGeneric == IsGeneric
    1.50 +                    && e.IsKeyboard == IsKeyboard
    1.51 +                    && e.IsMouse == IsMouse
    1.52 +                    && e.HasModifierAlt == HasModifierAlt
    1.53 +                    && e.HasModifierControl == HasModifierControl
    1.54 +                    && e.HasModifierShift == HasModifierShift
    1.55 +                    && e.HasModifierWindows == HasModifierWindows;
    1.56              }
    1.57  
    1.58              return false;
    1.59 @@ -230,7 +236,7 @@
    1.60                  if (aHidEvent.Usages.Count > 0)
    1.61                  {
    1.62                      Usage = aHidEvent.Usages[0];
    1.63 -                    PersistedBrief = aHidEvent.UsageName(0);
    1.64 +                    UsageName = aHidEvent.UsageName(0);
    1.65                  }
    1.66  
    1.67                  Key = Keys.None;
    1.68 @@ -251,6 +257,13 @@
    1.69  
    1.70          }
    1.71  
    1.72 -
    1.73 +        /// <summary>
    1.74 +        /// 
    1.75 +        /// </summary>
    1.76 +        /// <returns></returns>
    1.77 +        public override bool IsValid()
    1.78 +        {
    1.79 +            return IsGeneric || IsKeyboard;
    1.80 +        }
    1.81      }
    1.82  }