diff options
Diffstat (limited to 'win/CS')
8 files changed, 2 insertions, 42 deletions
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 @@ -115,15 +115,6 @@ namespace HandBrakeWPF.Properties { }
/// <summary>
- /// Looks up a localized string similar to Save Video Filter Settings.
- /// </summary>
- public static string AddPresetView_SaveVideoFilters {
- get {
- return ResourceManager.GetString("AddPresetView_SaveVideoFilters", resourceCulture);
- }
- }
-
- /// <summary>
/// Looks up a localized string similar to Allow passthru of:.
/// </summary>
public static string AudioView_AllowPassThruOf {
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 @@ <data name="AddPresetView_SavePictureSize" xml:space="preserve">
<value>Save Picture Size:</value>
</data>
- <data name="AddPresetView_SaveVideoFilters" xml:space="preserve">
- <value>Save Video Filter Settings</value>
- </data>
<data name="Generic_Cancel" xml:space="preserve">
<value>Cancel</value>
</data>
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 @@ -87,11 +87,6 @@ namespace HandBrakeWPF.Services.Presets.Model public EncodeTask Task { get; set; }
/// <summary>
- /// Gets or sets a value indicating whether Picture Filters are used with this preset.
- /// </summary>
- public bool UsePictureFilters { get; set; }
-
- /// <summary>
/// Gets or sets The version number which associates this preset with a HB build
/// </summary>
public string Version { get; set; }
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<PresetPictureSettingsMode>.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" />
</StackPanel>
- <CheckBox Grid.Row="4"
- Grid.Column="0" Grid.ColumnSpan="2"
- Margin="0,10,0,0"
- Content="{x:Static Properties:ResourcesUI.AddPresetView_SaveVideoFilters}"
- IsChecked="{Binding Preset.UsePictureFilters}" />
-
<!-- Description -->
<TextBlock Grid.Row="5"
Grid.Column="0" Margin="0,10,0,0"
|