WinGui:

- Refractor the Audio and Subtitle Defaults into their own View/ViewModel
- Add a new PopupWindow container system.
- Add "Edit Defaults" for Audio and Subtitles on the Add Preset Pane to make the feature more discoverable.  (Note, this does not change the existing settings on the Audio/Subtitle Tabs)

3 files changed, 81 insertions, 1 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioDefaultsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioDefaultsViewModel.cs
index db2ce4d26..d6859e38e 100644
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioDefaultsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioDefaultsViewModel.cs
@@ -10,15 +10,32 @@
 namespace HandBrakeWPF.ViewModels.Interfaces

 {

     using HandBrakeWPF.Model.Audio;

+    using HandBrakeWPF.Services.Presets.Model;

 

     /// <summary>

     /// The Audio View Model Interface

     /// </summary>

-    public interface IAudioDefaultsViewModel : IOverlayPanel

+    public interface IAudioDefaultsViewModel : IOverlayPanel, IViewModelBase

     {

         /// <summary>

         /// Gets the audio behaviours.

         /// </summary>

         AudioBehaviours AudioBehaviours { get; }

+

+        /// <summary>

+        /// The setup languages.

+        /// </summary>

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

+        /// The preset.

+        /// </param>

+        void SetupLanguages(Preset preset);

+

+        /// <summary>

+        /// The setup languages.

+        /// </summary>

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

+        /// The behaviours.

+        /// </param>

+        void SetupLanguages(AudioBehaviours behaviours);

     }

 }

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IPopupWindowViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IPopupWindowViewModel.cs
new file mode 100644
index 000000000..f4b432e4f
--- /dev/null
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IPopupWindowViewModel.cs
@@ -0,0 +1,22 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IPopupWindowViewModel.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   The PopupWindowViewModel interface.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModels.Interfaces
+{
+    /// <summary>
+    /// The PopupWindowViewModel interface.
+    /// </summary>
+    public interface IPopupWindowViewModel
+    {
+        /// <summary>
+        /// Gets the content view model.
+        /// </summary>
+        IViewModelBase ContentViewModel { get; }
+    }
+}
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesDefaultsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesDefaultsViewModel.cs
new file mode 100644
index 000000000..ed4521897
--- /dev/null
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesDefaultsViewModel.cs
@@ -0,0 +1,41 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ISubtitlesDefaultsViewModel.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the ISubtitlesDefaultsViewMode type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModels.Interfaces
+{
+    using HandBrakeWPF.Model.Subtitles;
+    using HandBrakeWPF.Services.Presets.Model;
+
+    /// <summary>
+    /// The Subtiles View Model Interface
+    /// </summary>
+    public interface ISubtitlesDefaultsViewModel : IViewModelBase
+    {
+        /// <summary>
+        /// Gets the subtitle behaviours.
+        /// </summary>
+        SubtitleBehaviours SubtitleBehaviours { get; }
+
+        /// <summary>
+        /// The setup languages.
+        /// </summary>
+        /// <param name="preset">
+        /// The preset.
+        /// </param>
+        void SetupLanguages(Preset preset);
+
+        /// <summary>
+        /// The setup languages.
+        /// </summary>
+        /// <param name="behaviours">
+        /// The behaviours.
+        /// </param>
+        void SetupLanguages(SubtitleBehaviours behaviours);
+    }
+}