From f8ccfd84580f4de1d1b2d93d8ffe0cf99788ef29 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 29 Oct 2016 20:06:25 +0100 Subject: [PATCH] WinGui: Replace Strict Anamorphic with Automatic. --- .../Interop/Model/Encoding/Anamorphic.cs | 6 +++--- win/CS/HandBrake.sln.DotSettings | 1 + .../Converters/Queue/PictureSettingsDescConveter.cs | 4 ++-- .../Properties/ResourcesTooltips.Designer.cs | 10 +++++----- win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx | 10 +++++----- .../Services/Presets/Factories/JsonPresetFactory.cs | 4 ++-- win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs | 2 +- .../ViewModels/PictureSettingsViewModel.cs | 4 ++-- 8 files changed, 21 insertions(+), 20 deletions(-) diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Anamorphic.cs b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Anamorphic.cs index 85e240ba9..ebe81a1cb 100644 --- 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")] [ShortName("none")] None = 0, - [Display(Name = "Strict")] - [ShortName("strict")] - Strict = 1, + [Display(Name = "Automatic")] + [ShortName("auto")] + Automatic = 1, [Display(Name = "Loose")] [ShortName("loose")] Loose = 2, diff --git a/win/CS/HandBrake.sln.DotSettings b/win/CS/HandBrake.sln.DotSettings index 71862753d..07d41daf2 100644 --- a/win/CS/HandBrake.sln.DotSettings +++ b/win/CS/HandBrake.sln.DotSettings @@ -500,6 +500,7 @@ True True True + True True False 02/13/2016 20:19:30 diff --git a/win/CS/HandBrakeWPF/Converters/Queue/PictureSettingsDescConveter.cs b/win/CS/HandBrakeWPF/Converters/Queue/PictureSettingsDescConveter.cs index 34afc9784..9af228b0e 100644 --- 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 f7e495daa..21211eaf2 100644 --- a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs +++ b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs @@ -182,11 +182,11 @@ namespace HandBrakeWPF.Properties { } /// - /// Looks up a localized string similar to None - Force pixel aspect ratio to 1:1. - ///Loose - Align dimensions to chosen 'Alignment' value - /// and pick pixel aspect ratio that preserves the - /// original display aspect ratio - ///Strict - Keep original source dimensions and pixel aspect ratio. + /// Looks up a localized string similar to None - Force pixel aspect ratio to 1:1. + ///Loose - Use a pixel aspect ratio that is as close as possible to the source video pixel + /// aspect ratio while preserving the original display aspect ratio + ///Automatic - Use a pixel aspect ratio that maximizes storage resolution while preserving the + /// original display aspect ratio.. /// public static string PictureSettingsView_Anamorphic { get { diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx index be3ea622d..717097ab7 100644 --- 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. - None - Force pixel aspect ratio to 1:1. -Loose - Align dimensions to chosen 'Alignment' value - and pick pixel aspect ratio that preserves the - original display aspect ratio -Strict - Keep original source dimensions and pixel aspect ratio + None - Force pixel aspect ratio to 1:1. +Loose - Use a pixel aspect ratio that is as close as possible to the source video pixel + aspect ratio while preserving the original display aspect ratio +Automatic - Use a pixel aspect ratio that maximizes storage resolution while preserving the + original display aspect ratio. Automatically crop black borders around edges of the video. diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs index b3e2bb645..909ada66f 100644 --- 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": preset.Task.Anamorphic = Anamorphic.Loose; break; - case "strict": - preset.Task.Anamorphic = Anamorphic.Strict; + case "auto": + preset.Task.Anamorphic = Anamorphic.Automatic; break; default: preset.Task.Anamorphic = Anamorphic.None; diff --git a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs index b2bb3e5d9..2facf2c66 100644 --- 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; } break; - case Anamorphic.Strict: + case Anamorphic.Automatic: this.SelectedPictureSettingMode = PresetPictureSettingsMode.SourceMaximum; break; } diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs index 2d7267756..ed4282566 100644 --- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs @@ -146,7 +146,7 @@ namespace HandBrakeWPF.ViewModels { get { - return new List { Anamorphic.None, Anamorphic.Strict, Anamorphic.Loose, Anamorphic.Custom }; + return new List { Anamorphic.None, Anamorphic.Automatic, Anamorphic.Loose, Anamorphic.Custom }; } } @@ -972,7 +972,7 @@ namespace HandBrakeWPF.ViewModels this.ShowDisplaySize = true; this.ShowKeepAR = true; break; - case Anamorphic.Strict: + case Anamorphic.Automatic: this.WidthControlEnabled = false; this.HeightControlEnabled = false; this.ShowCustomAnamorphicControls = false; -- 2.40.0