WinGui: Remove Usage of System.ComponentModel.DataAnnotations - DisplayName as it's not currently compatible with .NET standard.

6 files changed, 42 insertions, 47 deletions

diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioEncoder.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioEncoder.cs
index 3a3097521..2dd42c190 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioEncoder.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioEncoder.cs
@@ -18,75 +18,75 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
     /// </summary>
     public enum AudioEncoder
     {
-        [Display(Name = "AAC (avcodec)")]
+        [DisplayName("AAC (avcodec)")]
         [ShortName("av_aac")]
         ffaac,
 
-        [Display(Name = "AAC (FDK)")]
+        [DisplayName("AAC (FDK)")]
         [ShortName("fdk_aac")]
         fdkaac,
 
-        [Display(Name = "HE-AAC (FDK)")]
+        [DisplayName("HE-AAC (FDK)")]
         [ShortName("fdk_haac")]
         fdkheaac,
 
-        [Display(Name = "MP3")]
+        [DisplayName("MP3")]
         [ShortName("mp3")]
         Lame,
 
-        [Display(Name = "AC3")]
+        [DisplayName("AC3")]
         [ShortName("ac3")]
         Ac3,
 
-        [Display(Name = "Auto Passthru")]
+        [DisplayName("Auto Passthru")]
         [ShortName("copy")]
         Passthrough,
 
-        [Display(Name = "AC3 Passthru")]
+        [DisplayName("AC3 Passthru")]
         [ShortName("copy:ac3")]
         Ac3Passthrough,
 
-        [Display(Name = "E-AC3 Passthru")]
+        [DisplayName("E-AC3 Passthru")]
         [ShortName("copy:eac3")]
         EAc3Passthrough,
 
-        [Display(Name = "DTS Passthru")]
+        [DisplayName("DTS Passthru")]
         [ShortName("copy:dts")]
         DtsPassthrough,
 
-        [Display(Name = "DTS-HD Passthru")]
+        [DisplayName("DTS-HD Passthru")]
         [ShortName("copy:dtshd")]
         DtsHDPassthrough,
 
-        [Display(Name = "TrueHD Passthru")]
+        [DisplayName("TrueHD Passthru")]
         [ShortName("copy:truehd")]
         TrueHDPassthrough,
 
-        [Display(Name = "AAC Passthru")]
+        [DisplayName("AAC Passthru")]
         [ShortName("copy:aac")]
         AacPassthru,
 
-        [Display(Name = "MP3 Passthru")]
+        [DisplayName("MP3 Passthru")]
         [ShortName("copy:mp3")]
         Mp3Passthru,
 
-        [Display(Name = "Vorbis")]
+        [DisplayName("Vorbis")]
         [ShortName("vorbis")]
         Vorbis,
 
-        [Display(Name = "FLAC 16-bit")]
+        [DisplayName("FLAC 16-bit")]
         [ShortName("flac16")]
         ffflac,
 
-        [Display(Name = "FLAC 24-bit")]
+        [DisplayName("FLAC 24-bit")]
         [ShortName("flac24")]
         ffflac24,
 
-        [Display(Name = "FLAC Passthru")]
+        [DisplayName("FLAC Passthru")]
         [ShortName("copy:flac")]
         FlacPassthru,
 
-        [Display(Name = "Opus (libopus)")]
+        [DisplayName("Opus (libopus)")]
         [ShortName("opus")]
         Opus,
     }
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioEncoderRateType.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioEncoderRateType.cs
index d1cd21e5b..4b28d9f3d 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioEncoderRateType.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioEncoderRateType.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.Services.Encode.Model.Models
 {
-    using System.ComponentModel.DataAnnotations;
+    using HandBrake.ApplicationServices.Attributes;
 
     /// <summary>
     /// The audio encoder rate type.
@@ -19,13 +19,13 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
         /// <summary>
         /// The bitrate.
         /// </summary>
-        [Display(Name = "Bitrate: ")]
+        [DisplayName("Bitrate: ")]
         Bitrate, 
 
         /// <summary>
         /// The quality.
         /// </summary>
-        [Display(Name = "Quality: ")]
+        [DisplayName("Quality: ")]
         Quality, 
     }
 }
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/DenoisePreset.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/DenoisePreset.cs
index 80ef02d7d..45cfc968e 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/DenoisePreset.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/DenoisePreset.cs
@@ -18,27 +18,27 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
     /// </summary>
     public enum DenoisePreset
     {
-        [Display(Name = "Weak")]
+        [DisplayName("Weak")]
         [ShortName("weak")]
         Weak = 0,
 
-        [Display(Name = "Medium")]
+        [DisplayName("Medium")]
         [ShortName("medium")]
         Medium,
 
-        [Display(Name = "Strong")]
+        [DisplayName("Strong")]
         [ShortName("strong")]
         Strong,
 
-        [Display(Name = "Custom")]
+        [DisplayName("Custom")]
         [ShortName("custom")]
         Custom,
 
-        [Display(Name = "Ultralight")] // NLMeans only
+        [DisplayName("Ultralight")] // NLMeans only
         [ShortName("ultralight")]
         Ultralight,
 
-        [Display(Name = "Light")] // NLMeans only
+        [DisplayName("Light")] // NLMeans only
         [ShortName("light")]
         Light,
     }
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/DenoiseTune.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/DenoiseTune.cs
index 33776e256..8cb4aceb3 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/DenoiseTune.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/DenoiseTune.cs
@@ -18,31 +18,31 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
     /// </summary>
     public enum DenoiseTune
     {
-        [Display(Name = "None")]
+        [DisplayName("None")]
         [ShortName("none")]
         None = 0,
 
-        [Display(Name = "Film")]
+        [DisplayName("Film")]
         [ShortName("film")]
         Film,
 
-        [Display(Name = "Grain")]
+        [DisplayName("Grain")]
         [ShortName("grain")]
         Grain,
 
-        [Display(Name = "High Motion")]
+        [DisplayName("High Motion")]
         [ShortName("highmotion")]
         HighMotion,
 
-        [Display(Name = "Animation")]
+        [DisplayName("Animation")]
         [ShortName("animation")]
         Animation,
 
-        [Display(Name = "Tape")]
+        [DisplayName("Tape")]
         [ShortName("tape")]
         Tape,
 
-        [Display(Name = "Sprite")]
+        [DisplayName("Sprite")]
         [ShortName("sprite")]
         Sprite,
     }
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/OutputFormat.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/OutputFormat.cs
index d7e382b06..fee3236ec 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/OutputFormat.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/OutputFormat.cs
@@ -9,23 +9,18 @@
 
 namespace HandBrakeWPF.Services.Encode.Model.Models
 {
-    using System.ComponentModel;
-    using System.ComponentModel.DataAnnotations;
-
     using HandBrake.ApplicationServices.Attributes;
-
+    
     /// <summary>
     /// The Output format.
     /// </summary>
     public enum OutputFormat
     {
-        [Description("MP4")]
-        [Display(Name = "MP4")]
+        [DisplayName("MP4")]
         [ShortName("av_mp4")]
         Mp4 = 0,
 
-        [Description("MKV")]
-        [Display(Name = "MKV")]
+        [DisplayName("MKV")]
         [ShortName("av_mkv")]
         Mkv,
     }
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/PointToPointMode.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/PointToPointMode.cs
index 86f8d0133..4e52d1b8d 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/PointToPointMode.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/PointToPointMode.cs
@@ -9,23 +9,23 @@
 
 namespace HandBrakeWPF.Services.Encode.Model.Models
 {
-    using System.ComponentModel.DataAnnotations;
+    using HandBrake.ApplicationServices.Attributes;
 
     /// <summary>
     /// Point to Point Mode
     /// </summary>
     public enum PointToPointMode
     {
-        [Display(Name = "Chapters")]
+        [DisplayName("Chapters")]
         Chapters = 0,
 
-        [Display(Name = "Seconds")]
+        [DisplayName("Seconds")]
         Seconds,
 
-        [Display(Name = "Frames")]
+        [DisplayName("Frames")]
         Frames,
 
-        [Display(Name = "Preview")]
+        [DisplayName("Preview")]
         Preview,
     }
 }