WinGui: Replace Strict Anamorphic with Automatic.

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Anamorphic.cs b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Anamorphic.cs
index 85e240ba97b8b4ee6ab28383f818faaf443a9ef5..ebe81a1cb5364a6084656930f43c250c809b798f 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Anamorphic.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Anamorphic.cs
@@ -21,9 +21,9 @@ namespace HandBrake.ApplicationServices.Interop.Model.Encoding
         [Display(Name = "None")]\r
         [ShortName("none")]\r
         None = 0,\r
-        [Display(Name = "Strict")]\r
-        [ShortName("strict")]\r
-        Strict = 1,\r
+        [Display(Name = "Automatic")]\r
+        [ShortName("auto")]\r
+        Automatic = 1,\r
         [Display(Name = "Loose")]\r
         [ShortName("loose")]\r
         Loose = 2,\r

diff --git a/win/CS/HandBrake.sln.DotSettings b/win/CS/HandBrake.sln.DotSettings
index 71862753dd5365e6a2a06effd0d5a93dc5450e18..07d41daf210df2496ddb88d47e85034774b230d4 100644 (file)
--- a/win/CS/HandBrake.sln.DotSettings
+++ b/win/CS/HandBrake.sln.DotSettings
@@ -500,6 +500,7 @@
        <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
        <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
        <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
+       <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsParsFormattingSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
        <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsWrapperSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
        <s:Boolean x:Key="/Default/Environment/UpdatesManger/IsDownloadUpdateDataAllowed/@EntryValue">False</s:Boolean>
        <s:String x:Key="/Default/Environment/UpdatesManger/LastUpdateCheck/@EntryValue">02/13/2016 20:19:30</s:String>

diff --git a/win/CS/HandBrakeWPF/Converters/Queue/PictureSettingsDescConveter.cs b/win/CS/HandBrakeWPF/Converters/Queue/PictureSettingsDescConveter.cs
index 34afc9784b6daf463523cb1dddfd4415c7fd87c8..9af228b0e5f934e9426772605378435462b47c66 100644 (file)
--- a/win/CS/HandBrakeWPF/Converters/Queue/PictureSettingsDescConveter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Queue/PictureSettingsDescConveter.cs
@@ -48,8 +48,8 @@ namespace HandBrakeWPF.Converters.Queue
                 string resolution = string.Empty;
                 switch (task.Anamorphic)
                 {
-                    case Anamorphic.Strict:
-                        resolution = "Anamorphic: Strict";
+                    case Anamorphic.Automatic:
+                        resolution = "Anamorphic: Automatic";
                         break;
                     case Anamorphic.Loose:
                         resolution = "Anamorphic: Loose, Width: " + task.Width;

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
index f7e495daaee4f9b8c8136c708d74871b99ceb279..21211eaf2674e82a818b5ce9d40c7ac694306980 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
@@ -182,11 +182,11 @@ namespace HandBrakeWPF.Properties {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to None   - Force pixel aspect ratio to 1:1.\r
-        ///Loose  - Align dimensions to chosen &apos;Alignment&apos; value\r
-        ///               and pick pixel aspect ratio that preserves the\r
-        ///               original display aspect ratio\r
-        ///Strict - Keep original source dimensions and pixel aspect ratio.\r
+        ///   Looks up a localized string similar to None          - Force pixel aspect ratio to 1:1.\r
+        ///Loose         - Use a pixel aspect ratio that is as close as possible to the source video pixel\r
+        ///                      aspect ratio while preserving the original display aspect ratio\r
+        ///Automatic - Use a pixel aspect ratio that maximizes storage resolution while preserving the \r
+        ///                      original display aspect ratio..\r
         /// </summary>\r
         public static string PictureSettingsView_Anamorphic {\r
             get {\r

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx
index be3ea622dcb6a44c342632ee70029d0d054f7dd8..717097ab793a67b2f1763ef647181dddd561a9d4 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx
@@ -164,11 +164,11 @@ This allows a player to initiate playback before downloading the entire file.</v
 By default, HandBrake will try and select the main title, or the longest if one isn't found.</value>\r
   </data>\r
   <data name="PictureSettingsView_Anamorphic" xml:space="preserve">\r
-    <value>None   - Force pixel aspect ratio to 1:1.\r
-Loose  - Align dimensions to chosen 'Alignment' value\r
-               and pick pixel aspect ratio that preserves the\r
-               original display aspect ratio\r
-Strict - Keep original source dimensions and pixel aspect ratio</value>\r
+    <value>None          - Force pixel aspect ratio to 1:1.\r
+Loose         - Use a pixel aspect ratio that is as close as possible to the source video pixel\r
+                      aspect ratio while preserving the original display aspect ratio\r
+Automatic - Use a pixel aspect ratio that maximizes storage resolution while preserving the \r
+                      original display aspect ratio.</value>\r
   </data>\r
   <data name="PictureSettingsView_AutoCrop" xml:space="preserve">\r
     <value>Automatically crop black borders around edges of the video.</value>\r

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
index b3e2bb645f93d6c792ce15b996efeead6d1739a1..909ada66f995ae5d0253ebdf742fc283afeafea8 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
@@ -88,8 +88,8 @@ namespace HandBrakeWPF.Services.Presets.Factories
                 case "loose":\r
                     preset.Task.Anamorphic = Anamorphic.Loose;\r
                     break;\r
-                case "strict":\r
-                    preset.Task.Anamorphic = Anamorphic.Strict;\r
+                case "auto":\r
+                    preset.Task.Anamorphic = Anamorphic.Automatic;\r
                     break;\r
                 default:\r
                     preset.Task.Anamorphic = Anamorphic.None;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
index b2bb3e5d977d0060b286541908ff2fc3f0a534c8..2facf2c66c8e0f89cb85c57a1785e3ea8e7a29cd 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
@@ -181,7 +181,7 @@ namespace HandBrakeWPF.ViewModels
                         this.CustomHeight = title.Resolution.Height;\r
                     }\r
                     break;\r
-                case Anamorphic.Strict:\r
+                case Anamorphic.Automatic:\r
                     this.SelectedPictureSettingMode = PresetPictureSettingsMode.SourceMaximum;\r
                     break;\r
             }\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index 2d726775627bb54ec3be955c710187fd6bbb0cb3..ed4282566c2aed81e54c5ba0ad3394daaf1dd3f0 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -146,7 +146,7 @@ namespace HandBrakeWPF.ViewModels
         {\r
             get\r
             {\r
-                return new List<Anamorphic> { Anamorphic.None, Anamorphic.Strict, Anamorphic.Loose, Anamorphic.Custom };\r
+                return new List<Anamorphic> { Anamorphic.None, Anamorphic.Automatic, Anamorphic.Loose, Anamorphic.Custom };\r
             }\r
         }\r
 \r
@@ -972,7 +972,7 @@ namespace HandBrakeWPF.ViewModels
                     this.ShowDisplaySize = true;\r
                     this.ShowKeepAR = true;\r
                     break;\r
-                case Anamorphic.Strict:\r
+                case Anamorphic.Automatic:\r
                     this.WidthControlEnabled = false;\r
                     this.HeightControlEnabled = false;\r
                     this.ShowCustomAnamorphicControls = false;\r