diff --git a/Icons/Legacy/MsgBoError.png b/Icons/Legacy/MsgBoError.png new file mode 100644 index 000000000..b5e224d52 Binary files /dev/null and b/Icons/Legacy/MsgBoError.png differ diff --git a/Icons/Legacy/MsgBoxInfo.png b/Icons/Legacy/MsgBoxInfo.png new file mode 100644 index 000000000..030cf8117 Binary files /dev/null and b/Icons/Legacy/MsgBoxInfo.png differ diff --git a/Icons/Legacy/MsgBoxQuestion.png b/Icons/Legacy/MsgBoxQuestion.png new file mode 100644 index 000000000..29cdf556d Binary files /dev/null and b/Icons/Legacy/MsgBoxQuestion.png differ diff --git a/Icons/Legacy/MsgBoxWarning.png b/Icons/Legacy/MsgBoxWarning.png new file mode 100644 index 000000000..23ac749af Binary files /dev/null and b/Icons/Legacy/MsgBoxWarning.png differ diff --git a/src/ui/Forms/SeMsgBox/MessageBox.cs b/src/ui/Forms/SeMsgBox/MessageBox.cs index 03bcc8c69..cfc183cb0 100644 --- a/src/ui/Forms/SeMsgBox/MessageBox.cs +++ b/src/ui/Forms/SeMsgBox/MessageBox.cs @@ -22,7 +22,7 @@ namespace Nikse.SubtitleEdit.Forms.SeMsgBox public static DialogResult Show(Form form, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon) { - using (var msgBox = new MessageBoxForm(text, caption, buttons)) + using (var msgBox = new MessageBoxForm(text, caption, buttons, icon)) { return msgBox.ShowDialog(form); } @@ -46,7 +46,7 @@ namespace Nikse.SubtitleEdit.Forms.SeMsgBox internal static DialogResult Show(string text, string title, MessageBoxButtons buttons, MessageBoxIcon icon) { - using (var msgBox = new MessageBoxForm(text, title, buttons)) + using (var msgBox = new MessageBoxForm(text, title, buttons, icon)) { return msgBox.ShowDialog(Form.ActiveForm); } diff --git a/src/ui/Forms/SeMsgBox/MessageBoxForm.Designer.cs b/src/ui/Forms/SeMsgBox/MessageBoxForm.Designer.cs index 6f3844e4a..336cea7ae 100644 --- a/src/ui/Forms/SeMsgBox/MessageBoxForm.Designer.cs +++ b/src/ui/Forms/SeMsgBox/MessageBoxForm.Designer.cs @@ -28,6 +28,8 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MessageBoxForm)); this.buttonCancel = new System.Windows.Forms.Button(); this.buttonOK = new System.Windows.Forms.Button(); this.buttonYes = new System.Windows.Forms.Button(); @@ -36,6 +38,13 @@ this.buttonRetry = new System.Windows.Forms.Button(); this.buttonIgnore = new System.Windows.Forms.Button(); this.labelText = new System.Windows.Forms.Label(); + this.imageList1 = new System.Windows.Forms.ImageList(this.components); + this.pictureBoxIcon = new System.Windows.Forms.PictureBox(); + this.seTextBox2 = new Nikse.SubtitleEdit.Controls.SETextBox(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.copyTextToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxIcon)).BeginInit(); + this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); // // buttonCancel @@ -134,18 +143,76 @@ this.labelText.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.labelText.Location = new System.Drawing.Point(32, 22); + this.labelText.AutoSize = true; + this.labelText.Location = new System.Drawing.Point(99, 52); this.labelText.Name = "labelText"; - this.labelText.Size = new System.Drawing.Size(734, 379); + this.labelText.Size = new System.Drawing.Size(50, 13); this.labelText.TabIndex = 14; this.labelText.Text = "labelText"; this.labelText.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // imageList1 + // + this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); + this.imageList1.TransparentColor = System.Drawing.Color.Transparent; + this.imageList1.Images.SetKeyName(0, "MsgBoError.png"); + this.imageList1.Images.SetKeyName(1, "MsgBoxInfo.png"); + this.imageList1.Images.SetKeyName(2, "MsgBoxQuestion.png"); + this.imageList1.Images.SetKeyName(3, "MsgBoxWarning.png"); + // + // pictureBoxIcon + // + this.pictureBoxIcon.Location = new System.Drawing.Point(33, 35); + this.pictureBoxIcon.Name = "pictureBoxIcon"; + this.pictureBoxIcon.Size = new System.Drawing.Size(48, 48); + this.pictureBoxIcon.TabIndex = 15; + this.pictureBoxIcon.TabStop = false; + // + // seTextBox2 + // + this.seTextBox2.BackColor = System.Drawing.SystemColors.WindowFrame; + this.seTextBox2.CurrentLanguage = ""; + this.seTextBox2.CurrentLineIndex = 0; + this.seTextBox2.HideSelection = true; + this.seTextBox2.IsDictionaryDownloaded = true; + this.seTextBox2.IsSpellCheckerInitialized = false; + this.seTextBox2.IsSpellCheckRequested = false; + this.seTextBox2.IsWrongWord = false; + this.seTextBox2.LanguageChanged = false; + this.seTextBox2.Location = new System.Drawing.Point(87, 35); + this.seTextBox2.MaxLength = 32767; + this.seTextBox2.Multiline = true; + this.seTextBox2.Name = "seTextBox2"; + this.seTextBox2.Padding = new System.Windows.Forms.Padding(1); + this.seTextBox2.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; + this.seTextBox2.SelectedText = ""; + this.seTextBox2.SelectionLength = 0; + this.seTextBox2.SelectionStart = 0; + this.seTextBox2.Size = new System.Drawing.Size(677, 342); + this.seTextBox2.TabIndex = 17; + this.seTextBox2.TextBoxFont = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold); + this.seTextBox2.UseSystemPasswordChar = false; + // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.copyTextToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(181, 48); + // + // copyTextToolStripMenuItem + // + this.copyTextToolStripMenuItem.Name = "copyTextToolStripMenuItem"; + this.copyTextToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.copyTextToolStripMenuItem.Text = "Copy text"; + this.copyTextToolStripMenuItem.Click += new System.EventHandler(this.copyTextToolStripMenuItem_Click); + // // MessageBoxForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.pictureBoxIcon); this.Controls.Add(this.labelText); this.Controls.Add(this.buttonIgnore); this.Controls.Add(this.buttonRetry); @@ -154,6 +221,7 @@ this.Controls.Add(this.buttonYes); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonOK); + this.Controls.Add(this.seTextBox2); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.KeyPreview = true; this.MaximizeBox = false; @@ -164,7 +232,10 @@ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "MessageBoxForm"; this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.MessageBoxForm_KeyDown); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxIcon)).EndInit(); + this.contextMenuStrip1.ResumeLayout(false); this.ResumeLayout(false); + this.PerformLayout(); } @@ -178,5 +249,10 @@ private System.Windows.Forms.Button buttonRetry; private System.Windows.Forms.Button buttonIgnore; private System.Windows.Forms.Label labelText; + private System.Windows.Forms.ImageList imageList1; + private System.Windows.Forms.PictureBox pictureBoxIcon; + private Controls.SETextBox seTextBox2; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem copyTextToolStripMenuItem; } } \ No newline at end of file diff --git a/src/ui/Forms/SeMsgBox/MessageBoxForm.cs b/src/ui/Forms/SeMsgBox/MessageBoxForm.cs index 6dc890a5c..04b3e8ba5 100644 --- a/src/ui/Forms/SeMsgBox/MessageBoxForm.cs +++ b/src/ui/Forms/SeMsgBox/MessageBoxForm.cs @@ -2,27 +2,30 @@ using System; using System.Collections.Generic; using System.Drawing; +using System.IO; using System.Windows.Forms; +using Nikse.SubtitleEdit.Core.Common; namespace Nikse.SubtitleEdit.Forms.SeMsgBox { public sealed partial class MessageBoxForm : Form { - private string _text; + private readonly string _text; - public MessageBoxForm(string text, string caption, MessageBoxButtons buttons) + public MessageBoxForm(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon = MessageBoxIcon.Information) { UiUtil.PreInitialize(this); InitializeComponent(); UiUtil.FixFonts(this); + InitializeIcon(icon); InitializeText(text); InitializeButtons(buttons); Text = caption; _text = text; labelText.Font = new Font(Font.FontFamily, Font.Size + 2); - + copyTextToolStripMenuItem.Text = LanguageSettings.Current.Main.Menu.ContextMenu.CopyToClipboard; buttonOK.Text = LanguageSettings.Current.General.Ok; buttonCancel.Text = LanguageSettings.Current.General.Cancel; buttonYes.Text = LanguageSettings.Current.General.Yes; @@ -32,13 +35,83 @@ namespace Nikse.SubtitleEdit.Forms.SeMsgBox UiUtil.FixLargeFonts(this, buttonOK); } + private void InitializeIcon(MessageBoxIcon icon) + { + pictureBoxIcon.SizeMode = PictureBoxSizeMode.AutoSize; + if (icon == MessageBoxIcon.Information) + { + pictureBoxIcon.Image = Properties.Resources.MsgBoxInfo; + TryLoadIcon(pictureBoxIcon, "MsgBoxInfo"); + pictureBoxIcon.BringToFront(); + } + else if (icon == MessageBoxIcon.Question) + { + pictureBoxIcon.Image = Properties.Resources.MsgBoxQuestion; + TryLoadIcon(pictureBoxIcon, "MsgBoxQuestion"); + pictureBoxIcon.BringToFront(); + } + else if (icon == MessageBoxIcon.Warning) + { + pictureBoxIcon.Image = Properties.Resources.MsgBoxWarning; + TryLoadIcon(pictureBoxIcon, "MsgBoxWarning"); + pictureBoxIcon.BringToFront(); + } + else if (icon == MessageBoxIcon.Error) + { + pictureBoxIcon.Image = Properties.Resources.MsgBoError; + TryLoadIcon(pictureBoxIcon, "MsgBoError"); + pictureBoxIcon.BringToFront(); + } + else + { + pictureBoxIcon.Visible = false; + } + } + + private static void TryLoadIcon(PictureBox pb, string iconName) + { + var theme = Configuration.Settings.General.UseDarkTheme ? "DarkTheme" : "DefaultTheme"; + if (!string.IsNullOrEmpty(Configuration.Settings.General.ToolbarIconTheme) && !Configuration.Settings.General.ToolbarIconTheme.Equals("Auto", StringComparison.OrdinalIgnoreCase)) + { + theme = Configuration.Settings.General.ToolbarIconTheme; + } + + var themeFullPath = Path.Combine(Configuration.IconsDirectory, theme, iconName + ".png"); + if (File.Exists(themeFullPath)) + { + pb.Image = new Bitmap(themeFullPath); + return; + } + + var fullPath = Path.Combine(Configuration.IconsDirectory, "DefaultTheme", iconName + ".png"); + if (File.Exists(fullPath)) + { + pb.Image = new Bitmap(fullPath); + } + } + private void InitializeText(string text) { + if (text == null) + { + text = string.Empty; + } + + if (text.Length > 500) + { + seTextBox2.Text = text; + labelText.Visible = false; + seTextBox2.ContextMenuStrip = contextMenuStrip1; + return; + } + + seTextBox2.Visible = false; + labelText.ContextMenuStrip = contextMenuStrip1; using (var g = CreateGraphics()) { var textSize = g.MeasureString(text, Font); - Height = (int) textSize.Height + 80 + (Height - buttonOK.Top); - Width = (int)textSize.Width + 200; + Height = (int) textSize.Height + 90 + (Height - buttonOK.Top); + Width = (int)textSize.Width + 220; } labelText.Text = text; @@ -134,5 +207,10 @@ namespace Nikse.SubtitleEdit.Forms.SeMsgBox } } } + + private void copyTextToolStripMenuItem_Click(object sender, EventArgs e) + { + Clipboard.SetText(_text); + } } } diff --git a/src/ui/Forms/SeMsgBox/MessageBoxForm.resx b/src/ui/Forms/SeMsgBox/MessageBoxForm.resx index 1af7de150..44f1f585d 100644 --- a/src/ui/Forms/SeMsgBox/MessageBoxForm.resx +++ b/src/ui/Forms/SeMsgBox/MessageBoxForm.resx @@ -117,4 +117,61 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAm + CgAAAk1TRnQBSQFMAgEBBAEAARgBAAEYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA + AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 + AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA + AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm + AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM + AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA + ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz + AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ + AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM + AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA + AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA + AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ + AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ + AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA + AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm + ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ + Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz + AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA + AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM + AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM + ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM + Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA + AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM + AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ + AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz + AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm + AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw + AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD//8A/wD/AP8ACQAB/wZG + AW8IAAH/BrMBtAgAAf8GswG0BAAB/w9TAwABbwlGAfQFAAHaCbMB9AUAAdoJswH0AgABdQ9TAgABaQtG + AfQDAAyzAfMDAAyzAfQBAAHzB1MB9AdTAQABGg1GAgABGQWzAbQBAAazAgABGQazAf8GswIABlMBegEA + BlMBmgEADkYBbwEABrMBCQEABrMB2gEABrMB2gEABrMBtAEAAfQNUwEAAf8ERgH0AQACRgGOAf8FRgH/ + BrMBCQEAB7MB/w+zAgAFUwGaAQAFUwF6AQABBwVGAfYBAAGOAf8BjgVGAQkGswEJAQAHswEJB7MBAAez + AgAB9ARTAb0BAAVTAgABjgZGAf8BAAFvBkYB2wazAQkBAAezAdsHswEAAQkGswMABFMBvQEABFMBmgIA + AZMFRgGOAv8BAAZGAQkGswEJAQAHswEJCLMB/wazAwAB9ANTAb0BAARTAwAB8wRGAY4B/wGOAUYB9gEA + BUYB8w+zAfMFswEAArMB/wEZBbMEAANTAb0BAANTAZoEAARGAQcBjgNGAfQFRgEABrMBGQEAB7MBAAWz + Av8BtAEAAbQFswQAAfQCUwF6Af8DUwUAAW8NRgH/AQABtAWzAfIBAAazAf8BAAG0BbMB/wEAARkFswH/ + BQAGUwG9BgAMRgFvAwAMswHaAwAMswHaBgAB/wVTCAAKRgFpBQALswUAC7MIAARTAb0JAAFvB0YBGgcA + AbQHswEZBwABtAezARkJAAH2A1MMAAHzAZMBjgEHAf8LAAHzAQkB2wEJAf8LAAHzAQkB2wEJAf8MAAH0 + AXUHAAFCAU0BPgcAAT4DAAEoAwABQAMAASADAAEBAQABAQYAAQEWAAP/gQAB8AEPAfABDwHwAQ8CAAHg + AQMB4AEDAeABAwIAAcABAQHAAQEBwAEBAgABgAEBAYABgQGAAQEDgAEABYABAQECAgABgAIAAcABgQEB + AgABgAEAAYABwAGDAQABgAEAAYABAAGAAeABgwEAAUABAAGAAgAB4AGHAQABIAIAAQIBAAHwAYcBgAEA + A4ABQAHwAQ8BgAEABIAB+AEPAcABAQHAAQEBwAEBAfgBHwHgAQMB4AEDAeABAwH8AR8B8AEHAfABBwHw + AQcB/AE/AfwBHwH8AR8B/AEfAf4Bfws= + + + + 127, 17 + \ No newline at end of file diff --git a/src/ui/Properties/Resources.Designer.cs b/src/ui/Properties/Resources.Designer.cs index 04c3856c2..2a788398f 100644 --- a/src/ui/Properties/Resources.Designer.cs +++ b/src/ui/Properties/Resources.Designer.cs @@ -130,6 +130,46 @@ namespace Nikse.SubtitleEdit.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap MsgBoError { + get { + object obj = ResourceManager.GetObject("MsgBoError", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap MsgBoxInfo { + get { + object obj = ResourceManager.GetObject("MsgBoxInfo", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap MsgBoxQuestion { + get { + object obj = ResourceManager.GetObject("MsgBoxQuestion", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap MsgBoxWarning { + get { + object obj = ResourceManager.GetObject("MsgBoxWarning", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/src/ui/Properties/Resources.resx b/src/ui/Properties/Resources.resx index ccc3ea8eb..64218c5bf 100644 --- a/src/ui/Properties/Resources.resx +++ b/src/ui/Properties/Resources.resx @@ -157,4 +157,16 @@ ..\Resources\Help32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\MsgBoError.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\MsgBoxInfo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\MsgBoxQuestion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\MsgBoxWarning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/src/ui/Resources/MsgBoError.png b/src/ui/Resources/MsgBoError.png new file mode 100644 index 000000000..b5e224d52 Binary files /dev/null and b/src/ui/Resources/MsgBoError.png differ diff --git a/src/ui/Resources/MsgBoxInfo.png b/src/ui/Resources/MsgBoxInfo.png new file mode 100644 index 000000000..030cf8117 Binary files /dev/null and b/src/ui/Resources/MsgBoxInfo.png differ diff --git a/src/ui/Resources/MsgBoxQuestion.png b/src/ui/Resources/MsgBoxQuestion.png new file mode 100644 index 000000000..29cdf556d Binary files /dev/null and b/src/ui/Resources/MsgBoxQuestion.png differ diff --git a/src/ui/Resources/MsgBoxWarning.png b/src/ui/Resources/MsgBoxWarning.png new file mode 100644 index 000000000..23ac749af Binary files /dev/null and b/src/ui/Resources/MsgBoxWarning.png differ diff --git a/src/ui/SubtitleEdit.csproj b/src/ui/SubtitleEdit.csproj index a696843b4..a50689128 100644 --- a/src/ui/SubtitleEdit.csproj +++ b/src/ui/SubtitleEdit.csproj @@ -2308,6 +2308,10 @@ + + + +