]> granicus.if.org Git - handbrake/commitdiff
WinGui: Remove Usage of System.ComponentModel.DataAnnotations - DisplayName as it...
authorsr55 <sr55.hb@outlook.com>
Fri, 17 Mar 2017 22:33:48 +0000 (22:33 +0000)
committersr55 <sr55.hb@outlook.com>
Fri, 17 Mar 2017 22:33:48 +0000 (22:33 +0000)
22 files changed:
win/CS/HandBrake.ApplicationServices/Attributes/DisplayName.cs [new file with mode: 0644]
win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Anamorphic.cs
win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Container.cs
win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/VideoEncoder.cs
win/CS/HandBrake.ApplicationServices/Model/VideoScaler.cs
win/CS/HandBrakeWPF/Converters/EnumToDescConverter.cs [deleted file]
win/CS/HandBrakeWPF/HandBrakeWPF.csproj
win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourModes.cs
win/CS/HandBrakeWPF/Model/Audio/AudioTrackDefaultsMode.cs
win/CS/HandBrakeWPF/Model/OptionsTab.cs
win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs
win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviourModes.cs
win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBurnInBehaviourModes.cs
win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioEncoder.cs
win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioEncoderRateType.cs
win/CS/HandBrakeWPF/Services/Encode/Model/Models/DenoisePreset.cs
win/CS/HandBrakeWPF/Services/Encode/Model/Models/DenoiseTune.cs
win/CS/HandBrakeWPF/Services/Encode/Model/Models/OutputFormat.cs
win/CS/HandBrakeWPF/Services/Encode/Model/Models/PointToPointMode.cs
win/CS/HandBrakeWPF/Services/Queue/Model/QueueItemStatus.cs
win/CS/HandBrakeWPF/Utilities/EnumHelper.cs

diff --git a/win/CS/HandBrake.ApplicationServices/Attributes/DisplayName.cs b/win/CS/HandBrake.ApplicationServices/Attributes/DisplayName.cs
new file mode 100644 (file)
index 0000000..e96c9ab
--- /dev/null
@@ -0,0 +1,35 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="DisplayName.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   A Display Name for an enum value
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Attributes
+{
+    using System;
+
+    /// <summary>
+    ///  A Short Name for an enum value
+    /// </summary>
+    public class DisplayName : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DisplayName"/> class.
+        /// </summary>
+        /// <param name="displayName">
+        /// The name name.
+        /// </param>
+        public DisplayName(string displayName)
+        {
+            this.Name = displayName;
+        }
+
+        /// <summary>
+        /// Gets the short name.
+        /// </summary>
+        public string Name { get; private set; }
+    }
+}
index 977794e1b98fab641261564baa553bcdd120cc8b..c5f5555e97d1270aaefad63129fb5f995ef38766 100644 (file)
@@ -55,7 +55,6 @@
       <Private>True</Private>\r
     </Reference>\r
     <Reference Include="System" />\r
-    <Reference Include="System.ComponentModel.DataAnnotations" />\r
     <Reference Include="System.Core">\r
       <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
     </Reference>\r
@@ -67,6 +66,7 @@
     <Reference Include="System.Xml" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <Compile Include="Attributes\DisplayName.cs" />\r
     <Compile Include="Attributes\ShortName.cs" />\r
     <Compile Include="Interop\EventArgs\EncodeCompletedEventArgs.cs" />\r
     <Compile Include="Interop\EventArgs\EncodeProgressEventArgs.cs" />\r
index b73829fc869c3e5164c5e322581b449bfcb60702..26ac4883c59618c04825606aeb7db6e1efa4bcc0 100644 (file)
@@ -9,8 +9,6 @@
 \r
 namespace HandBrake.ApplicationServices.Interop.Model.Encoding\r
 {\r
-    using System.ComponentModel.DataAnnotations;\r
-\r
     using HandBrake.ApplicationServices.Attributes;\r
 \r
     /// <summary>\r
@@ -18,16 +16,16 @@ namespace HandBrake.ApplicationServices.Interop.Model.Encoding
     /// </summary>\r
     public enum Anamorphic\r
     {\r
-        [Display(Name = "None")]\r
+        [DisplayName("None")]\r
         [ShortName("none")]\r
         None = 0,\r
-        [Display(Name = "Automatic")]\r
+        [DisplayName("Automatic")]\r
         [ShortName("auto")]\r
         Automatic = 4,\r
-        [Display(Name = "Loose")]\r
+        [DisplayName("Loose")]\r
         [ShortName("loose")]\r
         Loose = 2,\r
-        [Display(Name = "Custom")]\r
+        [DisplayName("Custom")]\r
         [ShortName("custom")]\r
         Custom = 3\r
     }\r
index 0140c5678ca7431721a2516c0e0e4046be401534..b8eab8dad61cd48d0a96afb9d3ee24240e3d4655 100644 (file)
@@ -10,7 +10,8 @@
 namespace HandBrake.ApplicationServices.Interop.Model.Encoding\r
 {\r
     using System;\r
-    using System.ComponentModel.DataAnnotations;\r
+\r
+    using HandBrake.ApplicationServices.Attributes;\r
 \r
     /// <summary>\r
     /// The container.\r
@@ -20,9 +21,9 @@ namespace HandBrake.ApplicationServices.Interop.Model.Encoding
     {\r
         None = 0x0,\r
 \r
-        [Display(Name = "MP4")]\r
+        [DisplayName("MP4")]\r
         MP4,\r
-        [Display(Name = "MKV")]\r
+        [DisplayName("MKV")]\r
         MKV\r
     }\r
 }\r
index 077b9a642cc405f7319a05f123f8b1a2ec413dea..e2b82db1d02010c034cd7f3a2d17b4c828374689 100644 (file)
@@ -9,8 +9,6 @@
 \r
 namespace HandBrake.ApplicationServices.Interop.Model.Encoding\r
 {\r
-    using System.ComponentModel.DataAnnotations;\r
-\r
     using HandBrake.ApplicationServices.Attributes;\r
 \r
     /// <summary>\r
@@ -18,55 +16,55 @@ namespace HandBrake.ApplicationServices.Interop.Model.Encoding
     /// </summary>\r
     public enum VideoEncoder\r
     {\r
-        [Display(Name = "H.264 (x264)")]\r
+        [DisplayName("H.264 (x264)")]\r
         [ShortName("x264")]\r
         X264 = 0,\r
 \r
-        [Display(Name = "H.264 10-bit (x264)")]\r
+        [DisplayName("H.264 10-bit (x264)")]\r
         [ShortName("x264_10bit")]\r
         X264_10,\r
 \r
-        [Display(Name = "H.264 (Intel QSV)")]\r
+        [DisplayName("H.264 (Intel QSV)")]\r
         [ShortName("qsv_h264")]\r
         QuickSync,\r
 \r
-        [Display(Name = "MPEG-4")]\r
+        [DisplayName("MPEG-4")]\r
         [ShortName("mpeg4")]\r
         FFMpeg,\r
 \r
-        [Display(Name = "MPEG-2")]\r
+        [DisplayName("MPEG-2")]\r
         [ShortName("mpeg2")]\r
         FFMpeg2,\r
 \r
-        [Display(Name = "Theora")]\r
+        [DisplayName("Theora")]\r
         [ShortName("theora")]\r
         Theora,\r
 \r
-        [Display(Name = "H.265 (x265)")]\r
+        [DisplayName("H.265 (x265)")]\r
         [ShortName("x265")]\r
         X265,\r
 \r
-        [Display(Name = "H.265 12-bit (x265)")]\r
+        [DisplayName("H.265 12-bit (x265)")]\r
         [ShortName("x265_12bit")]\r
         X265_12,\r
 \r
-        [Display(Name = "H.265 10-bit (x265)")]\r
+        [DisplayName("H.265 10-bit (x265)")]\r
         [ShortName("x265_10bit")]\r
         X265_10,\r
 \r
-        [Display(Name = "H.265 (Intel QSV)")]\r
+        [DisplayName("H.265 (Intel QSV)")]\r
         [ShortName("qsv_h265")]\r
         QuickSyncH265,\r
 \r
-        [Display(Name = "H.265 10-bit (Intel QSV)")]\r
+        [DisplayName("H.265 10-bit (Intel QSV)")]\r
         [ShortName("qsv_h265_10bit")]\r
         QuickSyncH26510b,\r
 \r
-        [Display(Name = "VP8")]\r
+        [DisplayName("VP8")]\r
         [ShortName("VP8")]\r
         VP8,\r
 \r
-        [Display(Name = "VP9")]\r
+        [DisplayName("VP9")]\r
         [ShortName("VP9")]\r
         VP9\r
     }\r
index 5d26040a87d364a718c83e0d6e6583f29f4832a0..6a7323ca1ad4c400e88359cde753258024f51b87 100644 (file)
@@ -9,8 +9,6 @@
 \r
 namespace HandBrake.ApplicationServices.Model\r
 {\r
-    using System.ComponentModel.DataAnnotations;\r
-\r
     using HandBrake.ApplicationServices.Attributes;\r
 \r
     /// <summary>\r
@@ -18,11 +16,11 @@ namespace HandBrake.ApplicationServices.Model
     /// </summary>\r
     public enum VideoScaler\r
     {\r
-        [Display(Name = "Lanczos (default)")]\r
+        [DisplayName("Lanczos (default)")]\r
         [ShortName("swscale")]\r
         Lanczos = 0,\r
 \r
-        [Display(Name = "Bicubic (OpenCL)")]\r
+        [DisplayName("Bicubic (OpenCL)")]\r
         [ShortName("opencl")]\r
         BicubicCl,\r
     }\r
diff --git a/win/CS/HandBrakeWPF/Converters/EnumToDescConverter.cs b/win/CS/HandBrakeWPF/Converters/EnumToDescConverter.cs
deleted file mode 100644 (file)
index 43c175e..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="EnumToDescConverter.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Enum to Description Converter
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Converters
-{
-    using System;
-    using System.ComponentModel;
-
-    using HandBrake.ApplicationServices.Utilities;
-
-    using HandBrakeWPF.Utilities;
-
-    /// <summary>
-    /// Enum to Description Converter
-    /// </summary>
-    public class EnumToDescConverter : EnumConverter
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnumToDescConverter"/> class.
-        /// </summary>
-        /// <param name="type">
-        /// The type.
-        /// </param>
-        public EnumToDescConverter(Type type)
-            : base(type)
-        {
-        }
-
-        /// <summary>
-        /// Convert To an Object.
-        /// </summary>
-        /// <param name="context">
-        /// The context.
-        /// </param>
-        /// <param name="culture">
-        /// The culture.
-        /// </param>
-        /// <param name="value">
-        /// The value.
-        /// </param>
-        /// <param name="destinationType">
-        /// The destination type.
-        /// </param>
-        /// <returns>
-        /// The Enum Object
-        /// </returns>
-        public override object ConvertTo(
-            ITypeDescriptorContext context,
-            System.Globalization.CultureInfo culture,
-            object value,
-            Type destinationType)
-        {
-            return EnumHelper<Enum>.GetDescription((Enum)value);
-        }
-    }
-}
index 6cf6ae4f64adc780652b9b7f6cb5094a25d7d81d..f984d0120a623d08f8dabd7a6662d18e6ffe037a 100644 (file)
     <Reference Include="PresentationFramework" />\r
     <Reference Include="PresentationFramework.Aero" />\r
     <Reference Include="System" />\r
-    <Reference Include="System.ComponentModel.DataAnnotations" />\r
     <Reference Include="System.Data" />\r
     <Reference Include="System.Drawing" />\r
     <Reference Include="System.Management" />\r
     <Compile Include="Converters\Audio\AudioRateTypeConverter.cs" />\r
     <Compile Include="Converters\Audio\AudioTrackDefaultBehaviourConverter.cs" />\r
     <Compile Include="Converters\Audio\AudioBehaviourConverter.cs" />\r
-    <Compile Include="Converters\EnumToDescConverter.cs" />\r
     <Compile Include="Converters\Filters\DenoisePresetConverter.cs" />\r
     <Compile Include="Converters\Options\FileSizeConverter.cs" />\r
     <Compile Include="Converters\Options\LogLevelConverter.cs" />\r
index 63d88cf21e2cec526237170d4d951b2b4f6e6a7b..3a3847b85b9b906d6bc339fc5ca8a70fb7c1f6d5 100644 (file)
@@ -18,15 +18,15 @@ namespace HandBrakeWPF.Model.Audio
     /// </summary>\r
     public enum AudioBehaviourModes\r
     {\r
-        [Display(Name = "No Audio")]\r
+        [DisplayName("No Audio")]\r
         [ShortName("none")]\r
         None = 0,\r
 \r
-        [Display(Name = "First Matching Selected Language")]\r
+        [DisplayName("First Matching Selected Language")]\r
         [ShortName("first")]\r
         FirstMatch,\r
 \r
-        [Display(Name = "All Matching Selected Languages")]\r
+        [DisplayName("All Matching Selected Languages")]\r
         [ShortName("all")]\r
         AllMatching,\r
     }\r
index 42f8770cf267f7ea56d082ca8273208a178767dc..475c39e94296f6093bde63560ad53e3457ac1a3f 100644 (file)
@@ -9,20 +9,20 @@
 \r
 namespace HandBrakeWPF.Model.Audio\r
 {\r
-    using System.ComponentModel.DataAnnotations;\r
+    using HandBrake.ApplicationServices.Attributes;\r
 \r
     /// <summary>\r
     /// The audio behaviours.\r
     /// </summary>\r
     public enum AudioTrackDefaultsMode\r
     {\r
-        [Display(Name = "Default")]\r
+        [DisplayName("Default")]\r
         None = 0,\r
 \r
-        [Display(Name = "Use First Track as template")]\r
+        [DisplayName("Use First Track as template")]\r
         FirstTrack,\r
 \r
-        [Display(Name = "Use All Tracks as templates")]\r
+        [DisplayName("Use All Tracks as templates")]\r
         AllTracks,\r
     }\r
 }\r
index b22807e46f7b81b40a22dc1a1b0ab18717960026..4a2c6122ad7e4c190608b1983e53beb3e69a3ab6 100644 (file)
@@ -9,29 +9,29 @@
 \r
 namespace HandBrakeWPF.Model\r
 {\r
-    using System.ComponentModel.DataAnnotations;\r
+    using HandBrake.ApplicationServices.Attributes;\r
 \r
     /// <summary>\r
     /// A enum representing each tab on the options screen.\r
     /// </summary>\r
     public enum OptionsTab\r
     {\r
-        [Display(Name = "General")]\r
+        [DisplayName("General")]\r
         General = 0,\r
 \r
-        [Display(Name = "Output Files")]\r
+        [DisplayName("Output Files")]\r
         OutputFiles,\r
 \r
-        [Display(Name = "Video")]\r
+        [DisplayName("Video")]\r
         Video,\r
 \r
-        [Display(Name = "Advanced")]\r
+        [DisplayName("Advanced")]\r
         Advanced,\r
 \r
-        [Display(Name = "Updates")]\r
+        [DisplayName("Updates")]\r
         Updates,\r
 \r
-        [Display(Name = "About HandBrake")]\r
+        [DisplayName("About HandBrake")]\r
         About,\r
     }\r
 }\r
index 51d77b8b01540eb88a614c8ca57fb66cbe204c1f..8ef06399fb6ffe3da7eeeb86a9efee50387af9b9 100644 (file)
@@ -9,18 +9,18 @@
 \r
 namespace HandBrakeWPF.Model.Picture\r
 {\r
-    using System.ComponentModel.DataAnnotations;\r
+    using HandBrake.ApplicationServices.Attributes;\r
 \r
     /// <summary>\r
     /// Picture Settings Mode when adding presets\r
     /// </summary>\r
     public enum PresetPictureSettingsMode\r
     {\r
-        [Display(Name = "None")]\r
+        [DisplayName("None")]\r
         None = 0,\r
-        [Display(Name = "Custom")]\r
+        [DisplayName("Custom")]\r
         Custom = 1,\r
-        [Display(Name = "Always use Source Resolution")]\r
+        [DisplayName("Always use Source Resolution")]\r
         SourceMaximum = 2,\r
     }\r
 }
\ No newline at end of file
index ed3e8ed5a025f34161128d70aef875fb58c281c3..ff50032ccb3ba6765bcb3b7a894e4e331e133478 100644 (file)
@@ -18,15 +18,15 @@ namespace HandBrakeWPF.Model.Subtitles
     /// </summary>\r
     public enum SubtitleBehaviourModes\r
     {\r
-        [Display(Name = "None")]\r
+        [DisplayName("None")]\r
         [ShortName("none")]\r
         None = 0,\r
 \r
-        [Display(Name = "First Matching Selected Language")]\r
+        [DisplayName("First Matching Selected Language")]\r
         [ShortName("first")]\r
         FirstMatch,\r
 \r
-        [Display(Name = "All Matching Selected Languages")]\r
+        [DisplayName("All Matching Selected Languages")]\r
         [ShortName("all")]\r
         AllMatching,\r
     }\r
index 193fc2a45ea3046f781b43bf9e792f724807fe11..d335a6f10f7e50a7fde58c9102978efbe1b13a7a 100644 (file)
@@ -9,8 +9,6 @@
 \r
 namespace HandBrakeWPF.Model.Subtitles\r
 {\r
-    using System.ComponentModel.DataAnnotations;\r
-\r
     using HandBrake.ApplicationServices.Attributes;\r
 \r
     /// <summary>\r
@@ -18,19 +16,19 @@ namespace HandBrakeWPF.Model.Subtitles
     /// </summary>\r
     public enum SubtitleBurnInBehaviourModes\r
     {\r
-        [Display(Name = "None")]\r
+        [DisplayName("None")]\r
         [ShortName("none")]\r
         None = 0,\r
 \r
-        [Display(Name = "Foreign Audio Track")]\r
+        [DisplayName("Foreign Audio Track")]\r
         [ShortName("foreign")]\r
         ForeignAudio,\r
 \r
-        [Display(Name = "First Track")]\r
+        [DisplayName("First Track")]\r
         [ShortName("first")]\r
         FirstTrack,\r
 \r
-        [Display(Name = "Foreign Audio Preferred, else First")]\r
+        [DisplayName("Foreign Audio Preferred, else First")]\r
         [ShortName("foreign_first")]\r
         ForeignAudioPreferred,\r
     }\r
index 3a3097521678a8fa033fa6e0d6903a012effd246..2dd42c190d79c8e50d1d1c48d188c921cc15f993 100644 (file)
@@ -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,
     }
index d1cd21e5b7f1c6f8f5bce3b4aa37346eee301865..4b28d9f3d03c7a134d3d62170f6aeadf22f61cb2 100644 (file)
@@ -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, 
     }
 }
index 80ef02d7d2da109579df43aae2f1743ee0f4d909..45cfc968e6de65a77cb93c9f56b23ff3a3fb6f2f 100644 (file)
@@ -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,
     }
index 33776e2565c0c33451eca3365d76606c9d77e5e6..8cb4aceb3ef576aea57ba8e8822499c2b88cdb41 100644 (file)
@@ -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,
     }
index d7e382b06ede4cd5b8ef0eda144bb045423db993..fee3236ec0b9b59e9c7905d941f235228a642357 100644 (file)
@@ -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,
     }
index 86f8d0133aabcab53f173096023757fc4e222e02..4e52d1b8d199c33f5399566ab302e409607cc577 100644 (file)
@@ -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,
     }
 }
index 92eab43e1f6ac4d8a4bde0ec41d5b120e2ca4a6f..38a93ee374e71aa3aa4cde826334dbd71759333c 100644 (file)
@@ -9,31 +9,23 @@
 \r
 namespace HandBrakeWPF.Services.Queue.Model\r
 {\r
-    using System.ComponentModel;\r
-    using System.ComponentModel.DataAnnotations;\r
-\r
-    using HandBrake.ApplicationServices.Converters;\r
+    using HandBrake.ApplicationServices.Attributes;\r
 \r
     /// <summary>\r
     /// Queue Item Status\r
     /// </summary>\r
-    [TypeConverter(typeof(EnumToDescConverter))]\r
     public enum QueueItemStatus\r
     {\r
-        [Description("Waiting")]\r
-        [Display(Name = "Waiting")]\r
+        [DisplayName("Waiting")]\r
         Waiting = 0,\r
 \r
-        [Description("In Progress")]\r
-        [Display(Name = "In Progress")]\r
+        [DisplayName("In Progress")]\r
         InProgress,\r
 \r
-        [Description("Completed")]\r
-        [Display(Name = "Completed")]\r
+        [DisplayName("Completed")]\r
         Completed,\r
 \r
-        [Description("Error")]\r
-        [Display(Name = "Error")]\r
+        [DisplayName("Error")]\r
         Error,\r
     }\r
 }\r
index 29202efe685fa505da32785d04900d19f2b3eb33..a39713862df0789c7dd1e93253723c8662c17fc3 100644 (file)
@@ -13,7 +13,6 @@ namespace HandBrakeWPF.Utilities
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
     using System.ComponentModel;
-    using System.ComponentModel.DataAnnotations;
     using System.Diagnostics;
     using System.Linq;
     using System.Reflection;
@@ -54,7 +53,7 @@ namespace HandBrakeWPF.Utilities
         public static string GetDisplay(T value)
         {
             FieldInfo fieldInfo = value.GetType().GetField(value.ToString());
-            DisplayAttribute[] attributes = (DisplayAttribute[])fieldInfo.GetCustomAttributes(typeof(DisplayAttribute), false);
+            ShortName[] attributes = (ShortName[])fieldInfo.GetCustomAttributes(typeof(ShortName), false);
 
             return (attributes.Length > 0) ? attributes[0].Name : value.ToString();
         }