diff options
author | sr55 <[email protected]> | 2012-03-24 16:17:04 +0000 |
---|---|---|
committer | sr55 <[email protected]> | 2012-03-24 16:17:04 +0000 |
commit | 1befa4f1a72a9e8b0277b4ff04b0200dd884f6bc (patch) | |
tree | da3b0dbfd3c474dc8075b569a9d688051c70ca91 /win/CS/HandBrake.ApplicationServices/Model/Encoding | |
parent | 1732654a808c3b0326dd475217abbbe6908cc015 (diff) |
WinGui: (WPF) Fixes to the Audio and Subtitle panels. Add pdb's to installer.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4532 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices/Model/Encoding')
-rw-r--r-- | win/CS/HandBrake.ApplicationServices/Model/Encoding/AllowedPassthru.cs | 6 | ||||
-rw-r--r-- | win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs | 88 |
2 files changed, 69 insertions, 25 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AllowedPassthru.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AllowedPassthru.cs index 4b86fc9a1..31447355b 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AllowedPassthru.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AllowedPassthru.cs @@ -59,6 +59,12 @@ namespace HandBrake.ApplicationServices.Model.Encoding }
/// <summary>
+ /// Gets or sets a value indicating whether IsEnabled.
+ /// Temp Measure until forms gui is retired.
+ /// </summary>
+ public bool IsEnabled { get; set; }
+
+ /// <summary>
/// Gets or sets a value indicating whether AudioAllowAACPass.
/// </summary>
public bool AudioAllowAACPass { get; set; }
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs index c15b9db02..b1ae05a0d 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs @@ -12,22 +12,36 @@ namespace HandBrake.ApplicationServices.Model.Encoding using System;
using System.Windows.Forms;
+ using Caliburn.Micro;
+
using HandBrake.ApplicationServices.Parsing;
/// <summary>
/// Subtitle Information
/// </summary>
- public class SubtitleTrack : ModelBase
+ public class SubtitleTrack : PropertyChangedBase
{
#region Constants and Fields
/// <summary>
+ /// The burned in backing field.
+ /// </summary>
+ private bool burned;
+
+ /// <summary>
+ /// The is default backing field.
+ /// </summary>
+ private bool isDefault;
+
+ /// <summary>
/// The source track.
/// </summary>
private Subtitle sourceTrack;
#endregion
+ #region Constructors and Destructors
+
/// <summary>
/// Initializes a new instance of the <see cref="SubtitleTrack"/> class.
/// </summary>
@@ -57,18 +71,43 @@ namespace HandBrake.ApplicationServices.Model.Encoding this.SourceTrack = subtitle.SourceTrack;
}
- #region Public Properties
+ #endregion
+ #region Properties
/// <summary>
/// Gets or sets a value indicating whether Burned.
/// </summary>
- public bool Burned { get; set; }
+ public bool Burned
+ {
+ get
+ {
+ return this.burned;
+ }
+
+ set
+ {
+ this.burned = value;
+ this.NotifyOfPropertyChange(() => this.Burned);
+ }
+ }
/// <summary>
/// Gets or sets a value indicating whether Default.
/// </summary>
- public bool Default { get; set; }
+ public bool Default
+ {
+ get
+ {
+ return this.isDefault;
+ }
+
+ set
+ {
+ this.isDefault = value;
+ this.NotifyOfPropertyChange(() => this.Default);
+ }
+ }
/// <summary>
/// Gets or sets a value indicating whether Forced.
@@ -87,11 +126,23 @@ namespace HandBrake.ApplicationServices.Model.Encoding }
/// <summary>
- /// Gets or sets Track.
+ /// Gets A ListViewItem Containing information about this subitlte
/// </summary>
- [Obsolete("Use SourceTrack Instead")]
- public string Track { get; set; }
-
+ [Obsolete("Used only for the old forms gui. Will be removed.")]
+ public ListViewItem ListView
+ {
+ get
+ {
+ var listTrack = new ListViewItem(this.Track);
+ 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());
+ return listTrack;
+ }
+ }
/// <summary>
/// Gets or sets SourceTrack.
@@ -106,7 +157,7 @@ namespace HandBrake.ApplicationServices.Model.Encoding set
{
this.sourceTrack = value;
- this.OnPropertyChanged("SourceTrack");
+ this.NotifyOfPropertyChange(() => this.SourceTrack);
if (this.sourceTrack != null)
{
this.Track = this.sourceTrack.ToString();
@@ -145,23 +196,10 @@ namespace HandBrake.ApplicationServices.Model.Encoding public SubtitleType SubtitleType { get; set; }
/// <summary>
- /// Gets A ListViewItem Containing information about this subitlte
+ /// Gets or sets Track.
/// </summary>
- [Obsolete("Used only for the old forms gui. Will be removed.")]
- public ListViewItem ListView
- {
- get
- {
- var listTrack = new ListViewItem(this.Track);
- 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());
- return listTrack;
- }
- }
+ [Obsolete("Use SourceTrack Instead")]
+ public string Track { get; set; }
#endregion
}
|