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

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
index 9a9e5c218001ce9095e965178e2abcdb9ec53844..4a6ce460259199ca6213e553b21c6dd7359910a9 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
@@ -114,15 +114,6 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Save Video Filter Settings.\r
-        /// </summary>\r
-        public static string AddPresetView_SaveVideoFilters {\r
-            get {\r
-                return ResourceManager.GetString("AddPresetView_SaveVideoFilters", resourceCulture);\r
-            }\r
-        }\r
-        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Allow passthru of:.\r
         /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
index 34c80bc436e5f24a0e2377f4f9e1175e0b241659..b07140b5423d6ceee8e5d9262c128e8395841ff2 100644 (file)
--- 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">\r
     <value>Save Picture Size:</value>\r
   </data>\r
-  <data name="AddPresetView_SaveVideoFilters" xml:space="preserve">\r
-    <value>Save Video Filter Settings</value>\r
-  </data>\r
   <data name="Generic_Cancel" xml:space="preserve">\r
     <value>Cancel</value>\r
   </data>\r

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
index 4dedd9660b606a1301a0f10c726194b5d2b4f66c..bdb4d1a82258e5f7f774efe574ae37e4b64b3c91 100644 (file)
--- 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();\r
             preset.Name = importedPreset.PresetName;\r
             preset.Description = importedPreset.PresetDescription;\r
-            preset.UsePictureFilters = importedPreset.UsesPictureFilters;\r
             preset.Task = new EncodeTask();\r
 \r
             // Step 1, Create the EncodeTask Object that can be loaded into the UI.\r
@@ -408,7 +407,6 @@ namespace HandBrakeWPF.Services.Presets.Factories
             preset.PresetDescription = export.Description;\r
             preset.PresetName = export.Name;\r
             preset.Type = 1; // User Preset\r
-            preset.UsesPictureFilters = export.UsePictureFilters;\r
             preset.UsesPictureSettings = (int)export.PictureSettingsMode;\r
             preset.Default = false; // TODO Can other GUI's handle this?\r
 \r

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs b/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs
index 06d05e73960fa1078e2ed46db98c33b4aafcb855..92aa2709251ade905f61d91bc0673e828118b489 100644 (file)
--- 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
         /// </summary>\r
         public EncodeTask Task { get; set; }\r
 \r
-        /// <summary>\r
-        /// Gets or sets a value indicating whether Picture Filters are used with this preset.\r
-        /// </summary>\r
-        public bool UsePictureFilters { get; set; }\r
-\r
         /// <summary>\r
         /// Gets or sets The version number which associates this preset with a HB build\r
         /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
index c47b101a163edb46497aa77858d2f56137f260a0..9e1cba6add9dba91fe2a55351ba147801c8e3f53 100644 (file)
--- 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);\r
                     preset.Category = UserPresetCatgoryName;\r
 \r
-                    // Depending on the selected preset options, we may need to change some settings around.\r
-                    // If the user chose not to use fitlers, remove them.\r
-                    if (!preset.UsePictureFilters)\r
-                    {\r
-                        preset.Task.Detelecine = Detelecine.Off;\r
-                        preset.Task.Denoise = Denoise.Off;\r
-                        preset.Task.Deinterlace = Deinterlace.Off;\r
-                        preset.Task.Decomb = Decomb.Off;\r
-                        preset.Task.Deblock = 0;\r
-                        preset.Task.Grayscale = false;\r
-                    }\r
-\r
                     // IF we are using Source Max, Set the Max Width / Height values.\r
                     if (preset.PictureSettingsMode == PresetPictureSettingsMode.SourceMaximum)\r
                     {\r
@@ -279,7 +267,6 @@ namespace HandBrakeWPF.Services.Presets
                 if (preset.Name == update.Name)\r
                 {\r
                     preset.Task = update.Task;\r
-                    preset.UsePictureFilters = update.UsePictureFilters;\r
                     preset.PictureSettingsMode = update.PictureSettingsMode;\r
                     preset.Category = update.Category;\r
                     preset.Description = update.Description;\r
@@ -400,7 +387,6 @@ namespace HandBrakeWPF.Services.Presets
                 {\r
                     Preset preset = JsonPresetFactory.ImportPreset(hbpreset);\r
                     preset.Version = VersionHelper.GetVersion();\r
-                    preset.UsePictureFilters = true;\r
                     preset.IsBuildIn = true; // Older versions did not have this flag so explicitly make sure it is set.\r
                     preset.Category = item.PresetName;\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
index 4a3b42dc59dd9e16fe9e659fa0fc963e3b64a827..5246bd58f90fc8acb834300b7c57e2fba576f914 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
@@ -72,7 +72,7 @@ namespace HandBrakeWPF.ViewModels
             this.presetService = presetService;\r
             this.errorService = errorService;\r
             this.Title = "Add Preset";\r
-            this.Preset = new Preset { IsBuildIn = false, IsDefault = false, Category = PresetService.UserPresetCatgoryName, UsePictureFilters = true };\r
+            this.Preset = new Preset { IsBuildIn = false, IsDefault = false, Category = PresetService.UserPresetCatgoryName};\r
             this.PictureSettingsModes = EnumHelper<PresetPictureSettingsMode>.GetEnumList();\r
         }\r
 \r
@@ -198,7 +198,6 @@ namespace HandBrakeWPF.ViewModels
                 return;\r
             }\r
 \r
-            this.Preset.UsePictureFilters = this.Preset.UsePictureFilters;\r
             this.Preset.PictureSettingsMode = this.SelectedPictureSettingMode;\r
 \r
             // Setting W, H, MW and MH\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
index a555142fe64610b6444c36b08b085dce833b4f64..d34c0f954c152d0878d88ed652966e280f426e7f 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
@@ -494,7 +494,7 @@ namespace HandBrakeWPF.ViewModels
         {\r
             this.CurrentTask = task;\r
 \r
-            if (preset != null && preset.UsePictureFilters)\r
+            if (preset != null)\r
             {\r
                 // Properties\r
                 this.SelectedDenoise = preset.Task.Denoise;\r

diff --git a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
index eb9d67b269bf5dcddb08e7e1e08e498bc385e84e..bc1dbbd62f190846f35ffcd6cb98dc378fb6e65c 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
@@ -96,12 +96,6 @@
                                     AllowEmpty="True" />\r
             </StackPanel>\r
 \r
-            <CheckBox Grid.Row="4"\r
-                      Grid.Column="0" Grid.ColumnSpan="2"\r
-                      Margin="0,10,0,0"\r
-                      Content="{x:Static Properties:ResourcesUI.AddPresetView_SaveVideoFilters}"\r
-                      IsChecked="{Binding Preset.UsePictureFilters}" />\r
-\r
             <!--  Description  -->\r
             <TextBlock Grid.Row="5"\r
                        Grid.Column="0" Margin="0,10,0,0"\r