WinGui: Initial work to refactor the Audio and Subtitle behavioural based automatic track selections. This is not quite complete yet but close enough for gathering feedback.

- Simplified UI design that's now available on the "Subtitle" and "Audio" tabs rather than the Options screen.
  The settings are no longer part of the app preferences. They are now per-preset. Build in presets default to None.
- Selected Languages can now be set independently for Audio and Video.
- Preferred Language is now part of the Selected Languages list.
- Warning: Import/Export of presets still to be implemented.  Design may yet change.






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

3 files changed, 22 insertions, 1 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs
index ac0ec160f..3ea543b1f 100644
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs
@@ -10,6 +10,8 @@
 namespace HandBrakeWPF.ViewModels.Interfaces

 {

     using HandBrake.ApplicationServices.Model;

+    using HandBrake.ApplicationServices.Model.Audio;

+    using HandBrake.ApplicationServices.Model.Subtitle;

     using HandBrake.ApplicationServices.Parsing;

 

     /// <summary>

@@ -26,6 +28,12 @@ namespace HandBrakeWPF.ViewModels.Interfaces
         /// <param name="title">

         /// The title.

         /// </param>

-        void Setup(EncodeTask task, Title title);

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

+        /// The audio Behaviours.

+        /// </param>

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

+        /// The subtitle Behaviours.

+        /// </param>

+        void Setup(EncodeTask task, Title title, AudioBehaviours audioBehaviours, SubtitleBehaviours subtitleBehaviours);

     }

 }

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioViewModel.cs
index 6f3edca2a..41d7f4940 100644
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioViewModel.cs
@@ -9,12 +9,19 @@
 

 namespace HandBrakeWPF.ViewModels.Interfaces

 {

+    using HandBrake.ApplicationServices.Model.Audio;

+

     /// <summary>

     /// The Audio View Model Interface

     /// </summary>

     public interface IAudioViewModel : ITabInterface

     {

         /// <summary>

+        /// Gets the audio behaviours.

+        /// </summary>

+        AudioBehaviours AudioBehaviours { get; }

+

+        /// <summary>

         /// Trigger a Notify Property Changed on the Task to force various UI elements to update.

         /// </summary>

         void RefreshTask();

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs
index 2b10089de..27d096fb5 100644
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs
@@ -9,10 +9,16 @@
 

 namespace HandBrakeWPF.ViewModels.Interfaces

 {

+    using HandBrake.ApplicationServices.Model.Subtitle;

+

     /// <summary>

     /// The Subtiles View Model Interface

     /// </summary>

     public interface ISubtitlesViewModel : ITabInterface

     {

+        /// <summary>

+        /// Gets the subtitle behaviours.

+        /// </summary>

+        SubtitleBehaviours SubtitleBehaviours { get; }

     }

 }