Adding Pass Count back onto the status bar.

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index d245d5dc86e83aa3cd457a1a3f6050663ee08992..c2f2fe91cd7767c6da7311eb44b17f8a45e301e3 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -574,7 +574,7 @@ namespace HandBrakeWPF.Properties {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to    Pending Jobs {5}.\r
+        ///   Looks up a localized string similar to    Pending Jobs {6}.\r
         /// </summary>\r
         public static string Main_JobsPending_addon {\r
             get {\r
@@ -934,7 +934,7 @@ namespace HandBrakeWPF.Properties {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to {0:00.00}%   FPS: {1:000.0}   Avg FPS: {2:000.0}   Time Remaining: {3}   Elapsed: {4:hh\:mm\:ss}.\r
+        ///   Looks up a localized string similar to {0:00.00}%   {1}FPS: {2:000.0}   Avg FPS: {3:000.0}   Time Remaining: {4}   Elapsed: {5:hh\:mm\:ss}.\r
         /// </summary>\r
         public static string MainViewModel_EncodeStatusChanged_StatusLabel {\r
             get {\r

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 41a9e58aae32321a3f1e76e45d98d9ec98640b11..ef7b9f240203740d8e35d5b25f785af83a0ba10e 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -358,7 +358,7 @@ In order to use the QuickSync encoder, you must:
     <value>There are jobs on the queue with the same destination path. Please choose a different path for this job.</value>\r
   </data>\r
   <data name="Main_JobsPending_addon" xml:space="preserve">\r
-    <value>   Pending Jobs {5}</value>\r
+    <value>   Pending Jobs {6}</value>\r
   </data>\r
   <data name="Main_NewDefaultPreset" xml:space="preserve">\r
     <value>New Default Preset Set: {0}</value>\r
@@ -551,7 +551,7 @@ The Activity log may have further information.</value>
     <value>Are you sure you want to delete the preset: </value>\r
   </data>\r
   <data name="MainViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">\r
-    <value>{0:00.00}%   FPS: {1:000.0}   Avg FPS: {2:000.0}   Time Remaining: {3}   Elapsed: {4:hh\:mm\:ss}</value>\r
+    <value>{0:00.00}%   {1}FPS: {2:000.0}   Avg FPS: {3:000.0}   Time Remaining: {4}   Elapsed: {5:hh\:mm\:ss}</value>\r
   </data>\r
   <data name="AddPresetViewModel_PresetMustProvideName" xml:space="preserve">\r
     <value>A Preset must have a Name. Please fill out the Preset Name field.</value>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 23d23a4980aa4ac23bf8a0a58198241debdca077..f62dc81e9f650c4bcdba95ff30e8083df7ff13c1 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -2230,13 +2230,20 @@ namespace HandBrakeWPF.ViewModels
                 {\r
                     if (this.queueProcessor.EncodeService.IsEncoding)\r
                     {\r
+                        string pass = string.Empty;\r
+                        if (e.TaskCount > 1)\r
+                        {\r
+                            pass = $"for pass {e.Task} of {e.TaskCount}   ";\r
+                        }\r
+                        \r
                         this.ProgramStatusLabel =\r
                             string.Format(Resources.MainViewModel_EncodeStatusChanged_StatusLabel + Resources.Main_JobsPending_addon, \r
-                                e.PercentComplete, \r
+                                e.PercentComplete,\r
+                                pass,\r
                                 e.CurrentFrameRate, \r
                                 e.AverageFrameRate, \r
                                 e.EstimatedTimeLeft, \r
-                                e.ElapsedTime, \r
+                                e.ElapsedTime,\r
                                 this.queueProcessor.Count);\r
 \r
                         if (lastEncodePercentage != percent && this.windowsSeven.IsWindowsSeven)\r