WinGui: Tidy up a few instances of mesagebox.show.

diff --git a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
index 42eb5c26f88612ba45ffd3ca58b1d4d81623f7ad..ef280b5b7722a294b57506203c1291c6e22c4e36 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
@@ -917,11 +917,11 @@ namespace HandBrakeWPF.Services.Presets
             {\r
                 if (!this.CanUpdatePreset(preset.Name))\r
                 {\r
-                    MessageBox.Show(Resources.Main_PresetErrorBuiltInName, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);\r
+                    this.errorService.ShowMessageBox(Resources.Main_PresetErrorBuiltInName, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);\r
                     return;\r
                 }\r
 \r
-                MessageBoxResult result = MessageBox.Show(string.Format(Resources.Main_PresetOverwriteWarning, preset.Name), Resources.Overwrite, MessageBoxButton.YesNo, MessageBoxImage.Warning);\r
+                MessageBoxResult result = this.errorService.ShowMessageBox(string.Format(Resources.Main_PresetOverwriteWarning, preset.Name), Resources.Overwrite, MessageBoxButton.YesNo, MessageBoxImage.Warning);\r
                 if (result == MessageBoxResult.Yes)\r
                 {\r
                     this.Update(preset);\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index bd7bc420d36fb0173bfd13ae08c61c67af3ff085..1d5c7187dc646a768f5be035f18a3107e54f4531 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1852,7 +1852,7 @@ namespace HandBrakeWPF.ViewModels
 \r
                     if (this.SelectedTitle == null)\r
                     {\r
-                        MessageBox.Show(\r
+                        this.errorService.ShowMessageBox(\r
                             Resources.MainView_SubtitleBeforeScanError,\r
                             Resources.Error,\r
                             MessageBoxButton.OK,\r
@@ -2094,7 +2094,7 @@ namespace HandBrakeWPF.ViewModels
             }\r
             else\r
             {\r
-                MessageBox.Show(Resources.Main_SelectPreset, Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);\r
+                this.errorService.ShowMessageBox(Resources.Main_SelectPreset, Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);\r
             }\r
         }\r
 \r
@@ -2106,11 +2106,11 @@ namespace HandBrakeWPF.ViewModels
             if (this.selectedPreset != null)\r
             {\r
                 this.presetService.SetDefault(this.selectedPreset);\r
-                MessageBox.Show(string.Format(Resources.Main_NewDefaultPreset, this.selectedPreset.Name), Resources.Main_Presets, MessageBoxButton.OK, MessageBoxImage.Information);\r
+                this.errorService.ShowMessageBox(string.Format(Resources.Main_NewDefaultPreset, this.selectedPreset.Name), Resources.Main_Presets, MessageBoxButton.OK, MessageBoxImage.Information);\r
             }\r
             else\r
             {\r
-                MessageBox.Show(Resources.Main_SelectPreset, Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);\r
+                this.errorService.ShowMessageBox(Resources.Main_SelectPreset, Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);\r
             }\r
         }\r
 \r
@@ -2155,7 +2155,7 @@ namespace HandBrakeWPF.ViewModels
             }\r
             else\r
             {\r
-                MessageBox.Show(Resources.Main_SelectPreset, Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);\r
+                this.errorService.ShowMessageBox(Resources.Main_SelectPreset, Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);\r
             }\r
         }\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index dd45d5d5550654c59edde6d55c29d26581e541c3..e180746819789c76f915c51e001c3a1326ae8a2c 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -1284,12 +1284,12 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>\r
         public void ClearLogHistory()\r
         {\r
-            MessageBoxResult result = MessageBox.Show(Resources.OptionsView_ClearLogDirConfirm, Resources.OptionsView_ClearLogs,\r
+            MessageBoxResult result = this.errorService.ShowMessageBox(Resources.OptionsView_ClearLogDirConfirm, Resources.OptionsView_ClearLogs,\r
                                                   MessageBoxButton.YesNoCancel, MessageBoxImage.Question);\r
             if (result == MessageBoxResult.Yes)\r
             {\r
                 GeneralUtilities.ClearLogFiles(0);\r
-                MessageBox.Show(Resources.OptionsView_LogsCleared, Resources.OptionsView_Notice, MessageBoxButton.OK, MessageBoxImage.Information);\r
+                this.errorService.ShowMessageBox(Resources.OptionsView_LogsCleared, Resources.OptionsView_Notice, MessageBoxButton.OK, MessageBoxImage.Information);\r
             }\r
         }\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
index 556f741f18e0e51674d0cab1c04a1e9835f7deee..2e31a2a04fd8f12ad452b43f0828666039ec58c0 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -352,7 +352,7 @@ namespace HandBrakeWPF.ViewModels
             this.JobsPending = string.Format(Resources.QueueViewModel_JobsPending, this.queueProcessor.Count);\r
             this.IsQueueRunning = false;\r
 \r
-            MessageBox.Show(Resources.QueueViewModel_QueuePauseNotice, Resources.QueueViewModel_Queue,\r
+            this.errorService.ShowMessageBox(Resources.QueueViewModel_QueuePauseNotice, Resources.QueueViewModel_Queue,\r
                 MessageBoxButton.OK, MessageBoxImage.Information);\r
         }\r
 \r