WinGui: - Some updates to the libhb preset wrapper code. - Remove Preset update...
authorsr55 <sr55.hb@outlook.com>
Tue, 26 May 2015 19:15:22 +0000 (19:15 +0000)
committersr55 <sr55.hb@outlook.com>
Tue, 26 May 2015 19:15:22 +0000 (19:15 +0000)
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7227 b64f7644-9d1e-0410-96f1-a4d463321fa5

win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
win/CS/HandBrake.ApplicationServices/Interop/HbLib/HbFunctions.cs
win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs [moved from win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/Preset.cs with 95% similarity]
win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/PresetCategory.cs
win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/UserSettingConstants.cs
win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
win/CS/HandBrakeWPF/Views/OptionsView.xaml
win/CS/HandBrakeWPF/defaultsettings.xml

index 683f133f486196b53726c11690a281c772ac1323..e3a9b0db21670f28d67d99b7782e535b25f6024d 100644 (file)
     <Compile Include="Interop\Json\Anamorphic\DestSettings.cs" />\r
     <Compile Include="Interop\Json\Encode\QSV.cs" />\r
     <Compile Include="Interop\Json\Presets\AudioList.cs" />\r
-    <Compile Include="Interop\Json\Presets\Preset.cs" />\r
+    <Compile Include="Interop\Json\Presets\HBPreset.cs" />\r
     <Compile Include="Interop\Json\Presets\PresetCategory.cs" />\r
     <Compile Include="Interop\Json\Shared\PAR.cs" />\r
     <Compile Include="Interop\Json\Encode\Audio.cs" />\r
index 6eb77cac3feea5613a1cb6b99d3a7fa36050b26a..a1e93f28b56a7fff5a3cf31eddd62d9f9d07689c 100644 (file)
@@ -441,5 +441,8 @@ namespace HandBrake.ApplicationServices.Interop.HbLib
         [DllImport("hb.dll", EntryPoint = "hb_presets_builtin_get_json", CallingConvention = CallingConvention.Cdecl)]\r
         public static extern IntPtr hb_presets_builtin_get_json();\r
 \r
+        // hb_value_t * hb_plist_parse_file(const char *filename);\r
+        [DllImport("hb.dll", EntryPoint = "hb_plist_parse_file", CallingConvention = CallingConvention.Cdecl)]\r
+        public static extern IntPtr hb_plist_parse_file(IntPtr filename);\r
     }\r
 }\r
similarity index 95%
rename from win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/Preset.cs
rename to win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs
index 8d19d0ae31e981c17a515e5d18699794f36b14b3..0c40a858df396fac7e4d2d54c6fc76dfeee6c47e 100644 (file)
@@ -1,5 +1,5 @@
 // --------------------------------------------------------------------------------------------------------------------\r
-// <copyright file="Preset.cs" company="HandBrake Project (http://handbrake.fr)">\r
+// <copyright file="HBPreset.cs" company="HandBrake Project (http://handbrake.fr)">\r
 //   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.\r
 // </copyright>\r
 // <summary>\r
@@ -14,7 +14,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
     /// <summary>\r
     ///     The preset.\r
     /// </summary>\r
-    public class Preset\r
+    public class HBPreset\r
     {\r
         /// <summary>\r
         /// Gets or sets the audio copy mask.\r
@@ -294,7 +294,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         /// <summary>\r
         /// Gets or sets the subtitle language list.\r
         /// </summary>\r
-        public List<object> SubtitleLanguageList { get; set; }\r
+        public List<string> SubtitleLanguageList { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets the subtitle track selection behavior.\r
index 6700c0a84b4fbd5dcb896555e5c3081d80cf92e8..799ea0876437327b0cc07178c54a8c4d9a24ab75 100644 (file)
@@ -19,7 +19,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         /// <summary>\r
         /// Gets or sets the children array.\r
         /// </summary>\r
-        public List<Preset> ChildrenArray { get; set; }\r
+        public List<HBPreset> ChildrenArray { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets a value indicating whether folder.\r
diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
new file mode 100644 (file)
index 0000000..1fff26e
--- /dev/null
@@ -0,0 +1,396 @@
+// --------------------------------------------------------------------------------------------------------------------\r
+// <copyright file="JsonPresetFactory.cs" company="HandBrake Project (http://handbrake.fr)">\r
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.\r
+// </copyright>\r
+// <summary>\r
+//   The json preset factory.\r
+// </summary>\r
+// --------------------------------------------------------------------------------------------------------------------\r
+\r
+namespace HandBrakeWPF.Services.Presets.Factories\r
+{\r
+    using System.Collections.ObjectModel;\r
+    using System.Globalization;\r
+\r
+    using HandBrake.ApplicationServices.Interop.Model;\r
+    using HandBrake.ApplicationServices.Interop.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models.Video;\r
+    using HandBrake.ApplicationServices.Utilities;\r
+\r
+    using HandBrakeWPF.Model.Audio;\r
+    using HandBrakeWPF.Model.Picture;\r
+    using HandBrakeWPF.Model.Subtitles;\r
+    using HandBrakeWPF.Services.Presets.Model;\r
+\r
+    /// <summary>\r
+    /// The json preset factory.\r
+    /// </summary>\r
+    public class JsonPresetFactory\r
+    {\r
+        /// <summary>\r
+        /// The create preset.\r
+        /// </summary>\r
+        /// <param name="preset">\r
+        /// The preset.\r
+        /// </param>\r
+        /// <returns>\r
+        /// The <see cref="Preset"/>.\r
+        /// </returns>\r
+        public static Preset ImportPreset(HandBrake.ApplicationServices.Interop.Json.Presets.HBPreset preset)\r
+        {\r
+            EncodeTask task = new EncodeTask();\r
+            Preset parsedPreset = new Preset();\r
+            parsedPreset.Name = preset.PresetName;\r
+            parsedPreset.Description = preset.PresetDescription;\r
+            parsedPreset.UsePictureFilters = preset.UsesPictureFilters;\r
+            parsedPreset.PictureSettingsMode = (PresetPictureSettingsMode)preset.UsesPictureSettings;\r
+            parsedPreset.UseDeinterlace = preset.PictureDecombDeinterlace;\r
+            parsedPreset.Task = new EncodeTask();\r
+\r
+            // Step 1, Create the EncodeTask Object that can be loaded into the UI.\r
+\r
+            /* Output Settings */ \r
+            task.OptimizeMP4 = preset.Mp4HttpOptimize;\r
+            task.IPod5GSupport = preset.Mp4iPodCompatible;\r
+            task.OutputFormat = GetFileFormat(preset.FileFormat.Replace("file", string.Empty).Trim()); // TOOD null check.\r
+\r
+            /* Picture Settings */ \r
+            task.Cropping = new Cropping(preset.PictureTopCrop, preset.PictureBottomCrop, preset.PictureLeftCrop, preset.PictureRightCrop);\r
+            task.HasCropping = preset.PictureAutoCrop;\r
+            task.Width = preset.PictureWidth;\r
+            task.Height = preset.PictureHeight;\r
+            task.Modulus = preset.PictureModulus;\r
+            task.KeepDisplayAspect = preset.PictureKeepRatio;\r
+            switch (preset.PicturePAR)\r
+            {\r
+                case "custom":\r
+                    task.Anamorphic = Anamorphic.Custom;\r
+                    break;\r
+                case "loose":\r
+                    task.Anamorphic = Anamorphic.Loose;\r
+                    break;\r
+                case "strict":\r
+                    task.Anamorphic = Anamorphic.Strict;\r
+                    break;\r
+                default:\r
+                    task.Anamorphic = Anamorphic.Loose;\r
+                    break;\r
+            }\r
+\r
+            /* Filter Settings */ \r
+            task.Grayscale = preset.VideoGrayScale;\r
+            task.Deblock = preset.PictureDeblock;\r
+            switch (preset.PictureDecomb)\r
+            {\r
+                case "custom":\r
+                    task.Decomb = Decomb.Custom;\r
+                    break;\r
+                case "default":\r
+                    task.Decomb = Decomb.Default;\r
+                    break;\r
+                case "bob":\r
+                    task.Decomb = Decomb.Bob;\r
+                    break;\r
+                case "fast":\r
+                    task.Decomb = Decomb.Fast;\r
+                    break;\r
+\r
+                default:\r
+                    task.Decomb = Decomb.Off;\r
+                    break;\r
+            }\r
+\r
+            task.CustomDecomb = preset.PictureDecombCustom;\r
+\r
+            switch (preset.PictureDeinterlace)\r
+            {\r
+                case "custom":\r
+                    task.Deinterlace = Deinterlace.Custom;\r
+                    break;\r
+                case "bob":\r
+                    task.Deinterlace = Deinterlace.Bob;\r
+                    break;\r
+                case "gast":\r
+                    task.Deinterlace = Deinterlace.Fast;\r
+                    break;\r
+                case "slow":\r
+                    task.Deinterlace = Deinterlace.Slow;\r
+                    break;\r
+                case "slower":\r
+                    task.Deinterlace = Deinterlace.Slower;\r
+                    break;\r
+                default:\r
+                    task.Deinterlace = Deinterlace.Off;\r
+                    break;\r
+            }\r
+\r
+            task.CustomDeinterlace = preset.PictureDetelecineCustom;\r
+            task.CustomDenoise = preset.PictureDenoiseCustom;\r
+            task.CustomDetelecine = preset.PictureDetelecineCustom;\r
+\r
+            switch (preset.PictureDetelecine)\r
+            {\r
+                case "custom":\r
+                    task.Detelecine = Detelecine.Custom;\r
+                    break;\r
+                case "default":\r
+                    task.Detelecine = Detelecine.Default;\r
+                    break;\r
+                default:\r
+                    task.Detelecine = Detelecine.Off;\r
+                    break;\r
+            }\r
+\r
+            switch (preset.PictureDenoiseFilter)\r
+            {\r
+                case "nlmeans":\r
+                    task.Denoise = Denoise.NLMeans;\r
+                    break;\r
+                case "hqdn3d":\r
+                    task.Denoise = Denoise.hqdn3d;\r
+                    break;\r
+                default:\r
+                    task.Denoise = Denoise.Off;\r
+                    break;\r
+            }\r
+\r
+            switch (preset.PictureDenoisePreset)\r
+            {\r
+                case "custom":\r
+                    task.DenoisePreset = DenoisePreset.Custom;\r
+                    break;\r
+                case "light":\r
+                    task.DenoisePreset = DenoisePreset.Light;\r
+                    break;\r
+                case "medium":\r
+                    task.DenoisePreset = DenoisePreset.Medium;\r
+                    break;\r
+                case "strong":\r
+                    task.DenoisePreset = DenoisePreset.Strong;\r
+                    break;\r
+                case "ultralight":\r
+                    task.DenoisePreset = DenoisePreset.Ultralight;\r
+                    break;\r
+                case "weak":\r
+                    task.DenoisePreset = DenoisePreset.Weak;\r
+                    break;\r
+            }\r
+\r
+            switch (preset.PictureDenoiseTune)\r
+            {\r
+                case "animation":\r
+                    task.DenoiseTune = DenoiseTune.Animation;\r
+                    break;\r
+                case "film":\r
+                    task.DenoiseTune = DenoiseTune.Film;\r
+                    break;\r
+                case "grain":\r
+                    task.DenoiseTune = DenoiseTune.Grain;\r
+                    break;\r
+                case "highnotion":\r
+                    task.DenoiseTune = DenoiseTune.HighMotion;\r
+                    break;\r
+\r
+                default:\r
+                    task.DenoiseTune = DenoiseTune.None;\r
+                    break;\r
+            }\r
+\r
+            /* Video Settings */ \r
+            task.VideoEncoder = EnumHelper<VideoEncoder>.GetValue(preset.VideoEncoder);\r
+            task.VideoBitrate = preset.VideoAvgBitrate;\r
+            task.TwoPass = preset.VideoTwoPass;\r
+            task.TurboFirstPass = preset.VideoTurboTwoPass;\r
+            task.ExtraAdvancedArguments = preset.VideoOptionExtra;\r
+            task.Quality = double.Parse(preset.VideoQualitySlider.ToString(CultureInfo.InvariantCulture), CultureInfo.InvariantCulture);\r
+            task.VideoEncodeRateType = (VideoEncodeRateType)preset.VideoQualityType;\r
+            task.VideoLevel = new VideoLevel(preset.VideoLevel, preset.VideoLevel);\r
+            task.VideoPreset = new VideoPreset(preset.VideoPreset, preset.VideoPreset);\r
+            string[] split = preset.VideoTune.Split(',');\r
+            foreach (var item in split)\r
+            {\r
+                task.VideoTunes.Add(new VideoTune(item, item));\r
+            }\r
+            task.Framerate = preset.VideoFramerate == "auto" || string.IsNullOrEmpty(preset.VideoFramerate)\r
+                                 ? (double?)null\r
+                                 : double.Parse(preset.VideoFramerate, CultureInfo.InvariantCulture);\r
+            string parsedValue = preset.VideoFramerateMode;\r
+            switch (parsedValue)\r
+            {\r
+                case "vfr":\r
+                    task.FramerateMode = FramerateMode.VFR;\r
+                    break;\r
+                case "cfr":\r
+                    task.FramerateMode = FramerateMode.CFR;\r
+                    break;\r
+                default:\r
+                    task.FramerateMode = FramerateMode.PFR;\r
+                    break;\r
+            }\r
+\r
+            /* Audio Settings */ \r
+            parsedPreset.AudioTrackBehaviours = new AudioBehaviours();\r
+            task.AllowedPassthruOptions.AudioEncoderFallback = EnumHelper<AudioEncoder>.GetValue(preset.AudioEncoderFallback);\r
+            parsedPreset.AudioTrackBehaviours.SelectedBehaviour = preset.AudioTrackSelectionBehavior == "all"\r
+                                                                     ? AudioBehaviourModes.AllMatching\r
+                                                                     : preset.AudioTrackSelectionBehavior == "first"\r
+                                                                           ? AudioBehaviourModes.FirstMatch\r
+                                                                           : AudioBehaviourModes.None;\r
+\r
+            if (preset.AudioCopyMask != null)\r
+            {\r
+                foreach (var item in preset.AudioCopyMask)\r
+                {\r
+                    AudioEncoder encoder = EnumHelper<AudioEncoder>.GetValue(item.ToString());\r
+                    switch (encoder)\r
+                    {\r
+                        case AudioEncoder.AacPassthru:\r
+                            task.AllowedPassthruOptions.AudioAllowAACPass = true;\r
+                            break;\r
+                        case AudioEncoder.Ac3Passthrough:\r
+                            task.AllowedPassthruOptions.AudioAllowAACPass = true;\r
+                            break;\r
+                        case AudioEncoder.EAc3Passthrough:\r
+                            task.AllowedPassthruOptions.AudioAllowAACPass = true;\r
+                            break;\r
+                        case AudioEncoder.DtsHDPassthrough:\r
+                            task.AllowedPassthruOptions.AudioAllowAACPass = true;\r
+                            break;\r
+                        case AudioEncoder.DtsPassthrough:\r
+                            task.AllowedPassthruOptions.AudioAllowAACPass = true;\r
+                            break;\r
+                        case AudioEncoder.FlacPassthru:\r
+                            task.AllowedPassthruOptions.AudioAllowAACPass = true;\r
+                            break;\r
+                        case AudioEncoder.Mp3Passthru:\r
+                            task.AllowedPassthruOptions.AudioAllowAACPass = true;\r
+                            break;\r
+                    }\r
+                }\r
+            }\r
+\r
+            if (preset.AudioLanguageList != null)\r
+            {\r
+                foreach (var item in preset.AudioLanguageList)\r
+                {\r
+                    parsedPreset.AudioTrackBehaviours.SelectedLangauges.Add(item);\r
+                }\r
+            }\r
+\r
+            task.AudioTracks = new ObservableCollection<AudioTrack>();\r
+\r
+            if (preset.AudioList != null)\r
+            {\r
+                foreach (var audioTrack in preset.AudioList)\r
+                {\r
+                    AudioTrack track = new AudioTrack();\r
+                    track.Bitrate = audioTrack.AudioBitrate;\r
+\r
+                    // track.CompressionLevel = audioTrack.AudioCompressionLevel;\r
+                    // track.AudioDitherMethod = audioTrack.AudioDitherMethod;\r
+                    track.Encoder = EnumHelper<AudioEncoder>.GetValue(audioTrack.AudioEncoder);\r
+                    track.MixDown = Converters.GetAudioMixDown(audioTrack.AudioMixdown);\r
+\r
+                    // track.AudioNormalizeMixLevel = audioTrack.AudioNormalizeMixLevel;\r
+                    track.SampleRate = audioTrack.AudioSamplerate == "auto" ? 0 : double.Parse(audioTrack.AudioSamplerate);\r
+\r
+                    // track.IsQualityBased = audioTrack.AudioTrackQualityEnable;\r
+                    // track.Quality = audioTrack.AudioTrackQuality;\r
+                    track.Gain = (int)audioTrack.AudioTrackGainSlider;\r
+                    track.DRC = audioTrack.AudioTrackDRCSlider;\r
+\r
+                    task.AudioTracks.Add(track);\r
+                }\r
+            }\r
+\r
+\r
+            /* Subtitle Settings */ \r
+            parsedPreset.SubtitleTrackBehaviours = new SubtitleBehaviours();\r
+\r
+            // parsedPreset.SubtitleTrackBehaviours.SelectedBehaviour = preset.SubtitleTrackSelectionBehavior;\r
+            parsedPreset.SubtitleTrackBehaviours.AddClosedCaptions = preset.SubtitleAddCC;\r
+            parsedPreset.SubtitleTrackBehaviours.AddForeignAudioScanTrack = preset.SubtitleAddForeignAudioSearch;\r
+            if (preset.SubtitleLanguageList != null)\r
+            {\r
+                foreach (var item in preset.SubtitleLanguageList)\r
+                {\r
+                    parsedPreset.SubtitleTrackBehaviours.SelectedLangauges.Add(item);\r
+                }\r
+            }\r
+\r
+            /* Chapter Marker Settings */ \r
+            task.IncludeChapterMarkers = preset.ChapterMarkers;\r
+\r
+            /* Advanced Settings */ \r
+            task.ShowAdvancedTab = preset.x264UseAdvancedOptions;\r
+            task.AdvancedEncoderOptions = preset.x264Option;\r
+\r
+            /* Not Supported Yet */ \r
+            // public int VideoColorMatrixCode { get; set; }\r
+            // public bool VideoHWDecode { get; set; }\r
+            // public string VideoScaler { get; set; }\r
+            // public bool VideoQSVDecode { get; set; }\r
+            // public int VideoQSVAsyncDepth { get; set; }\r
+            // public bool SubtitleAddForeignAudioSubtitle { get; set; }\r
+            // public string SubtitleBurnBehavior { get; set; }\r
+            // public bool SubtitleBurnBDSub { get; set; }\r
+            // public bool SubtitleBurnDVDSub { get; set; }\r
+            // public bool PictureItuPAR { get; set; }\r
+            // public bool PictureLooseCrop { get; set; }\r
+            // public int PicturePARWidth { get; set; }\r
+            // public int PicturePARHeight { get; set; }\r
+            // public int PictureRotate { get; set; }\r
+            // public int PictureForceHeight { get; set; }\r
+            // public int PictureForceWidth { get; set; }\r
+            // public bool AudioSecondaryEncoderMode { get; set; }\r
+            // public List<object> ChildrenArray { get; set; }\r
+            // public bool Default { get; set; }\r
+            // public bool Folder { get; set; }\r
+            // public bool FolderOpen { get; set; }\r
+            // public int PictureDARWidth { get; set; }\r
+            // public int Type { get; set; }\r
+\r
+            return parsedPreset;\r
+        }\r
+\r
+        /// <summary>\r
+        /// The export preset.\r
+        /// </summary>\r
+        /// <param name="export">\r
+        /// The export.\r
+        /// </param>\r
+        /// <returns>\r
+        /// The <see cref="Preset"/>.\r
+        /// </returns>\r
+        public HandBrake.ApplicationServices.Interop.Json.Presets.HBPreset ExportPreset(Preset export)\r
+        {\r
+            HandBrake.ApplicationServices.Interop.Json.Presets.HBPreset preset = new HandBrake.ApplicationServices.Interop.Json.Presets.HBPreset();\r
+\r
+            return preset;\r
+        }\r
+\r
+        /// <summary>\r
+        /// Get the OutputFormat Enum for a given string\r
+        /// </summary>\r
+        /// <param name="format">\r
+        /// OutputFormat as a string\r
+        /// </param>\r
+        /// <returns>\r
+        /// An OutputFormat Enum\r
+        /// </returns>\r
+        public static OutputFormat GetFileFormat(string format)\r
+        {\r
+            switch (format.ToLower())\r
+            {\r
+                default:\r
+                    return OutputFormat.Mp4;\r
+                case "m4v":\r
+                    return OutputFormat.Mp4;\r
+                case "mkv":\r
+                    return OutputFormat.Mkv;\r
+            }\r
+        }\r
+    }\r
+}\r
index 71fa1fd8460af95715728d25e34b1fa00e1bf679..9154b678f1e265124f286f7993328bda9c3523b3 100644 (file)
@@ -71,11 +71,6 @@ namespace HandBrakeWPF
         /// </summary>\r
         public const string MinTitleLength = "MinTitleLength";\r
 \r
-        /// <summary>\r
-        /// Preset Notification\r
-        /// </summary>\r
-        public const string PresetNotification = "presetNotification";\r
-\r
         /// <summary>\r
         /// Skip Version\r
         /// </summary>\r
index b16b73573508d76f78c85ae9c78b5162961dd325..854bf48d950511c47da85e4074ae5b1f72fcb11a 100644 (file)
@@ -1192,10 +1192,6 @@ namespace HandBrakeWPF.ViewModels
 \r
             // Setup the presets.\r
             this.presetService.Load();\r
-            if (this.presetService.CheckIfPresetsAreOutOfDate())\r
-                if (!this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PresetNotification))\r
-                    this.errorService.ShowMessageBox(Resources.Main_PresetUpdateNotification,\r
-                                    Resources.Notice, MessageBoxButton.OK, MessageBoxImage.Information);\r
 \r
             // Queue Recovery\r
             QueueRecoveryHelper.RecoverQueue(this.queueProcessor, this.errorService);\r
index 01c0d38f9f7b988ad4239f65f05ef7951683357f..be12f2010fc4369b1cdacc370decc90256bebf52 100644 (file)
@@ -117,11 +117,6 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>\r
         private bool disableLibdvdNav;\r
 \r
-        /// <summary>\r
-        /// The disable p reset update check notification.\r
-        /// </summary>\r
-        private bool disablePresetUpdateCheckNotification;\r
-\r
         /// <summary>\r
         /// The growl after encode.\r
         /// </summary>\r
@@ -897,23 +892,6 @@ namespace HandBrakeWPF.ViewModels
             }\r
         }\r
 \r
-        /// <summary>\r
-        /// Gets or sets a value indicating whether disablePresetUpdateCheckNotification.\r
-        /// </summary>\r
-        public bool DisablePresetUpdateCheckNotification\r
-        {\r
-            get\r
-            {\r
-                return this.disablePresetUpdateCheckNotification;\r
-            }\r
-\r
-            set\r
-            {\r
-                this.disablePresetUpdateCheckNotification = value;\r
-                this.NotifyOfPropertyChange("DisablePresetUpdateCheckNotification");\r
-            }\r
-        }\r
-\r
         /// <summary>\r
         /// Gets or sets LogVerbosityOptions.\r
         /// </summary>\r
@@ -1449,7 +1427,6 @@ namespace HandBrakeWPF.ViewModels
 \r
             // Minimise to Tray\r
             this.MinimiseToTray = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.MainWindowMinimize);\r
-            this.DisablePresetUpdateCheckNotification = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PresetNotification);\r
             this.ClearQueueOnEncodeCompleted = userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearCompletedFromQueue);\r
             this.ShowAdvancedTab = userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAdvancedTab);\r
 \r
@@ -1526,7 +1503,6 @@ namespace HandBrakeWPF.ViewModels
 \r
             /* Advanced */\r
             userSettingService.SetUserSetting(UserSettingConstants.MainWindowMinimize, this.MinimiseToTray);\r
-            userSettingService.SetUserSetting(UserSettingConstants.PresetNotification, this.DisablePresetUpdateCheckNotification);\r
             userSettingService.SetUserSetting(UserSettingConstants.ClearCompletedFromQueue, this.ClearQueueOnEncodeCompleted);\r
             userSettingService.SetUserSetting(UserSettingConstants.PreviewScanCount, this.SelectedPreviewCount);\r
             userSettingService.SetUserSetting(UserSettingConstants.X264Step, double.Parse(this.SelectedGranulairty, CultureInfo.InvariantCulture));\r
index ad8e7ad49d69b42914c98d16585da4d8a66b059d..f2ed936fcf079cd784323e93ae7f26f25ee11386 100644 (file)
 \r
                         <StackPanel Orientation="Vertical" Margin="20,0,0,0">\r
                             <CheckBox Content="Minimize to system tray (Requires Restart)" IsChecked="{Binding MinimiseToTray}" />\r
-                            <CheckBox Content="Disable preset update notification on startup" IsChecked="{Binding DisablePresetUpdateCheckNotification}" />\r
                             <CheckBox Content="Always clear completed queue items after an encode completes" IsChecked="{Binding ClearQueueOnEncodeCompleted}" />\r
                             <CheckBox Content="Show Advanced Encoder Options Tab" IsChecked="{Binding ShowAdvancedTab}" />\r
                         </StackPanel>\r
index 4d695271efe27754794e7aa6fa5b618b908728d8..b50cf7e9107ba36acbea6ff03e1d12beb76f93bb 100644 (file)
       <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>\r
     </value>\r
   </item>\r
-  <item>\r
-    <key>\r
-      <string>presetNotification</string>\r
-    </key>\r
-    <value>\r
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>\r
-    </value>\r
-  </item>\r
   <item>\r
     <key>\r
       <string>lastUpdateCheckDate</string>\r