WinGui: Downgrade Subtitle Behaviour Error to a warning. Also checks the behaviour mode now so it should not appear as often. Also change it to Yes/No confirmation.

3 files changed, 26 insertions, 5 deletions

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 54a401bf4..c158e4472 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -667,7 +667,9 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to Warning: It is not currently possible to use this feature if you require specific subtitle or audio tracks that the automatic selection feature (see options) doesn&apos;t support! Tracks are reset with every new source / title selected..

+        ///   Looks up a localized string similar to Warning: If you wish to have subtitles added to each item you are about to queue, please verify that you have the subtitle defaults setup correctly on the subtitles tab.

+        ///    

+        ///    Do you wish to continue?.

         /// </summary>

         public static string Main_AutoAdd_AudioAndSubWarning {

             get {

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 161b55a8f..cf745c370 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -328,7 +328,9 @@ In order to use the QuickSync encoder, you must:
     <value>Error</value>

   </data>

   <data name="Main_AutoAdd_AudioAndSubWarning" xml:space="preserve">

-    <value>Warning: It is not currently possible to use this feature if you require specific subtitle or audio tracks that the automatic selection feature (see options) doesn't support! Tracks are reset with every new source / title selected.</value>

+    <value>Warning: If you wish to have subtitles added to each item you are about to queue, please verify that you have the subtitle defaults setup correctly on the subtitles tab.

+    

+    Do you wish to continue?</value>

   </data>

   <data name="Main_TurnOnAutoFileNaming" xml:space="preserve">

     <value>You must turn on automatic file naming AND set a default path in preferences before you can add to the queue.</value>

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 2fa5425a5..36e65d2e5 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -18,6 +18,7 @@ namespace HandBrakeWPF.ViewModels
     using System.Linq;

     using System.Threading;

     using System.Windows;

+    using System.Windows.Forms;

     using System.Windows.Input;

 

     using Caliburn.Micro;

@@ -50,13 +51,17 @@ namespace HandBrakeWPF.ViewModels
     using HandBrakeWPF.ViewModels.Interfaces;

     using HandBrakeWPF.Views;

 

-    using Microsoft.Win32;

-

     using Ookii.Dialogs.Wpf;

 

     using Action = System.Action;

+    using Application = System.Windows.Application;

+    using DataFormats = System.Windows.DataFormats;

+    using DragEventArgs = System.Windows.DragEventArgs;

     using Execute = Caliburn.Micro.Execute;

     using LogManager = HandBrakeWPF.Helpers.LogManager;

+    using MessageBox = System.Windows.MessageBox;

+    using OpenFileDialog = Microsoft.Win32.OpenFileDialog;

+    using SaveFileDialog = Microsoft.Win32.SaveFileDialog;

 

     /// <summary>

     /// HandBrakes Main Window

@@ -1472,7 +1477,19 @@ namespace HandBrakeWPF.ViewModels
 

             if (this.CurrentTask != null && this.CurrentTask.SubtitleTracks != null && this.CurrentTask.SubtitleTracks.Count > 0)

             {

-                this.errorService.ShowMessageBox(Resources.Main_AutoAdd_AudioAndSubWarning, Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Error);

+                if (this.SubtitleViewModel.SubtitleBehaviours == null || this.SubtitleViewModel.SubtitleBehaviours.SelectedBehaviour == SubtitleBehaviourModes.None)

+                {

+                    System.Windows.MessageBoxResult result = this.errorService.ShowMessageBox(

+                        Resources.Main_AutoAdd_AudioAndSubWarning,

+                        Resources.Warning,

+                        MessageBoxButton.YesNo,

+                        MessageBoxImage.Warning);

+

+                    if (result == MessageBoxResult.No)

+                    {

+                        return;

+                    }

+                }

             }

 

             foreach (Title title in this.ScannedSource.Titles)