WinGui

- Wire in the new preset service.

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

3 files changed, 69 insertions, 20 deletions

diff --git a/win/C#/HandBrake.ApplicationServices/Model/Preset.cs b/win/C#/HandBrake.ApplicationServices/Model/Preset.cs
index 988e3da80..e20ad2dee 100644
--- a/win/C#/HandBrake.ApplicationServices/Model/Preset.cs
+++ b/win/C#/HandBrake.ApplicationServices/Model/Preset.cs
@@ -8,7 +8,7 @@ namespace HandBrake.ApplicationServices.Model
     /// <summary>

     /// A Preset for encoding with.

     /// </summary>

-    public class Preset 

+    public class Preset

     {

         /// <summary>

         /// Gets or sets the category which the preset resides under

@@ -49,5 +49,16 @@ namespace HandBrake.ApplicationServices.Model
         /// Gets or sets a value indicating whether this is a built in preset

         /// </summary>

         public bool IsBuildIn { get; set; }

+

+        /// <summary>

+        ///  Override the ToString Method

+        /// </summary>

+        /// <returns>

+        /// The Preset Name

+        /// </returns>

+        public override string ToString()

+        {

+            return this.Name;

+        }

     }

 }
\ No newline at end of file
diff --git a/win/C#/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs b/win/C#/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs
index b947a955e..07daab3c9 100644
--- a/win/C#/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs
+++ b/win/C#/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs
@@ -5,7 +5,7 @@
 

 namespace HandBrake.ApplicationServices.Services.Interfaces

 {

-    using System.ComponentModel;

+    using System.Collections.ObjectModel;

 

     using HandBrake.ApplicationServices.Model;

 

@@ -17,7 +17,7 @@ namespace HandBrake.ApplicationServices.Services.Interfaces
         /// <summary>

         /// Gets or sets a Collection of presets.

         /// </summary>

-        ICollectionView Presets { get; set; }

+        ObservableCollection<Preset> Presets { get; set; }

 

         /// <summary>

         /// Add a new preset to the system

diff --git a/win/C#/HandBrake.ApplicationServices/Services/PresetService.cs b/win/C#/HandBrake.ApplicationServices/Services/PresetService.cs
index dbfb8782f..9a9f26564 100644
--- a/win/C#/HandBrake.ApplicationServices/Services/PresetService.cs
+++ b/win/C#/HandBrake.ApplicationServices/Services/PresetService.cs
@@ -28,7 +28,8 @@ namespace HandBrake.ApplicationServices.Services
          * TODO:

          * - Wire this into the Forms and WPF UI's

          * - Note: This is untested so far. It'll likely need fixes before it can be used.

-         **/ 

+         * - Maybe change the collection to a dictionary to allow easier lookups?

+         **/

 

         #region Private Variables

 

@@ -59,14 +60,30 @@ namespace HandBrake.ApplicationServices.Services
         /// </summary>

         public PresetService()

         {

-            this.Presets = CollectionViewSource.GetDefaultView(this.presets);

+            // this.Presets = CollectionViewSource.GetDefaultView(this.presets);

             this.LoadPresets();

         }

 

         /// <summary>

         /// Gets or sets a Collection of presets.

         /// </summary>

-        public ICollectionView Presets { get; set; }

+        public ObservableCollection<Preset> Presets

+        {

+            get

+            {

+                return this.presets;

+            }

+

+            set

+            {

+                this.presets = value;

+            }

+        }

+

+        /// <summary>

+        /// The last preset added.

+        /// </summary>

+        public Preset LastPresetAdded { get; set; }

 

         #region Public Methods

 

@@ -85,6 +102,7 @@ namespace HandBrake.ApplicationServices.Services
             if (this.CheckIfPresetExists(preset.Name) == false)

             {

                 this.presets.Add(preset);

+                this.LastPresetAdded = preset;

 

                 // Update the presets file

                 this.UpdatePresetFiles();

@@ -95,6 +113,25 @@ namespace HandBrake.ApplicationServices.Services
         }

 

         /// <summary>

+        /// Update a preset

+        /// </summary>

+        /// <param name="update">

+        /// The updated preset

+        /// </param>

+        public void Update(Preset update)

+        {

+            // TODO - Change this to be a lookup

+            foreach (Preset preset in this.presets)

+            {

+                if (preset.Name == update.Name)

+                {

+                    preset.Query = update.Query;

+                    break;

+                }

+            }

+        }

+

+        /// <summary>

         /// Remove a preset with a given name from either the built in or user preset list.

         /// </summary>

         /// <param name="preset">

@@ -154,7 +191,7 @@ namespace HandBrake.ApplicationServices.Services
             string handbrakeCLIPath = Path.Combine(cliPath, "HandBrakeCLI.exe");

             string presetsPath = Path.Combine(Path.GetTempPath(), "temp_presets.dat");

             string strCmdLine = String.Format(@"cmd /c """"{0}"" --preset-list >""{1}"" 2>&1""", handbrakeCLIPath, presetsPath);

-            

+

             ProcessStartInfo getPresets = new ProcessStartInfo("CMD.exe", strCmdLine) { WindowStyle = ProcessWindowStyle.Hidden };

 

             Process hbproc = Process.Start(getPresets);

@@ -163,7 +200,7 @@ namespace HandBrake.ApplicationServices.Services
             hbproc.Close();

 

             // Clear the current built in Presets and now parse the tempory Presets file.

-            this.presets.Clear();

+            this.ClearBuiltIn();

 

             if (File.Exists(presetsPath))

             {

@@ -176,13 +213,13 @@ namespace HandBrake.ApplicationServices.Services
                     string line = presetInput.ReadLine();

 

                     // Found the beginning of a preset block 

-                    if (line != null && line.Contains("<") && !line.Contains("<<")) 

+                    if (line != null && line.Contains("<") && !line.Contains("<<"))

                     {

                         category = line.Replace("<", string.Empty).Trim();

                     }

 

                     // Found a preset

-                    if (line != null && line.Contains("+")) 

+                    if (line != null && line.Contains("+"))

                     {

                         Regex r = new Regex("(:  )"); // Split on hyphens. 

                         string[] presetName = r.Split(line);

@@ -194,14 +231,15 @@ namespace HandBrake.ApplicationServices.Services
                         }

 

                         Preset newPreset = new Preset

-                        {

-                            Category = category,

-                            Name = presetName[0].Replace("+", string.Empty).Trim(),

-                            Query = presetName[2],

-                            Version = Init.Version,

-                            CropSettings = pic,

-                            Description = string.Empty // Maybe one day we will populate this.

-                        };

+                            {

+                                Category = category,

+                                Name = presetName[0].Replace("+", string.Empty).Trim(),

+                                Query = presetName[2],

+                                Version = Init.Version,

+                                CropSettings = pic,

+                                Description = string.Empty, // Maybe one day we will populate this.

+                                IsBuildIn = true

+                            };

                         this.presets.Add(newPreset);

                     }

                 }

@@ -327,14 +365,14 @@ namespace HandBrake.ApplicationServices.Services
             {

                 using (FileStream strm = new FileStream(this.builtInPresetFile, FileMode.Create, FileAccess.Write))

                 {

-                    Ser.Serialize(strm, this.presets.Where(p => p.IsBuildIn));

+                    Ser.Serialize(strm, this.presets.Where(p => p.IsBuildIn).ToList());

                     strm.Close();

                     strm.Dispose();

                 }

 

                 using (FileStream strm = new FileStream(this.userPresetFile, FileMode.Create, FileAccess.Write))

                 {

-                    Ser.Serialize(strm, this.presets.Where(p => p.IsBuildIn == false));

+                    Ser.Serialize(strm, this.presets.Where(p => p.IsBuildIn == false).ToList());

                     strm.Close();

                     strm.Dispose();

                 }