WinGui: Improved an Add All Error message in relation to the Auto File Naming feature.

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

3 files changed, 65 insertions, 6 deletions

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index d0aefd209..b3f489a54 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------

 // <auto-generated>

 //     This code was generated by a tool.

-//     Runtime Version:4.0.30319.18052

+//     Runtime Version:4.0.30319.18408

 //

 //     Changes to this file may cause incorrect behavior and will be lost if

 //     the code is regenerated.

@@ -206,8 +206,7 @@ namespace HandBrakeWPF.Properties {
         ///Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.

         ///

         ///Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.

-        ///

-        /// [rest of string was truncated]&quot;;.

+        ///
        /// [rest of string was truncated]&quot;;.

         /// </summary>

         public static string Advanced_MotionEstimationMethodToolTip {

             get {

@@ -339,6 +338,42 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

+        ///   Looks up a localized string similar to Error.

+        /// </summary>

+        public static string Error {

+            get {

+                return ResourceManager.GetString("Error", resourceCulture);

+            }

+        }

+        

+        /// <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..

+        /// </summary>

+        public static string Main_AutoAdd_AudioAndSubWarning {

+            get {

+                return ResourceManager.GetString("Main_AutoAdd_AudioAndSubWarning", resourceCulture);

+            }

+        }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to You must first scan a source and setup your job before adding to the queue..

+        /// </summary>

+        public static string Main_ScanSourceFirst {

+            get {

+                return ResourceManager.GetString("Main_ScanSourceFirst", resourceCulture);

+            }

+        }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to You must turn on automatic file naming AND set a default path in preferences before you can add to the queue..

+        /// </summary>

+        public static string Main_TurnOnAutoFileNaming {

+            get {

+                return ResourceManager.GetString("Main_TurnOnAutoFileNaming", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to The Built-in presets have been reset..

         /// </summary>

         public static string Presets_ResetComplete {

@@ -540,5 +575,14 @@ namespace HandBrakeWPF.Properties {
                 return ResourceManager.GetString("Video_x264Tune", resourceCulture);

             }

         }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to Warning.

+        /// </summary>

+        public static string Warning {

+            get {

+                return ResourceManager.GetString("Warning", resourceCulture);

+            }

+        }

     }

 }

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 388ccc166..530bedfd6 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -362,4 +362,19 @@ In order to use the QuickSync encoder, you must:
   <data name="Video_ScalingModes" xml:space="preserve">

     <value>OpenCL Scaling is only available for modern graphics cards that support OpenCL 1.1 or later. It will fallback to Lanczos software scaling when it is not available for use.  Performance gain up to 5%. Minor decrease in quality in some cases.</value>

   </data>

+  <data name="Error" xml:space="preserve">

+    <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>

+  </data>

+  <data name="Main_ScanSourceFirst" xml:space="preserve">

+    <value>You must first scan a source and setup your job before adding to the queue.</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>

+  </data>

+  <data name="Warning" xml:space="preserve">

+    <value>Warning</value>

+  </data>

 </root>
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 355aad73d..d15fe931a 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1159,19 +1159,19 @@ namespace HandBrakeWPF.ViewModels
         {

             if (this.ScannedSource == null || this.ScannedSource.Titles == null || this.ScannedSource.Titles.Count == 0)

             {

-                this.errorService.ShowMessageBox("You must first scan a source and setup your job before adding to the queue.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);

+                this.errorService.ShowMessageBox(Resources.Main_ScanSourceFirst, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);

                 return;

             }

 

             if (!AutoNameHelper.IsAutonamingEnabled())

             {

-                this.errorService.ShowMessageBox("You must turn on automatic file naming in preferences before you can add to the queue.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);

+                this.errorService.ShowMessageBox(Resources.Main_TurnOnAutoFileNaming, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);

                 return;

             }

 

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

             {

-                this.errorService.ShowMessageBox("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.", "Warning", MessageBoxButton.OK, MessageBoxImage.Error);

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

             }

 

             foreach (Title title in this.ScannedSource.Titles)