WinGui: Trim some duplicate error messages on the main screen.

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 69a0322e10408e982c2a4775d59e9c9a7f7214a8..db9dd3c3277978f89b9f4637c51b1f3222f65cb3 100644 (file)
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -736,6 +736,7 @@
       <Name>HandBrake.Interop</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
+  <ItemGroup />\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 6d2bb0b4aa3cdcb2fbae5157628e53144f9025b4..122d98087c662d1d5b58d3f818f261cbcfb08605 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -1366,15 +1366,6 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Please choose a destination for where you would like the encoded file to be saved..\r
-        /// </summary>\r
-        public static string Main_ChooseDestination {\r
-            get {\r
-                return ResourceManager.GetString("Main_ChooseDestination", resourceCulture);\r
-            }\r
-        }\r
-        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Unable to add the last job to the queue. Do you wish to proceed trying to add the rest?.\r
         /// </summary>\r
@@ -1384,15 +1375,6 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to The current file already exists, do you wish to overwrite it?.\r
-        /// </summary>\r
-        public static string Main_DestinationOverwrite {\r
-            get {\r
-                return ResourceManager.GetString("Main_DestinationOverwrite", resourceCulture);\r
-            }\r
-        }\r
-        \r
         /// <summary>\r
         ///   Looks up a localized string similar to There are jobs on the queue with the same destination path. Please choose a different path for this job..\r
         /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 44e9ed3ebc96483ff0da138b75ebefeb80f834b6..127d9c598c471a88d2ef5f461f050c7d12c08d87 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -337,12 +337,6 @@ Do you wish to continue?</value>
   <data name="Main_AlreadyEncoding" xml:space="preserve">\r
     <value>HandBrake is already encoding.</value>\r
   </data>\r
-  <data name="Main_ChooseDestination" xml:space="preserve">\r
-    <value>Please choose a destination for where you would like the encoded file to be saved.</value>\r
-  </data>\r
-  <data name="Main_DestinationOverwrite" xml:space="preserve">\r
-    <value>The current file already exists, do you wish to overwrite it?</value>\r
-  </data>\r
   <data name="Main_DuplicateDestinationOnQueue" xml:space="preserve">\r
     <value>There are jobs on the queue with the same destination path. Please choose a different path for this job.</value>\r
   </data>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 45904cb0e2e1c88a30c1ca6cdf7ad947e059f4d4..bd7bc420d36fb0173bfd13ae08c61c67af3ff085 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1719,19 +1719,13 @@ namespace HandBrakeWPF.ViewModels
                 return;\r
             }\r
 \r
-            // Otherwise, perform Santiy Checking then add to the queue and start if everything is ok.\r
+            // Otherwise, perform Sanity Checking then add to the queue and start if everything is ok.\r
             if (this.SelectedTitle == null)\r
             {\r
                 this.errorService.ShowMessageBox(Resources.Main_ScanSource, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);\r
                 return;\r
             }\r
 \r
-            if (string.IsNullOrEmpty(this.Destination))\r
-            {\r
-                this.errorService.ShowMessageBox(Resources.Main_ChooseDestination, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);\r
-                return;\r
-            }\r
-\r
             if (!DriveUtilities.HasMinimumDiskSpace(\r
                 this.Destination,\r
                 this.userSettingService.GetUserSetting<long>(UserSettingConstants.PauseOnLowDiskspaceLevel)))\r
@@ -1740,21 +1734,6 @@ namespace HandBrakeWPF.ViewModels
                 return;\r
             }\r
 \r
-            if (this.scannedSource != null && !string.IsNullOrEmpty(this.scannedSource.ScanPath) && this.Destination.ToLower() == this.scannedSource.ScanPath.ToLower())\r
-            {\r
-                this.errorService.ShowMessageBox(Resources.Main_MatchingFileOverwriteWarning, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);\r
-                return;\r
-            }\r
-\r
-            if (File.Exists(this.Destination))\r
-            {\r
-                MessageBoxResult result = this.errorService.ShowMessageBox(Resources.Main_DestinationOverwrite, Resources.Question, MessageBoxButton.YesNo, MessageBoxImage.Question);\r
-                if (result == MessageBoxResult.No)\r
-                {\r
-                    return;\r
-                }\r
-            }\r
-\r
             // Create the Queue Task and Start Processing\r
             if (this.AddToQueue())\r
             {\r