diff options
| author | Scott <[email protected]> | 2015-10-10 13:36:58 +0100 |
|---|---|---|
| committer | Scott <[email protected]> | 2015-10-10 13:36:58 +0100 |
| commit | b41f2cea72bfe6925fde8aa09ef6755378d1073d (patch) | |
| tree | afafba58a08f7ed497d7cc4f9656bb214a7151c7 /win/CS/HandBrakeWPF | |
| parent | bfaf362e2d7795ffb400b1fd5ed18d6d024a5fc7 (diff) | |
Updating the status to be consistent with the queue display.
Diffstat (limited to 'win/CS/HandBrakeWPF')
| -rw-r--r-- | win/CS/HandBrakeWPF/Properties/Resources.Designer.cs | 4 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Properties/Resources.resx | 4 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 11 |
3 files changed, 7 insertions, 12 deletions
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs index c2f2fe91c..3c4a3275b 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 {6}.
+ /// Looks up a localized string similar to Pending Jobs {7}.
/// </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}% {1}FPS: {2:000.0} Avg FPS: {3:000.0} Time Remaining: {4} Elapsed: {5:hh\:mm\:ss}.
+ /// 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: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 ef7b9f240..faf06438a 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 {6}</value>
+ <value> Pending Jobs {7}</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}% {1}FPS: {2:000.0} Avg FPS: {3:000.0} Time Remaining: {4} Elapsed: {5:hh\:mm\:ss}</value>
+ <value>Encoding: Pass {0} of {1}, {2:00.00}%, FPS: {3:000.0}, Avg FPS: {4:000.0}, Time Remaining: {5}, Elapsed: {6: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 f62dc81e9..a9ec52071 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -2230,16 +2230,11 @@ 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,
+ string.Format(Resources.MainViewModel_EncodeStatusChanged_StatusLabel + Resources.Main_JobsPending_addon,
+ e.Task,
+ e.TaskCount,
e.PercentComplete,
- pass,
e.CurrentFrameRate,
e.AverageFrameRate,
e.EstimatedTimeLeft,
|