From 9ae2a401aebbe47e6729912c38d03c713b110e70 Mon Sep 17 00:00:00 2001 From: sr55 Date: Mon, 27 Jul 2015 20:05:10 +0000 Subject: WinGui: remove the "use picture filters" checkbox in the add preset sheet. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7381 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs | 9 --------- win/CS/HandBrakeWPF/Properties/ResourcesUI.resx | 3 --- .../Services/Presets/Factories/JsonPresetFactory.cs | 2 -- win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs | 5 ----- win/CS/HandBrakeWPF/Services/Presets/PresetService.cs | 14 -------------- win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs | 3 +-- win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs | 2 +- win/CS/HandBrakeWPF/Views/AddPresetView.xaml | 6 ------ 8 files changed, 2 insertions(+), 42 deletions(-) (limited to 'win/CS') diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs index 9a9e5c218..4a6ce4602 100644 --- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs +++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs @@ -114,15 +114,6 @@ namespace HandBrakeWPF.Properties { } } - /// - /// Looks up a localized string similar to Save Video Filter Settings. - /// - public static string AddPresetView_SaveVideoFilters { - get { - return ResourceManager.GetString("AddPresetView_SaveVideoFilters", resourceCulture); - } - } - /// /// Looks up a localized string similar to Allow passthru of:. /// diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx index 34c80bc43..b07140b54 100644 --- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx +++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx @@ -234,9 +234,6 @@ Save Picture Size: - - Save Video Filter Settings - Cancel diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs index 4dedd9660..bdb4d1a82 100644 --- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs +++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs @@ -47,7 +47,6 @@ namespace HandBrakeWPF.Services.Presets.Factories Preset preset = new Preset(); preset.Name = importedPreset.PresetName; preset.Description = importedPreset.PresetDescription; - preset.UsePictureFilters = importedPreset.UsesPictureFilters; preset.Task = new EncodeTask(); // Step 1, Create the EncodeTask Object that can be loaded into the UI. @@ -408,7 +407,6 @@ namespace HandBrakeWPF.Services.Presets.Factories preset.PresetDescription = export.Description; preset.PresetName = export.Name; preset.Type = 1; // User Preset - preset.UsesPictureFilters = export.UsePictureFilters; preset.UsesPictureSettings = (int)export.PictureSettingsMode; preset.Default = false; // TODO Can other GUI's handle this? diff --git a/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs b/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs index 06d05e739..92aa27092 100644 --- a/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs +++ b/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs @@ -86,11 +86,6 @@ namespace HandBrakeWPF.Services.Presets.Model /// public EncodeTask Task { get; set; } - /// - /// Gets or sets a value indicating whether Picture Filters are used with this preset. - /// - public bool UsePictureFilters { get; set; } - /// /// Gets or sets The version number which associates this preset with a HB build /// diff --git a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs index c47b101a1..9e1cba6ad 100644 --- a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs +++ b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs @@ -194,18 +194,6 @@ namespace HandBrakeWPF.Services.Presets preset = JsonPresetFactory.ImportPreset(hbPreset); preset.Category = UserPresetCatgoryName; - // Depending on the selected preset options, we may need to change some settings around. - // If the user chose not to use fitlers, remove them. - if (!preset.UsePictureFilters) - { - preset.Task.Detelecine = Detelecine.Off; - preset.Task.Denoise = Denoise.Off; - preset.Task.Deinterlace = Deinterlace.Off; - preset.Task.Decomb = Decomb.Off; - preset.Task.Deblock = 0; - preset.Task.Grayscale = false; - } - // IF we are using Source Max, Set the Max Width / Height values. if (preset.PictureSettingsMode == PresetPictureSettingsMode.SourceMaximum) { @@ -279,7 +267,6 @@ namespace HandBrakeWPF.Services.Presets if (preset.Name == update.Name) { preset.Task = update.Task; - preset.UsePictureFilters = update.UsePictureFilters; preset.PictureSettingsMode = update.PictureSettingsMode; preset.Category = update.Category; preset.Description = update.Description; @@ -400,7 +387,6 @@ namespace HandBrakeWPF.Services.Presets { Preset preset = JsonPresetFactory.ImportPreset(hbpreset); preset.Version = VersionHelper.GetVersion(); - preset.UsePictureFilters = true; preset.IsBuildIn = true; // Older versions did not have this flag so explicitly make sure it is set. preset.Category = item.PresetName; diff --git a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs index 4a3b42dc5..5246bd58f 100644 --- a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs @@ -72,7 +72,7 @@ namespace HandBrakeWPF.ViewModels this.presetService = presetService; this.errorService = errorService; this.Title = "Add Preset"; - this.Preset = new Preset { IsBuildIn = false, IsDefault = false, Category = PresetService.UserPresetCatgoryName, UsePictureFilters = true }; + this.Preset = new Preset { IsBuildIn = false, IsDefault = false, Category = PresetService.UserPresetCatgoryName}; this.PictureSettingsModes = EnumHelper.GetEnumList(); } @@ -198,7 +198,6 @@ namespace HandBrakeWPF.ViewModels return; } - this.Preset.UsePictureFilters = this.Preset.UsePictureFilters; this.Preset.PictureSettingsMode = this.SelectedPictureSettingMode; // Setting W, H, MW and MH diff --git a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs index a555142fe..d34c0f954 100644 --- a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs @@ -494,7 +494,7 @@ namespace HandBrakeWPF.ViewModels { this.CurrentTask = task; - if (preset != null && preset.UsePictureFilters) + if (preset != null) { // Properties this.SelectedDenoise = preset.Task.Denoise; diff --git a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml index eb9d67b26..bc1dbbd62 100644 --- a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml +++ b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml @@ -96,12 +96,6 @@ AllowEmpty="True" /> - -