WinGui:

- Some refactoring of the Subtitle panel. Added support for subtitle type display to the subtitle dropdown and burn in support for SSA. 

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

1 files changed, 13 insertions, 6 deletions

diff --git a/win/C#/Model/Subtitle.cs b/win/C#/Model/Subtitle.cs
index 9254ab438..605e3da23 100644
--- a/win/C#/Model/Subtitle.cs
+++ b/win/C#/Model/Subtitle.cs
@@ -7,6 +7,8 @@ namespace Handbrake.Model
 {

     using System.Windows.Forms;

 

+    using HandBrake.ApplicationServices.Model;

+

     /// <summary>

     /// Subtitle Information

     /// </summary>

@@ -20,17 +22,17 @@ namespace Handbrake.Model
         /// <summary>

         /// Gets or sets the Forced Subtitle

         /// </summary>

-        public string Forced { get; set; }

+        public bool Forced { get; set; }

 

         /// <summary>

         /// Gets or sets the Burned In Subtitle

         /// </summary>

-        public string Burned { get; set; }

+        public bool Burned { get; set; }

 

         /// <summary>

         /// Gets or sets the Default Subtitle Track

         /// </summary>

-        public string Default { get; set; }

+        public bool Default { get; set; }

 

         /// <summary>

         /// Gets or sets the SRT Language

@@ -66,6 +68,11 @@ namespace Handbrake.Model
         }

 

         /// <summary>

+        /// Gets or sets the type of the subtitle

+        /// </summary>

+        public SubtitleType SubtitleType { get; set; }

+

+        /// <summary>

         /// Gets A ListViewItem Containing information about this subitlte

         /// </summary>

         public ListViewItem ListView

@@ -73,9 +80,9 @@ namespace Handbrake.Model
             get

             {

                 var listTrack = new ListViewItem(this.Track);

-                listTrack.SubItems.Add(this.Forced);

-                listTrack.SubItems.Add(this.Burned);

-                listTrack.SubItems.Add(this.Default);

+                listTrack.SubItems.Add(this.Forced ? "Yes" : "No");

+                listTrack.SubItems.Add(this.Burned ? "Yes" : "No");

+                listTrack.SubItems.Add(this.Default ? "Yes" : "No");

                 listTrack.SubItems.Add(this.SrtLang);

                 listTrack.SubItems.Add(this.SrtCharCode);

                 listTrack.SubItems.Add(this.SrtOffset.ToString());