WinGui: -Fix to the update service. -Change NlMeans to NLMeans

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6320 b64f7644-9d1e-0410-96f1-a4d463321fa5

8 files changed, 9 insertions, 8 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
index 9c6713b30..70a7b9403 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
@@ -224,7 +224,7 @@ namespace HandBrake.ApplicationServices.Utilities
             }

 

             // These keys are still TBD.   TODO Update these

-            if (parsed.Denoise == Denoise.NlMeans)

+            if (parsed.Denoise == Denoise.NLMeans)

             {

                 switch (parsed.DenoisePreset)

                 {

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index 046661058..c804cf518 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -392,7 +392,7 @@ namespace HandBrake.ApplicationServices.Utilities
             }

 

             // NL Means

-            if (task.Denoise == Denoise.NlMeans)

+            if (task.Denoise == Denoise.NLMeans)

             {

                 switch (task.DenoisePreset) // Denoise

                 {

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
index b3619c7dd..95fd219ef 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
@@ -296,7 +296,7 @@ namespace HandBrake.ApplicationServices.Utilities
 

                 if (nlmeans.Success)

                 {

-                    parsed.Denoise = Denoise.NlMeans;

+                    parsed.Denoise = Denoise.NLMeans;

                     switch (nlmeans.ToString().Replace("--nlmeans=", string.Empty).Replace("\"", string.Empty))

                     {

                         case "ultralight":

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Denoise.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Denoise.cs
index 500547a24..0d17a0f77 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Denoise.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Denoise.cs
@@ -16,6 +16,6 @@ namespace HandBrake.Interop.Model.Encoding
 	{

 		Off = 0,

         hqdn3d = 1,

-		NlMeans = 2,

+		NLMeans = 2,

 	}

 }

diff --git a/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs b/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs
index 58576d747..52e280722 100644
--- a/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs
@@ -52,7 +52,7 @@ namespace HandBrakeWPF.Converters.Filters
                     return new List<DenoisePreset> { DenoisePreset.Weak, DenoisePreset.Medium, DenoisePreset.Strong, DenoisePreset.Custom };

                 }

 

-                if (denoiseChoice == Denoise.NlMeans)

+                if (denoiseChoice == Denoise.NLMeans)

                 {

                     return new List<DenoisePreset> { DenoisePreset.Ultralight, DenoisePreset.Light, DenoisePreset.Medium, DenoisePreset.Strong };

                 } 

diff --git a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
index 5fdeb9c44..019bf0418 100644
--- a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
@@ -464,7 +464,7 @@ namespace HandBrakeWPF.ViewModels
         {

             get

             {

-                return this.SelectedDenoise == Denoise.NlMeans;

+                return this.SelectedDenoise == Denoise.NLMeans;

             }

         }

 

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 6e6b21a1f..c91a917f8 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -27,7 +27,6 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Model.Subtitle;

     using HandBrake.ApplicationServices.Parsing;

-    using HandBrake.ApplicationServices.Services;

     using HandBrake.ApplicationServices.Services.Interfaces;

     using HandBrake.ApplicationServices.Utilities;

 

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index af4243b93..504f692bc 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -1697,6 +1697,8 @@ namespace HandBrakeWPF.ViewModels
         {

             if (info.TotalBytes == 0 || info.BytesRead == 0)

             {

+                this.UpdateAvailable = false;

+                this.UpdateMessage = info.WasSuccessful ? "Update Downloaded" : "Update Service Unavailable. You can try downloading the update from https://handbrake.fr";

                 return;

             }

 

@@ -1717,7 +1719,7 @@ namespace HandBrakeWPF.ViewModels
         private void DownloadComplete(DownloadStatus info)

         {

             this.UpdateAvailable = false;

-            this.UpdateMessage = info.WasSuccessful ? "Update Downloaded" : "Update Failed. You can try downloading the update from http://handbrake.fr";

+            this.UpdateMessage = info.WasSuccessful ? "Update Downloaded" : "Update Failed. You can try downloading the update from https://handbrake.fr";

 

             Process.Start(Path.Combine(Path.GetTempPath(), "handbrake-setup.exe"));

             Execute.OnUIThread(() => Application.Current.Shutdown());