WinGui: Use OutputFormat display name, rather than the enum name.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6330 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
index be719701b47b1b91f446b676919cdcaf2951fa09..201ffc1e1ea6c0a378992ac621657838e83b156c 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
@@ -518,7 +518,7 @@ namespace HandBrake.ApplicationServices.Model
         {\r
             get\r
             {\r
-                if (this.OutputFormat == OutputFormat.M4V || this.OutputFormat == OutputFormat.Mp4)\r
+                if (this.OutputFormat == OutputFormat.Mp4)\r
                 {\r
                     bool audio = this.AudioTracks.Any(item => item.Encoder == AudioEncoder.Ac3Passthrough ||\r
                         item.Encoder == AudioEncoder.Ac3 || item.Encoder == AudioEncoder.DtsPassthrough || item.Encoder == AudioEncoder.Passthrough);\r

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs
index d083e853cda580d65a6cb1a137bcfeb71bd14773..828746f17666106f3a1e8fb10a5854f0329eb752 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs
@@ -10,6 +10,7 @@
 namespace HandBrake.ApplicationServices.Model.Encoding\r
 {\r
     using System.ComponentModel;\r
+    using System.ComponentModel.DataAnnotations;\r
 \r
     /// <summary>\r
     /// The Output format.\r
@@ -17,12 +18,11 @@ namespace HandBrake.ApplicationServices.Model.Encoding
     public enum OutputFormat\r
     {\r
         [Description("MP4")]\r
+        [Display(Name = "MP4")]\r
         Mp4 = 0,\r
 \r
-        [Description("M4V")]\r
-        M4V,\r
-\r
         [Description("MKV")]\r
+        [Display(Name = "MKV")]\r
         Mkv,\r
     }\r
 }\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
index 9e8bc3c32ed0dc24c0fb812ebb94b7c98aeaeecb..970fb5c97bdd2d5a409dc29f7d823a8e7b25b042 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
@@ -129,7 +129,6 @@ namespace HandBrake.ApplicationServices.Utilities
             switch (work.OutputFormat)\r
             {\r
                 case OutputFormat.Mp4:\r
-                case OutputFormat.M4V:\r
                     profile.ContainerName = "av_mp4"; // TODO make part of enum.\r
                     break;\r
                 case OutputFormat.Mkv:\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
index 70a7b9403bbb88c0ef85b15ed978b4e6f8eb66b9..08c746ba093462d8980818138b49ceab65315570 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
@@ -136,7 +136,7 @@ namespace HandBrake.ApplicationServices.Utilities
 \r
             AddEncodeElement(xmlWriter, "ChapterMarkers", "integer", parsed.IncludeChapterMarkers ? "1" : "0");\r
             AddEncodeElement(xmlWriter, "Default", "integer", "0");\r
-            AddEncodeElement(xmlWriter, "FileFormat", "string", (parsed.OutputFormat == OutputFormat.Mp4 || parsed.OutputFormat == OutputFormat.M4V) ? "MP4 file" : "MKV file");\r
+            AddEncodeElement(xmlWriter, "FileFormat", "string", (parsed.OutputFormat == OutputFormat.Mp4) ? "MP4 file" : "MKV file");\r
             AddBooleanElement(xmlWriter, "Folder", false);\r
             AddEncodeElement(xmlWriter, "Mp4HttpOptimize", "integer", parsed.OptimizeMP4 ? "1" : "0");\r
             AddEncodeElement(xmlWriter, "Mp4iPodCompatible", "integer", parsed.IPod5GSupport ? "1" : "0");\r

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Container.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Container.cs
index 08f33caff5f7fcef6ae749c064e112c1d85039da..50261cfdc8344d02591af5ce37ffe1583fbaa9b7 100644 (file)
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Container.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Container.cs
@@ -21,8 +21,8 @@ namespace HandBrake.Interop.Model.Encoding
                None = 0x0,
 
                [Display(Name = "MP4")]
-               Mp4,
+               MP4,
                [Display(Name = "MKV")]
-               Mkv
+               MKV
        }
 }

diff --git a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
index 9214745e8563fedb18f3f27ddfa2d2c2b1f6df12..e0aceaf258620c1e881acb97b64befdb0c90d3ce 100644 (file)
--- a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
@@ -15,6 +15,7 @@ namespace HandBrakeWPF.Converters
     using System;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
+    using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r
     using HandBrake.Interop.Model.Encoding.x264;\r
@@ -69,7 +70,6 @@ namespace HandBrakeWPF.Converters
             {\r
                 return EnumHelper<QsvPreset>.GetDisplay((QsvPreset)value);\r
             }\r
- \r
             if (value is IEnumerable<PresetPictureSettingsMode>)\r
             {\r
                 return EnumHelper<PresetPictureSettingsMode>.GetEnumDisplayValues(typeof(PresetPictureSettingsMode));\r
@@ -90,11 +90,14 @@ namespace HandBrakeWPF.Converters
             {\r
                 return EnumHelper<Denoise>.GetEnumDisplayValues(typeof(Denoise));\r
             }\r
-\r
             if (value is IEnumerable<VideoScaler>)\r
             {\r
                 return EnumHelper<VideoScaler>.GetEnumDisplayValues(typeof(VideoScaler));\r
             }\r
+            if (value is IEnumerable<OutputFormat>)\r
+            {\r
+                return EnumHelper<OutputFormat>.GetEnumDisplayValues(typeof(OutputFormat));\r
+            }\r
 \r
             // Single Items\r
             if (targetType == typeof(x264Preset) || value.GetType() == typeof(x264Preset))\r
@@ -148,6 +151,11 @@ namespace HandBrakeWPF.Converters
                 return EnumHelper<VideoScaler>.GetDisplay((VideoScaler)value);\r
             }\r
 \r
+            if (targetType == typeof(OutputFormat) || value.GetType() == typeof(OutputFormat))\r
+            {\r
+                return EnumHelper<OutputFormat>.GetDisplay((OutputFormat)value);\r
+            }\r
+\r
             return null;\r
         }\r
 \r
@@ -223,6 +231,11 @@ namespace HandBrakeWPF.Converters
                 return EnumHelper<VideoScaler>.GetValue(value.ToString());\r
             }\r
 \r
+            if (targetType == typeof(OutputFormat) || value.GetType() == typeof(OutputFormat))\r
+            {\r
+                return EnumHelper<OutputFormat>.GetValue(value.ToString());\r
+            }\r
+\r
             return null;\r
         }\r
     }\r

diff --git a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
index 0c521661b5da28166fc2631a0c3bd2348ac5c48e..1c5a2f9552661343bc1bdf84bd219b56eddcc092 100644 (file)
--- a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
+++ b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
@@ -110,7 +110,7 @@ namespace HandBrakeWPF.Helpers
                 /*\r
                  * File Extension\r
                  */\r
-                if (task.OutputFormat == OutputFormat.Mp4 || task.OutputFormat == OutputFormat.M4V)\r
+                if (task.OutputFormat == OutputFormat.Mp4)\r
                 {\r
                     switch (userSettingService.GetUserSetting<int>(UserSettingConstants.UseM4v))\r
                     {\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index c91a917f82e2815437e69e961a6f7ba4fb562124..fafc1ce2bcbf04080e56ee11758e9410775dfc41 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1527,10 +1527,8 @@ namespace HandBrakeWPF.ViewModels
                             this.SelectedOutputFormat = OutputFormat.Mkv;\r
                             break;\r
                         case ".mp4":\r
-                            this.SelectedOutputFormat = OutputFormat.Mp4;\r
-                            break;\r
                         case ".m4v":\r
-                            this.SelectedOutputFormat = OutputFormat.M4V;\r
+                            this.SelectedOutputFormat = OutputFormat.Mp4;\r
                             break;\r
                     }\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index 0219c49af47e5abe0ed868ff26145e37c7cc70cd..0161c562bbac05f4ca6c4ab7883e15219b3c8999 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -590,7 +590,7 @@ namespace HandBrakeWPF.ViewModels
 \r
             if ((source.SubtitleType == SubtitleType.PGS || source.SubtitleType == SubtitleType.VobSub || source.SubtitleType == SubtitleType.ForeignAudioSearch)\r
                 && this.Task != null\r
-                && (this.Task.OutputFormat == OutputFormat.Mp4 || this.Task.OutputFormat == OutputFormat.M4V))\r
+                && this.Task.OutputFormat == OutputFormat.Mp4)\r
             {\r
                 if (track.CanBeBurned)\r
                 {\r

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 15452b20169fdba66647afdbbfdc3a5e4b96df32..f243ea6b06bba55888bbe16069f376f824c1bc7f 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -23,7 +23,8 @@
 \r
     <UserControl.Resources>\r
         <Converters:BooleanConverter x:Key="booleanConverter" />\r
-        \r
+        <Converters:EnumComboConverter x:Key="enumComboConverter" />\r
+\r
         <Style TargetType="Button">\r
             <Setter Property="FontWeight" Value="Bold" />\r
             <Setter Property="Padding" Value="5,1" />\r
@@ -485,8 +486,8 @@
                     <ComboBox Name="Container"\r
                               MinWidth="100"\r
                               Margin="8,0,0,0"\r
-                              ItemsSource="{Binding OutputFormats}"\r
-                              SelectedItem="{Binding SelectedOutputFormat}"\r
+                              ItemsSource="{Binding OutputFormats, Converter={StaticResource enumComboConverter}}"\r
+                              SelectedItem="{Binding SelectedOutputFormat, Converter={StaticResource enumComboConverter}}"\r
                               />\r
                     <CheckBox Name="WebOptimized"\r
                               Margin="8,0,0,0"\r