diff options
| author | sr55 <[email protected]> | 2014-08-10 14:43:30 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2014-08-10 14:43:30 +0000 |
| commit | c7c2aa9ee6c73dcb6b693471945aeadb6ed09983 (patch) | |
| tree | 235d27ab77746b7d3f73e895a17e193c9da800e7 /win/CS/HandBrakeWPF | |
| parent | 1943a5c88df391171b59cb05106e57a60bf0efbf (diff) | |
WinGui: Add new preset keys for the Audio and Subtitle default behaviours. Updated existing preset parser to work with the current version of the plist preset format.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6283 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF')
4 files changed, 4 insertions, 12 deletions
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs index 327ff8ecc..606136ecd 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs +++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs @@ -732,7 +732,7 @@ namespace HandBrakeWPF.Properties { /// <summary>
/// Looks up a localized string similar to The preset you are trying to import is from a different version of HandBrake.
- /// It may not be possible to import or some values may be reset to default as a result.
+ /// It may not be possible to import all the values from this preset.
///
///Do you wish to proceed?.
/// </summary>
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx index 921d898e2..8f433d3cd 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.resx +++ b/win/CS/HandBrakeWPF/Properties/Resources.resx @@ -491,7 +491,7 @@ Your custom presets have not been updated so you may have to re-create these by </data>
<data name="Preset_OldVersion_Message" xml:space="preserve">
<value>The preset you are trying to import is from a different version of HandBrake.
- It may not be possible to import or some values may be reset to default as a result.
+ It may not be possible to import all the values from this preset.
Do you wish to proceed?</value>
</data>
diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs index cc7570140..b297782f2 100644 --- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs @@ -355,8 +355,6 @@ namespace HandBrakeWPF.ViewModels #region Implemented Interfaces
- #region ITabInterface
-
/// <summary>
/// Setup this tab for the specified preset.
/// </summary>
@@ -376,9 +374,9 @@ namespace HandBrakeWPF.ViewModels if (preset != null && preset.Task != null)
{
- this.SetupTracks();
-
this.Task.AllowedPassthruOptions = new AllowedPassthru(preset.Task.AllowedPassthruOptions);
+
+ this.SetupTracks();
}
this.NotifyOfPropertyChange(() => this.Task);
@@ -435,8 +433,6 @@ namespace HandBrakeWPF.ViewModels #endregion
- #endregion
-
#region Methods
/// <summary>
diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs index b279f95c5..0219c49af 100644 --- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs @@ -494,8 +494,6 @@ namespace HandBrakeWPF.ViewModels #region Implemented Interfaces
- #region ITabInterface
-
/// <summary>
/// Setup this tab for the specified preset.
/// </summary>
@@ -557,8 +555,6 @@ namespace HandBrakeWPF.ViewModels #endregion
- #endregion
-
#region Methods
/// <summary>
|