WinGui: Better formatting for encode times

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 38f971306ee66e76dbfcf28e40deb0cd6f472fb6..f5ea08cf7c556203658ee3310b02aec7b09b11f2 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -4346,7 +4346,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}.
+        ///Time Remaining: {5:hh\:mm\:ss},  Elapsed: {6:hh\:mm\:ss} {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 01f9b9c538bdab903d1197f7acf14f219e7a5d34..445a55de9920a0577208dee6951abd1aa5fd5ece 100644 (file)
--- 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>\r
   <data name="QueueViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">\r
     <value>Encoding: Pass {0} of {1},  {2:00.00}%, FPS: {3:000.0},  Avg FPS: {4:000.0}\r
-Time Remaining: {5},  Elapsed: {6:d\:hh\:mm\:ss} {7}</value>\r
+Time Remaining: {5:hh\:mm\:ss},  Elapsed: {6:hh\:mm\:ss} {7}</value>\r
   </data>\r
   <data name="QueueView_DeleteSelected" xml:space="preserve">\r
     <value>Delete Selected</value>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 2b9b882859e0748740cd9f4010859f8f498268f0..4c322f5f4aef7714aa82d4c15fde6fdd7fc15483 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -2494,8 +2494,8 @@ namespace HandBrakeWPF.ViewModels
                 {\r
                     if (this.queueProcessor.EncodeService.IsEncoding)\r
                     {\r
-                        string totalHrsLeft = string.Format("{0}:{1}:{2}", (int)e.EstimatedTimeLeft.TotalHours, e.EstimatedTimeLeft.Minutes, e.EstimatedTimeLeft.Seconds);\r
-                        string elapsedTimeHrs = string.Format("{0}:{1}:{2}", (int)e.ElapsedTime.TotalHours, e.ElapsedTime.Minutes, e.ElapsedTime.Seconds);\r
+                        string totalHrsLeft = string.Format(@"{0:hh\:mm\:ss}", e.EstimatedTimeLeft);\r
+                        string elapsedTimeHrs = string.Format(@"{0:hh\:mm\:ss} ", e.ElapsedTime);\r
                         string jobsPending = string.Format(Resources.Main_JobsPending_addon, this.queueProcessor.Count);\r
 \r
                         if (e.IsSubtitleScan)\r