diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index b22b206d1..962b744f9 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -11586,7 +11586,7 @@ namespace Nikse.SubtitleEdit.Forms var tmp = new Subtitle(); var format = new SubRip(); var list = new List(); - foreach (string line in text.Replace(Environment.NewLine, "|").Split("|".ToCharArray(), StringSplitOptions.None)) + foreach (string line in text.Replace(Environment.NewLine, "\n").Split('\n')) list.Add(line); format.LoadSubtitle(tmp, list, null); if (SubtitleListview1.SelectedItems.Count == 1 && tmp.Paragraphs.Count > 0) @@ -18459,7 +18459,7 @@ namespace Nikse.SubtitleEdit.Forms var tmp = new Subtitle(); var format = new SubRip(); var list = new List(); - foreach (string line in text.Replace(Environment.NewLine, "|").Split("|".ToCharArray(), StringSplitOptions.None)) + foreach (string line in text.Replace(Environment.NewLine, "\n").Split('\n')) list.Add(line); format.LoadSubtitle(tmp, list, null); @@ -18472,7 +18472,7 @@ namespace Nikse.SubtitleEdit.Forms if (tmp.Paragraphs.Count == 0) { - foreach (string line in text.Replace(Environment.NewLine, "|").Split("|".ToCharArray(), StringSplitOptions.RemoveEmptyEntries)) + foreach (string line in text.Replace(Environment.NewLine, "\n").Split('\n')) tmp.Paragraphs.Add(new Paragraph(0, 0, line)); } diff --git a/src/Forms/ReplaceDialog.Designer.cs b/src/Forms/ReplaceDialog.Designer.cs index 961a115b3..15943eee2 100644 --- a/src/Forms/ReplaceDialog.Designer.cs +++ b/src/Forms/ReplaceDialog.Designer.cs @@ -89,7 +89,7 @@ // this.textBoxFind.Location = new System.Drawing.Point(15, 25); this.textBoxFind.Name = "textBoxFind"; - this.textBoxFind.Size = new System.Drawing.Size(262, 21); + this.textBoxFind.Size = new System.Drawing.Size(265, 21); this.textBoxFind.TabIndex = 0; this.textBoxFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBoxFindKeyDown); // diff --git a/src/Forms/ReplaceDialog.cs b/src/Forms/ReplaceDialog.cs index 9ba0c4c10..51734d4c1 100644 --- a/src/Forms/ReplaceDialog.cs +++ b/src/Forms/ReplaceDialog.cs @@ -173,7 +173,7 @@ namespace Nikse.SubtitleEdit.Forms if (sender == radioButtonRegEx) textBoxFind.ContextMenu = FindReplaceDialogHelper.GetRegExContextMenu(textBoxFind); else - textBoxFind.ContextMenuStrip = null; + textBoxFind.ContextMenu = null; } private void TextBoxFindKeyDown(object sender, KeyEventArgs e) diff --git a/src/Logic/FindReplaceDialogHelper.cs b/src/Logic/FindReplaceDialogHelper.cs index 6aaa01ad2..0a545e09f 100644 --- a/src/Logic/FindReplaceDialogHelper.cs +++ b/src/Logic/FindReplaceDialogHelper.cs @@ -156,7 +156,7 @@ namespace Nikse.SubtitleEdit.Logic cm.MenuItems.Add("New line (\\r\\n)", delegate { textBox.SelectedText = "\\r\\n"; }); cm.MenuItems.Add("Any digit (\\d)", delegate { textBox.SelectedText = "\\d"; }); cm.MenuItems.Add("Any character (.)", delegate { textBox.SelectedText = "."; }); - cm.MenuItems.Add("Any whitespace", delegate { textBox.SelectedText = "\\s"; }); + cm.MenuItems.Add("Any whitespace (\\s)", delegate { textBox.SelectedText = "\\s"; }); cm.MenuItems.Add("Zero or more (*)", delegate { textBox.SelectedText = "*"; }); cm.MenuItems.Add("One or more (+)", delegate { textBox.SelectedText = "+"; }); cm.MenuItems.Add("In character group ([test])", delegate { textBox.SelectedText = "[test]"; });