WinGui: Better formatting for encode times

docterling · Jul 27, 2019 · e30ed94 · e30ed94
1 parent 87d0860
commit e30ed94
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -1900,7 +1900,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},  Elapsed: {6:d\:hh\:mm\:ss} {7}</value>
+Time Remaining: {5:hh\:mm\:ss},  Elapsed: {6:hh\:mm\:ss} {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
@@ -2494,8 +2494,8 @@ private void EncodeStatusChanged(object sender, EncodeProgressEventArgs e)
                 {
                     if (this.queueProcessor.EncodeService.IsEncoding)
                     {
-                        string totalHrsLeft = string.Format("{0}:{1}:{2}", (int)e.EstimatedTimeLeft.TotalHours, e.EstimatedTimeLeft.Minutes, e.EstimatedTimeLeft.Seconds);
-                        string elapsedTimeHrs = string.Format("{0}:{1}:{2}", (int)e.ElapsedTime.TotalHours, e.ElapsedTime.Minutes, e.ElapsedTime.Seconds);
+                        string totalHrsLeft = string.Format(@"{0:hh\:mm\:ss}", e.EstimatedTimeLeft);
+                        string elapsedTimeHrs = string.Format(@"{0:hh\:mm\:ss} ", e.ElapsedTime);
                         string jobsPending = string.Format(Resources.Main_JobsPending_addon, this.queueProcessor.Count);
 
                         if (e.IsSubtitleScan)