summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsr55 <[email protected]>2019-02-22 19:46:23 +0000
committersr55 <[email protected]>2019-02-22 19:46:23 +0000
commitc19f938b480615ab48bd432e332c0b7809949b09 (patch)
treeb267303ad4a3137f5a4e11474352ac7289387e2a
parentcedecb141d5e3d500bc6382b1d55c0a5c9d67124 (diff)
WinGui: Reinstate "Resume" vs "Start" encode on the Main screen. Fixes #1919
-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/ViewModels/MainViewModel.cs13
3 files changed, 24 insertions, 1 deletions
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 920e3b625..f096724a5 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -1382,6 +1382,15 @@ namespace HandBrakeWPF.Properties {
}
/// <summary>
+ /// Looks up a localized string similar to Resume Encode.
+ /// </summary>
+ public static string Main_ResumeEncode {
+ get {
+ return ResourceManager.GetString("Main_ResumeEncode", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Scan Cancelled..
/// </summary>
public static string Main_ScanCancelled {
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 18ccf3772..15388e182 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -1909,4 +1909,7 @@ This will not impact any of the software encoders.</value>
<data name="Generic_Apply" xml:space="preserve">
<value>Apply</value>
</data>
+ <data name="Main_ResumeEncode" xml:space="preserve">
+ <value>Resume Encode</value>
+ </data>
</root> \ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index ddabf080e..9c054b9dd 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1009,7 +1009,18 @@ namespace HandBrakeWPF.ViewModels
/// <summary>
/// Gets the start label.
/// </summary>
- public string StartLabel => this.queueProcessor.Count > 0 ? Resources.Main_StartQueue : Resources.Main_Start;
+ public string StartLabel
+ {
+ get
+ {
+ if (this.queueProcessor.EncodeService.IsPasued)
+ {
+ return Resources.Main_ResumeEncode;
+ }
+
+ return this.queueProcessor.Count > 0 ? Resources.Main_StartQueue : Resources.Main_Start;
+ }
+ }
/// <summary>
/// Gets or sets a value indicating whether has source.