summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF
diff options
context:
space:
mode:
Diffstat (limited to 'win/CS/HandBrakeWPF')
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.Designer.cs9
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.resx3
-rw-r--r--win/CS/HandBrakeWPF/Services/Queue/Interfaces/IQueueProcessor.cs5
-rw-r--r--win/CS/HandBrakeWPF/Services/Queue/QueueProcessor.cs11
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs8
5 files changed, 35 insertions, 1 deletions
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 30084463c..52b7258f9 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -730,6 +730,15 @@ namespace HandBrakeWPF.Properties {
}
/// <summary>
+ /// Looks up a localized string similar to with {0} errors detected..
+ /// </summary>
+ public static string Main_QueueFinishedErrors {
+ get {
+ return ResourceManager.GetString("Main_QueueFinishedErrors", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Show Queue{0}.
/// </summary>
public static string Main_QueueLabel {
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 7ce2bf391..ba36e3013 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -730,4 +730,7 @@ If it fails, it will archive off the old file and create a new one.</value>
Your old presets file was archived to:</value>
</data>
+ <data name="Main_QueueFinishedErrors" xml:space="preserve">
+ <value> with {0} errors detected.</value>
+ </data>
</root> \ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Services/Queue/Interfaces/IQueueProcessor.cs b/win/CS/HandBrakeWPF/Services/Queue/Interfaces/IQueueProcessor.cs
index 7a27f685f..d0bef608f 100644
--- a/win/CS/HandBrakeWPF/Services/Queue/Interfaces/IQueueProcessor.cs
+++ b/win/CS/HandBrakeWPF/Services/Queue/Interfaces/IQueueProcessor.cs
@@ -54,6 +54,11 @@ namespace HandBrakeWPF.Services.Queue.Interfaces
int Count { get; }
/// <summary>
+ /// The number of errors detected in the queue.
+ /// </summary>
+ int ErrorCount { get; }
+
+ /// <summary>
/// Gets the IEncodeService instance.
/// </summary>
IEncode EncodeService { get; }
diff --git a/win/CS/HandBrakeWPF/Services/Queue/QueueProcessor.cs b/win/CS/HandBrakeWPF/Services/Queue/QueueProcessor.cs
index 94d9775d4..31fd7acee 100644
--- a/win/CS/HandBrakeWPF/Services/Queue/QueueProcessor.cs
+++ b/win/CS/HandBrakeWPF/Services/Queue/QueueProcessor.cs
@@ -141,6 +141,17 @@ namespace HandBrakeWPF.Services.Queue
}
/// <summary>
+ /// The number of errors detected.
+ /// </summary>
+ public int ErrorCount
+ {
+ get
+ {
+ return this.queue.Count(item => item.Status == QueueItemStatus.Error);
+ }
+ }
+
+ /// <summary>
/// Gets the IEncodeService instance.
/// </summary>
public IEncode EncodeService { get; private set; }
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 69d38f159..bc6caa38a 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -2247,7 +2247,13 @@ namespace HandBrakeWPF.ViewModels
Execute.OnUIThread(
() =>
{
- this.ProgramStatusLabel = Resources.Main_QueueFinished;
+ string errorDesc = string.Empty;
+ if (this.queueProcessor.ErrorCount > 0)
+ {
+ errorDesc += string.Format(Resources.Main_QueueFinishedErrors, this.queueProcessor.ErrorCount);
+ }
+
+ this.ProgramStatusLabel = Resources.Main_QueueFinished + errorDesc;
this.IsEncoding = false;
if (this.windowsSeven.IsWindowsSeven)