From ec522a70a2f4e584e486b9412a86a7440c2e6b50 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Sun, 18 May 2014 19:56:12 +0000
Subject: WinGui: Minor tidy up of options. Cleanup of some code warnings and
 some initial DPIAwareness code.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6198 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs | 3 ++-
 win/CS/HandBrakeWPF/Helpers/CliCheckHelper.cs | 3 ---
 win/CS/HandBrakeWPF/Helpers/FileHelper.cs     | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'win/CS/HandBrakeWPF/Helpers')

diff --git a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
index e9e4d0278..0c521661b 100644
--- a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
+++ b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
@@ -18,7 +18,6 @@ namespace HandBrakeWPF.Helpers
     using HandBrake.ApplicationServices.Extensions;
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Model.Encoding;
-    using HandBrake.ApplicationServices.Services.Interfaces;
     using HandBrake.Interop.Model.Encoding;
 
     using HandBrakeWPF.Services.Interfaces;
@@ -97,10 +96,12 @@ namespace HandBrakeWPF.Helpers
                     if (task.VideoEncodeRateType == VideoEncodeRateType.ConstantQuality)
                     {
                         destinationFilename = destinationFilename.Replace(Constants.Quality, task.Quality.ToString());
+                        destinationFilename = destinationFilename.Replace(Constants.Bitrate, string.Empty);
                     }
                     else
                     {
                         destinationFilename = destinationFilename.Replace(Constants.Bitrate, task.VideoBitrate.ToString());
+                        destinationFilename = destinationFilename.Replace(Constants.Quality, string.Empty);
                     }
                 }
                 else
diff --git a/win/CS/HandBrakeWPF/Helpers/CliCheckHelper.cs b/win/CS/HandBrakeWPF/Helpers/CliCheckHelper.cs
index ede46fa8b..302611e1e 100644
--- a/win/CS/HandBrakeWPF/Helpers/CliCheckHelper.cs
+++ b/win/CS/HandBrakeWPF/Helpers/CliCheckHelper.cs
@@ -18,9 +18,6 @@ namespace HandBrakeWPF.Helpers
 
     using Caliburn.Micro;
 
-    using HandBrake.ApplicationServices;
-    using HandBrake.ApplicationServices.Services.Interfaces;
-
     using HandBrakeWPF.Services.Interfaces;
 
     /// <summary>
diff --git a/win/CS/HandBrakeWPF/Helpers/FileHelper.cs b/win/CS/HandBrakeWPF/Helpers/FileHelper.cs
index 7a882de0b..e9017f8b5 100644
--- a/win/CS/HandBrakeWPF/Helpers/FileHelper.cs
+++ b/win/CS/HandBrakeWPF/Helpers/FileHelper.cs
@@ -42,7 +42,6 @@ namespace HandBrakeWPF.Helpers
                     {
                         return true;
                     }
-
                 }
                 catch (ArgumentException)
                 {
-- 
cgit v1.2.3