summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorsr55 <[email protected]>2019-07-27 21:02:11 +0100
committersr55 <[email protected]>2019-07-27 21:02:29 +0100
commite30ed94aa03582addb647c607be67ac4eef30870 (patch)
tree127394e8563da7d16b81f21a1d59a61a4b894bce /win
parent87d08603b7521dbdd16d7fbae92679b56f90ad83 (diff)
WinGui: Better formatting for encode times
Diffstat (limited to 'win')
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.Designer.cs2
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.resx2
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs4
3 files changed, 4 insertions, 4 deletions
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 38f971306..f5ea08cf7 100644
--- 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 01f9b9c53..445a55de9 100644
--- 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
index 2b9b88285..4c322f5f4 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -2494,8 +2494,8 @@ namespace HandBrakeWPF.ViewModels
{
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)