Use custom msgbox

SubtitleEdit · Aug 9, 2023 · 4369237 · 4369237
1 parent 1c2130a
commit 4369237
Show file tree

Hide file tree

Showing 115 changed files with 162 additions and 26 deletions.
diff --git a/Icons/Black/Error.png b/Icons/Black/Error.png
diff --git a/Icons/Black/Information.png b/Icons/Black/Information.png
diff --git a/Icons/Black/Question.png b/Icons/Black/Question.png
diff --git a/Icons/Black/Warning.png b/Icons/Black/Warning.png
diff --git a/Icons/DarkTheme/Error.png b/Icons/DarkTheme/Error.png
diff --git a/Icons/DarkTheme/Information.png b/Icons/DarkTheme/Information.png
diff --git a/Icons/DarkTheme/Question.png b/Icons/DarkTheme/Question.png
diff --git a/Icons/DarkTheme/Warning.png b/Icons/DarkTheme/Warning.png
diff --git a/Icons/DefaultTheme/Error.png b/Icons/DefaultTheme/Error.png
diff --git a/Icons/DefaultTheme/Information.png b/Icons/DefaultTheme/Information.png
diff --git a/Icons/DefaultTheme/Question.png b/Icons/DefaultTheme/Question.png
diff --git a/Icons/DefaultTheme/Warning.png b/Icons/DefaultTheme/Warning.png
diff --git a/Icons/Legacy/Error.png b/Icons/Legacy/Error.png
diff --git a/Icons/Legacy/Information.png b/Icons/Legacy/Information.png
diff --git a/Icons/Legacy/MsgBoError.png b/Icons/Legacy/MsgBoError.png
diff --git a/Icons/Legacy/MsgBoxInfo.png b/Icons/Legacy/MsgBoxInfo.png
diff --git a/Icons/Legacy/MsgBoxQuestion.png b/Icons/Legacy/MsgBoxQuestion.png
diff --git a/Icons/Legacy/MsgBoxWarning.png b/Icons/Legacy/MsgBoxWarning.png
diff --git a/Icons/Legacy/Question.png b/Icons/Legacy/Question.png
diff --git a/Icons/Legacy/Warning.png b/Icons/Legacy/Warning.png
diff --git a/src/ui/Forms/AddToNames.cs b/src/ui/Forms/AddToNames.cs
@@ -3,6 +3,7 @@
 using Nikse.SubtitleEdit.Logic;
 using System;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/AddWaveform.cs b/src/ui/Forms/AddWaveform.cs
@@ -9,6 +9,7 @@
 using System.Globalization;
 using System.IO;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/AddWaveformBatch.cs b/src/ui/Forms/AddWaveformBatch.cs
@@ -8,6 +8,7 @@
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/Assa/AssSetBackground.cs b/src/ui/Forms/Assa/AssSetBackground.cs
@@ -16,6 +16,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using Nikse.SubtitleEdit.Controls;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms.Assa
 {

diff --git a/src/ui/Forms/Assa/AssaStyles.cs b/src/ui/Forms/Assa/AssaStyles.cs
@@ -13,6 +13,7 @@
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms.Assa
 {

diff --git a/src/ui/Forms/Assa/Attachments.cs b/src/ui/Forms/Assa/Attachments.cs
@@ -10,6 +10,7 @@
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms.Assa
 {

diff --git a/src/ui/Forms/Assa/ResolutionResampler.cs b/src/ui/Forms/Assa/ResolutionResampler.cs
@@ -5,6 +5,7 @@
 using System.Globalization;
 using System.IO;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms.Assa
 {

diff --git a/src/ui/Forms/Assa/SetPosition.cs b/src/ui/Forms/Assa/SetPosition.cs
@@ -10,6 +10,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms.Assa
 {

diff --git a/src/ui/Forms/Assa/SubStationAlphaStylesCategoriesManager.cs b/src/ui/Forms/Assa/SubStationAlphaStylesCategoriesManager.cs
@@ -6,6 +6,7 @@
 using System.Xml;
 using Nikse.SubtitleEdit.Core.Common;
 using Nikse.SubtitleEdit.Logic;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms.Assa
 {

diff --git a/src/ui/Forms/AudioToText/VoskAudioToText.cs b/src/ui/Forms/AudioToText/VoskAudioToText.cs
@@ -13,6 +13,7 @@
 using Nikse.SubtitleEdit.Core.SubtitleFormats;
 using Nikse.SubtitleEdit.Logic;
 using Vosk;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms.AudioToText
 {

diff --git a/src/ui/Forms/AudioToText/VoskModelDownload.cs b/src/ui/Forms/AudioToText/VoskModelDownload.cs
@@ -7,6 +7,7 @@
 using Nikse.SubtitleEdit.Core.Common;
 using Nikse.SubtitleEdit.Core.Http;
 using Nikse.SubtitleEdit.Logic;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms.AudioToText
 {

diff --git a/src/ui/Forms/AudioToText/WhisperAudioToText.cs b/src/ui/Forms/AudioToText/WhisperAudioToText.cs
@@ -15,6 +15,7 @@
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using Nikse.SubtitleEdit.Controls;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms.AudioToText
 {

diff --git a/src/ui/Forms/AudioToText/WhisperAudioToTextSelectedLines.cs b/src/ui/Forms/AudioToText/WhisperAudioToTextSelectedLines.cs
@@ -10,6 +10,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms.AudioToText
 {

diff --git a/src/ui/Forms/AudioToText/WhisperDownload.cs b/src/ui/Forms/AudioToText/WhisperDownload.cs
@@ -7,6 +7,7 @@
 using System.Windows.Forms;
 using Nikse.SubtitleEdit.Core.AudioToText;
 using Nikse.SubtitleEdit.Core.Http;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms.AudioToText
 {

diff --git a/src/ui/Forms/AudioToText/WhisperModelDownload.cs b/src/ui/Forms/AudioToText/WhisperModelDownload.cs
@@ -8,6 +8,7 @@
 using System.Threading;
 using System.Windows.Forms;
 using Nikse.SubtitleEdit.Core.Common;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms.AudioToText
 {

diff --git a/src/ui/Forms/BatchConvert.cs b/src/ui/Forms/BatchConvert.cs
@@ -23,6 +23,7 @@
 using System.Threading;
 using System.Windows.Forms;
 using Nikse.SubtitleEdit.Core.Enums;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/BeautifyTimeCodes/BeautifyTimeCodes.cs b/src/ui/Forms/BeautifyTimeCodes/BeautifyTimeCodes.cs
@@ -7,6 +7,7 @@
 using Nikse.SubtitleEdit.Core.Forms;
 using Nikse.SubtitleEdit.Forms.ShotChanges;
 using Nikse.SubtitleEdit.Logic;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms.BeautifyTimeCodes
 {

diff --git a/src/ui/Forms/BinaryEdit/BinEdit.cs b/src/ui/Forms/BinaryEdit/BinEdit.cs
@@ -22,6 +22,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.Xml;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms.BinaryEdit
 {
@@ -2792,8 +2793,14 @@ private void timerSubtitleOnVideo_Tick(object sender, EventArgs e)
  }
  }
 
+ private bool _forceClose;
  private void BinEdit_FormClosing(object sender, FormClosingEventArgs e)
  {
+ if (_forceClose)
+ {
+ return;
+ }
+
  if (_extra != null && HasChanges())
  {
  var result = MessageBox.Show(this, "Close and lose changes?", "SE", MessageBoxButtons.YesNoCancel);
@@ -2806,6 +2813,15 @@ private void BinEdit_FormClosing(object sender, FormClosingEventArgs e)
 
  CloseVideo();
  CleanUp();
+
+ if (!e.Cancel)
+ {
+ e.Cancel = true;
+
+ // To allow windows in FormClosing...
+ _forceClose = true;
+ SynchronizationContext.Current.Post(TimeSpan.FromMilliseconds(10), () => Close());
+ }
  }
 
  private void CleanUp()

diff --git a/src/ui/Forms/BinaryEdit/BinEditNewText.cs b/src/ui/Forms/BinaryEdit/BinEditNewText.cs
@@ -6,6 +6,7 @@
 using System.Globalization;
 using System.Windows.Forms;
 using static Nikse.SubtitleEdit.Forms.ExportPngXml;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms.BinaryEdit
 {

diff --git a/src/ui/Forms/ChangeFrameRate.cs b/src/ui/Forms/ChangeFrameRate.cs
@@ -3,6 +3,7 @@
 using System.Globalization;
 using System.Windows.Forms;
 using Nikse.SubtitleEdit.Controls;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/ChooseEncoding.cs b/src/ui/Forms/ChooseEncoding.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Text;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/Compare.cs b/src/ui/Forms/Compare.cs
@@ -9,6 +9,7 @@
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/DoNotBreakAfterListEdit.cs b/src/ui/Forms/DoNotBreakAfterListEdit.cs
@@ -7,6 +7,7 @@
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using System.Xml;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/DownloadFfmpeg.cs b/src/ui/Forms/DownloadFfmpeg.cs
@@ -5,6 +5,7 @@
 using System.IO;
 using System.Threading;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/DownloadVosk.cs b/src/ui/Forms/DownloadVosk.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/DownloadYouTubeDl.cs b/src/ui/Forms/DownloadYouTubeDl.cs
@@ -5,6 +5,7 @@
 using System.IO;
 using System.Threading;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/DvdSubRip.cs b/src/ui/Forms/DvdSubRip.cs
@@ -8,6 +8,7 @@
 using System.IO;
 using System.Text;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/ExportCustomText.cs b/src/ui/Forms/ExportCustomText.cs
@@ -5,6 +5,7 @@
 using System.IO;
 using System.Text;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/ExportFcpXmlAdvanced.cs b/src/ui/Forms/ExportFcpXmlAdvanced.cs
@@ -2,12 +2,12 @@
 using Nikse.SubtitleEdit.Core.SubtitleFormats;
 using Nikse.SubtitleEdit.Logic;
 using System;
-using System.Drawing;
 using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/ExportPngXml.cs b/src/ui/Forms/ExportPngXml.cs
@@ -22,6 +22,7 @@
 using System.Threading;
 using System.Windows.Forms;
 using System.Xml;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/ExportTextST.cs b/src/ui/Forms/ExportTextST.cs
@@ -7,6 +7,7 @@
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/ExtractDateTimeInfo.cs b/src/ui/Forms/ExtractDateTimeInfo.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using System.Text;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/FindDialog.cs b/src/ui/Forms/FindDialog.cs
@@ -5,6 +5,7 @@
 using System.Drawing;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/FixCommonErrors.cs b/src/ui/Forms/FixCommonErrors.cs
@@ -15,6 +15,7 @@
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/GenerateVideoWithHardSubs.cs b/src/ui/Forms/GenerateVideoWithHardSubs.cs
@@ -12,6 +12,7 @@
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using Nikse.SubtitleEdit.Logic.VideoPlayers;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/GenerateVideoWithSoftSubs.cs b/src/ui/Forms/GenerateVideoWithSoftSubs.cs
@@ -14,6 +14,7 @@
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/GetDictionaries.cs b/src/ui/Forms/GetDictionaries.cs
@@ -9,6 +9,7 @@
 using System.Threading;
 using System.Windows.Forms;
 using System.Xml;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/GoToLine.cs b/src/ui/Forms/GoToLine.cs
@@ -1,6 +1,7 @@
 using Nikse.SubtitleEdit.Logic;
 using System;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/HardSubExtract.cs b/src/ui/Forms/HardSubExtract.cs
@@ -5,6 +5,7 @@
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 //using Nikse.SubtitleEdit.Logic.DirectShow.Custom;
 

diff --git a/src/ui/Forms/ImportCdg.cs b/src/ui/Forms/ImportCdg.cs
@@ -12,6 +12,7 @@
 using System.Drawing.Imaging;
 using System.IO;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/ImportText.cs b/src/ui/Forms/ImportText.cs
@@ -10,6 +10,7 @@
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using System.Xml;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/ImportUnknownFormat.cs b/src/ui/Forms/ImportUnknownFormat.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/Interjections.cs b/src/ui/Forms/Interjections.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/JoinSubtitles.cs b/src/ui/Forms/JoinSubtitles.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {

diff --git a/src/ui/Forms/MultipleReplace.cs b/src/ui/Forms/MultipleReplace.cs
@@ -7,6 +7,7 @@
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using System.Xml;
+using MessageBox = Nikse.SubtitleEdit.Forms.SeMsgBox.MessageBox;
 
 namespace Nikse.SubtitleEdit.Forms
 {