WinGui: (WPF) Wired up the Add Preset window and setup the build scripts to create Alpha Builds for this project.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4508 b64f7644-9d1e-0410-96f1-a4d463321fa5

3 files changed, 31 insertions, 45 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
index 6e2d59667..e1ed6eb62 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
@@ -91,9 +91,6 @@ namespace HandBrake.ApplicationServices.Model
             this.PixelAspectX = task.PixelAspectX;

             this.PixelAspectY = task.PixelAspectY;

             this.PointToPointMode = task.PointToPointMode;

-            this.PresetBuildNumber = task.PresetBuildNumber;

-            this.PresetDescription = task.PresetDescription;

-            this.PresetName = task.PresetName;

             this.Quality = task.Quality;

             this.Source = task.Source;

             this.StartPoint = task.StartPoint;

@@ -107,10 +104,6 @@ namespace HandBrake.ApplicationServices.Model
             this.Title = task.Title;

             this.TurboFirstPass = task.TurboFirstPass;

             this.TwoPass = task.TwoPass;

-            this.Type = task.Type;

-            this.UsesMaxPictureSettings = task.UsesMaxPictureSettings;

-            this.UsesPictureFilters = task.UsesPictureFilters;

-            this.UsesPictureSettings = task.UsesPictureSettings;

             this.Verbosity = task.Verbosity;

             this.VideoBitrate = task.VideoBitrate;

             this.VideoEncoder = task.VideoEncoder;

@@ -437,44 +430,6 @@ namespace HandBrake.ApplicationServices.Model
         public int? PreviewDuration { get; set; }

         #endregion

 

-        #region Preset Information (TODO This should probably be dropped)

-

-        /// <summary>

-        /// Gets or sets PresetBuildNumber.

-        /// </summary>

-        public int PresetBuildNumber { get; set; }

-

-        /// <summary>

-        /// Gets or sets PresetDescription.

-        /// </summary>

-        public string PresetDescription { get; set; }

-

-        /// <summary>

-        /// Gets or sets PresetName.

-        /// </summary>

-        public string PresetName { get; set; }

-

-        /// <summary>

-        /// Gets or sets Type.

-        /// </summary>

-        public string Type { get; set; }

-

-        /// <summary>

-        /// Gets or sets a value indicating whether UsesMaxPictureSettings.

-        /// </summary>

-        public bool UsesMaxPictureSettings { get; set; }

-

-        /// <summary>

-        /// Gets or sets a value indicating whether UsesPictureFilters.

-        /// </summary>

-        public bool UsesPictureFilters { get; set; }

-

-        /// <summary>

-        /// Gets or sets a value indicating whether UsesPictureSettings.

-        /// </summary>

-        public bool UsesPictureSettings { get; set; }

-        #endregion

-

         #region Helpers

 

         /// <summary>

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Preset.cs b/win/CS/HandBrake.ApplicationServices/Model/Preset.cs
index 2ec668b56..8770e6d03 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Preset.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Preset.cs
@@ -5,6 +5,8 @@
 

 namespace HandBrake.ApplicationServices.Model

 {

+    using System;

+

     using Encoding;

 

     /// <summary>

@@ -30,6 +32,7 @@ namespace HandBrake.ApplicationServices.Model
         /// <summary>

         /// Gets or sets a value indicating whether to use picture Settings in presets.

         /// </summary>

+        [Obsolete("Don't use this!")]

         public bool CropSettings { get; set; }

 

         /// <summary>

@@ -48,6 +51,12 @@ namespace HandBrake.ApplicationServices.Model
         public bool UsePictureFilters { get; set; }

 

         /// <summary>

+        /// Gets or sets PictureSettingsMode.

+        /// Source Maximum, Custom or None

+        /// </summary>

+        public PresetPictureSettingsMode PictureSettingsMode { get; set; }

+

+        /// <summary>

         /// Gets or sets a value indicating whether this is a built in preset

         /// </summary>

         public bool IsBuildIn { get; set; }

diff --git a/win/CS/HandBrake.ApplicationServices/Model/PresetPictureSettingsMode.cs b/win/CS/HandBrake.ApplicationServices/Model/PresetPictureSettingsMode.cs
new file mode 100644
index 000000000..fc2798fd1
--- /dev/null
+++ b/win/CS/HandBrake.ApplicationServices/Model/PresetPictureSettingsMode.cs
@@ -0,0 +1,22 @@
+/*  PresetPictureSettingsMode.cs $

+    This file is part of the HandBrake source code.

+    Homepage: <http://handbrake.fr>.

+    It may be used under the terms of the GNU General Public License. */

+

+namespace HandBrake.ApplicationServices.Model

+{

+    using System.ComponentModel.DataAnnotations;

+

+    /// <summary>

+    /// Picture Settings Mode when adding presets

+    /// </summary>

+    public enum PresetPictureSettingsMode

+    {

+        [Display(Name = "None")]

+        None,

+        [Display(Name = "Custom")]

+        Custom,

+        [Display(Name = "Source Maximum")]

+        SourceMaximum,

+    }

+}
\ No newline at end of file