Adding Pass Count back onto the status bar.

3 files changed, 13 insertions, 6 deletions

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index d245d5dc8..c2f2fe91c 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -574,7 +574,7 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to    Pending Jobs {5}.

+        ///   Looks up a localized string similar to    Pending Jobs {6}.

         /// </summary>

         public static string Main_JobsPending_addon {

             get {

@@ -934,7 +934,7 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

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

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

         /// </summary>

         public static string MainViewModel_EncodeStatusChanged_StatusLabel {

             get {

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 41a9e58aa..ef7b9f240 100644
--- 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>

   </data>

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

-    <value>   Pending Jobs {5}</value>

+    <value>   Pending Jobs {6}</value>

   </data>

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

     <value>New Default Preset Set: {0}</value>

@@ -551,7 +551,7 @@ The Activity log may have further information.</value>
     <value>Are you sure you want to delete the preset: </value>

   </data>

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

-    <value>{0:00.00}%   FPS: {1:000.0}   Avg FPS: {2:000.0}   Time Remaining: {3}   Elapsed: {4:hh\:mm\:ss}</value>

+    <value>{0:00.00}%   {1}FPS: {2:000.0}   Avg FPS: {3:000.0}   Time Remaining: {4}   Elapsed: {5:hh\:mm\:ss}</value>

   </data>

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

     <value>A Preset must have a Name. Please fill out the Preset Name field.</value>

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 23d23a498..f62dc81e9 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -2230,13 +2230,20 @@ namespace HandBrakeWPF.ViewModels
                 {

                     if (this.queueProcessor.EncodeService.IsEncoding)

                     {

+                        string pass = string.Empty;

+                        if (e.TaskCount > 1)

+                        {

+                            pass = $"for pass {e.Task} of {e.TaskCount}   ";

+                        }

+                        

                         this.ProgramStatusLabel =

                             string.Format(Resources.MainViewModel_EncodeStatusChanged_StatusLabel + Resources.Main_JobsPending_addon, 

-                                e.PercentComplete, 

+                                e.PercentComplete,

+                                pass,

                                 e.CurrentFrameRate, 

                                 e.AverageFrameRate, 

                                 e.EstimatedTimeLeft, 

-                                e.ElapsedTime, 

+                                e.ElapsedTime,

                                 this.queueProcessor.Count);

 

                         if (lastEncodePercentage != percent && this.windowsSeven.IsWindowsSeven)