WinGui: Fix handling of Estimated Time left when job time >= 1 day. Fixes #2582

(cherry picked from commit d8fff96fa0b7c08578bdd8362e7a557c551d24d1)

4 files changed, 15 insertions, 12 deletions

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 1daefe822..c41b31293 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -2484,7 +2484,7 @@ namespace HandBrakeWPF.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Encoding: Pass {0} of {1},  {2:00.00}%, FPS: {3:000.0},  Avg FPS: {4:000.0},  Time Remaining: {5},  Elapsed: {6:d\:hh\:mm\:ss} {7}.
+        ///   Looks up a localized string similar to Encoding: Pass {0} of {1},  {2:00.00}%, FPS: {3:000.0},  Avg FPS: {4:000.0},  Time Remaining: {5},  Elapsed: {6} {7}.
         /// </summary>
         public static string MainViewModel_EncodeStatusChanged_StatusLabel {
             get {
@@ -2493,7 +2493,7 @@ namespace HandBrakeWPF.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Processing Pass {0} of {1}, (Subtitle Scan)  {2:00.00}%, Scan Time Remaining: {3},  Elapsed: {4:d\:hh\:mm\:ss}.
+        ///   Looks up a localized string similar to Processing Pass {0} of {1}, (Subtitle Scan)  {2:00.00}%, Scan Time Remaining: {3},  Elapsed: {4}.
         /// </summary>
         public static string MainViewModel_EncodeStatusChanged_SubScan_StatusLabel {
             get {
@@ -4684,7 +4684,7 @@ namespace HandBrakeWPF.Properties {
         
         /// <summary>
         ///   Looks up a localized string similar to Encoding: Pass {0} of {1},  {2:00.00}%, FPS: {3:000.0},  Avg FPS: {4:000.0}
-        ///Time Remaining: {5:hh\:mm\:ss},  Elapsed: {6:hh\:mm\:ss} {7}.
+        ///Time Remaining: {5},  Elapsed: {6} {7}.
         /// </summary>
         public static string QueueViewModel_EncodeStatusChanged_StatusLabel {
             get {
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index d6cfd22f2..786eeff95 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -404,7 +404,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>Encoding: Pass {0} of {1},  {2:00.00}%, FPS: {3:000.0},  Avg FPS: {4:000.0},  Time Remaining: {5},  Elapsed: {6:d\:hh\:mm\:ss} {7}</value>

+    <value>Encoding: Pass {0} of {1},  {2:00.00}%, FPS: {3:000.0},  Avg FPS: {4:000.0},  Time Remaining: {5},  Elapsed: {6} {7}</value>

   </data>

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

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

@@ -677,7 +677,7 @@ Your preset file will be archived and new one created. You will need to re-creat
     <value>Please check that you have a valid destination directory.</value>

   </data>

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

-    <value>Processing Pass {0} of {1}, (Subtitle Scan)  {2:00.00}%, Scan Time Remaining: {3},  Elapsed: {4:d\:hh\:mm\:ss}</value>

+    <value>Processing Pass {0} of {1}, (Subtitle Scan)  {2:00.00}%, Scan Time Remaining: {3},  Elapsed: {4}</value>

   </data>

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

     <value>No Additional Information</value>

@@ -1884,7 +1884,7 @@ This will not impact any of the software encoders.</value>
   </data>

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

     <value>Encoding: Pass {0} of {1},  {2:00.00}%, FPS: {3:000.0},  Avg FPS: {4:000.0}

-Time Remaining: {5:hh\:mm\:ss},  Elapsed: {6:hh\:mm\:ss} {7}</value>

+Time Remaining: {5},  Elapsed: {6} {7}</value>

   </data>

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

     <value>Delete Selected</value>

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index da77e5502..f4d8cdcf0 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -2505,8 +2505,8 @@ namespace HandBrakeWPF.ViewModels
                 {

                     if (this.queueProcessor.EncodeService.IsEncoding)

                     {

-                        string totalHrsLeft = string.Format(@"{0:hh\:mm\:ss}", e.EstimatedTimeLeft);

-                        string elapsedTimeHrs = string.Format(@"{0:hh\:mm\:ss} ", e.ElapsedTime);

+                        string totalHrsLeft = e.EstimatedTimeLeft.Days >= 1 ? string.Format(@"{0:d\:hh\:mm\:ss}", e.EstimatedTimeLeft) : string.Format(@"{0:hh\:mm\:ss}", e.EstimatedTimeLeft);

+                        string elapsedTimeHrs = e.ElapsedTime.Days >= 1 ? string.Format(@"{0:d\:hh\:mm\:ss}", e.ElapsedTime) : string.Format(@"{0:hh\:mm\:ss}", e.ElapsedTime);

                         string jobsPending = string.Format(Resources.Main_JobsPending_addon, this.queueProcessor.Count);

 

                         if (e.IsSubtitleScan)

diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
index f176e2caf..c3020509e 100644
--- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -811,14 +811,17 @@ namespace HandBrakeWPF.ViewModels
             {

                 this.IntermediateProgress = false;

 

+                string totalHrsLeft = e.EstimatedTimeLeft.Days >= 1 ? string.Format(@"{0:d\:hh\:mm\:ss}", e.EstimatedTimeLeft) : string.Format(@"{0:hh\:mm\:ss}", e.EstimatedTimeLeft);

+                string elapsedTimeHrs = e.ElapsedTime.Days >= 1 ? string.Format(@"{0:d\:hh\:mm\:ss}", e.ElapsedTime) : string.Format(@"{0:hh\:mm\:ss}", e.ElapsedTime);

+

                 if (e.IsSubtitleScan)

                 {

                     this.JobStatus = string.Format(Resources.MainViewModel_EncodeStatusChanged_SubScan_StatusLabel,

                         e.Task,

                         e.TaskCount,

                         e.PercentComplete,

-                        e.EstimatedTimeLeft,

-                        e.ElapsedTime,

+                        totalHrsLeft,

+                        elapsedTimeHrs,

                         null);

 

                     this.ProgressValue = e.PercentComplete;

@@ -842,8 +845,8 @@ namespace HandBrakeWPF.ViewModels
                             e.PercentComplete,

                             e.CurrentFrameRate,

                             e.AverageFrameRate,

-                            e.EstimatedTimeLeft,

-                            e.ElapsedTime,

+                            totalHrsLeft,

+                            elapsedTimeHrs,

                             null);

                     this.ProgressValue = e.PercentComplete;

                 }