Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-28 06:52:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1281 from ivandrofly/patch-12

Browse Source 
[Main] - Refactor + Update
This commit is contained in:
Nikolaj Olsson 2015-09-17 15:04:53 +02:00
commit 465a690089
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Forms/Main.cs
View File

@ -6105,7 +6105,7 @@ namespace Nikse.SubtitleEdit.Forms
else else
{ {
int indexOfEndBracket = _subtitle.Paragraphs[i].Text.IndexOf('}'); int indexOfEndBracket = _subtitle.Paragraphs[i].Text.IndexOf('}');
if (_subtitle.Paragraphs[i].Text.StartsWith("{\\") && indexOfEndBracket > 1 && indexOfEndBracket < 6) if (_subtitle.Paragraphs[i].Text.StartsWith("{\\", StringComparison.Ordinal) && indexOfEndBracket > 1 && indexOfEndBracket < 6)
_subtitle.Paragraphs[i].Text = string.Format("{2}<{0}>{1}</{0}>", tag, _subtitle.Paragraphs[i].Text.Remove(0, indexOfEndBracket + 1), _subtitle.Paragraphs[i].Text.Substring(0, indexOfEndBracket + 1)); _subtitle.Paragraphs[i].Text = string.Format("{2}<{0}>{1}</{0}>", tag, _subtitle.Paragraphs[i].Text.Remove(0, indexOfEndBracket + 1), _subtitle.Paragraphs[i].Text.Substring(0, indexOfEndBracket + 1));
else else
_subtitle.Paragraphs[i].Text = string.Format("<{0}>{1}</{0}>", tag, _subtitle.Paragraphs[i].Text); _subtitle.Paragraphs[i].Text = string.Format("<{0}>{1}</{0}>", tag, _subtitle.Paragraphs[i].Text);
@ -6962,7 +6962,7 @@ namespace Nikse.SubtitleEdit.Forms
next.Text = (idx > 0 ? s.Substring(idx + 1).Trim() : string.Empty); next.Text = (idx > 0 ? s.Substring(idx + 1).Trim() : string.Empty);
// If the first subtitle ends with a tag (</i>): // If the first subtitle ends with a tag (</i>):
String endTag = ""; String endTag = string.Empty;
if (p.Text.EndsWith('>') && p.Text.Contains('<')) if (p.Text.EndsWith('>') && p.Text.Contains('<'))
{ {
// Save the end tag. // Save the end tag.
@ -6980,7 +6980,7 @@ namespace Nikse.SubtitleEdit.Forms
} }
// If the second subtitle (next) starts with a position tag, like {\an8}: // If the second subtitle (next) starts with a position tag, like {\an8}:
String positionTag = ""; String positionTag = string.Empty;
if (firstWord.StartsWith('{') && firstWord.Contains('}')) if (firstWord.StartsWith('{') && firstWord.Contains('}'))
{ {
// Save the start tag. // Save the start tag.
@ -6990,7 +6990,7 @@ namespace Nikse.SubtitleEdit.Forms
} }
// If the second subtitle (next) starts with a tag: // If the second subtitle (next) starts with a tag:
String startTag = ""; String startTag = string.Empty;
if (firstWord.StartsWith('<') && firstWord.Contains('>')) if (firstWord.StartsWith('<') && firstWord.Contains('>'))
{ {
// Save the start tag. // Save the start tag.
@ -7007,7 +7007,7 @@ namespace Nikse.SubtitleEdit.Forms
} }
// If the second subtitle (next) starts with a dialog ("-"): // If the second subtitle (next) starts with a dialog ("-"):
String dialogMarker = ""; String dialogMarker = string.Empty;
if (firstWord.StartsWith('-')) if (firstWord.StartsWith('-'))
{ {
// Save the dialog marker ("-" or "- "). // Save the dialog marker ("-" or "- ").
@ -7026,10 +7026,10 @@ namespace Nikse.SubtitleEdit.Forms
// Add positionTag + startTag + dialogMarker + "..." + text to 'next'. // Add positionTag + startTag + dialogMarker + "..." + text to 'next'.
if (idx > 0) if (idx > 0)
next.Text = positionTag + startTag + dialogMarker + (nextSubtitleStartsWithEllipsis ? "..." : "") + next.Text.Trim(); next.Text = positionTag + startTag + dialogMarker + (nextSubtitleStartsWithEllipsis ? "..." : string.Empty) + next.Text.Trim();
// Add text + firstWord + "..." + endTag to First line. // Add text + firstWord + "..." + endTag to First line.
p.Text = (idx == 0 ? startTag : "") + p.Text.Trim() + " " + firstWord.Trim() + (idx > 0 && firstSubtitleEndsWithEllipsis ? "..." : "") + endTag; p.Text = (idx == 0 ? startTag : string.Empty) + p.Text.Trim() + " " + firstWord.Trim() + (idx > 0 && firstSubtitleEndsWithEllipsis ? "..." : string.Empty) + endTag;
// Now, idx will hold the position of the last line break, if any. // Now, idx will hold the position of the last line break, if any.
idx = p.Text.LastIndexOf(Environment.NewLine, StringComparison.Ordinal); idx = p.Text.LastIndexOf(Environment.NewLine, StringComparison.Ordinal);
@ -7079,7 +7079,7 @@ namespace Nikse.SubtitleEdit.Forms
p.Text = (idx > 0 ? s.Substring(0, idx).Trim() : string.Empty); p.Text = (idx > 0 ? s.Substring(0, idx).Trim() : string.Empty);
// If the first subtitle ends with a tag (</i>): // If the first subtitle ends with a tag (</i>):
String endTag = ""; String endTag = string.Empty;
if (lastWord.EndsWith('>') && lastWord.Contains('<')) if (lastWord.EndsWith('>') && lastWord.Contains('<'))
{ {
// Save the end tag. // Save the end tag.
@ -7097,7 +7097,7 @@ namespace Nikse.SubtitleEdit.Forms
} }
// If the second subtitle (next) starts with a position tag, like {\an8}: // If the second subtitle (next) starts with a position tag, like {\an8}:
String positionTag = ""; String positionTag = string.Empty;
if (next.Text.StartsWith('{') && next.Text.Contains('}')) if (next.Text.StartsWith('{') && next.Text.Contains('}'))
{ {
// Save the start tag. // Save the start tag.
@ -7107,7 +7107,7 @@ namespace Nikse.SubtitleEdit.Forms
} }
// If the second subtitle (next) starts with a tag: // If the second subtitle (next) starts with a tag:
String startTag = ""; String startTag = string.Empty;
if (next.Text.StartsWith('<') && next.Text.Contains('>')) if (next.Text.StartsWith('<') && next.Text.Contains('>'))
{ {
// Save the start tag. // Save the start tag.
@ -7117,7 +7117,7 @@ namespace Nikse.SubtitleEdit.Forms
} }
// If the second subtitle (next) starts with a dialog ("-"): // If the second subtitle (next) starts with a dialog ("-"):
String dialogMarker = ""; String dialogMarker = string.Empty;
if (next.Text.StartsWith('-')) if (next.Text.StartsWith('-'))
{ {
// Save the dialog marker ("-" or "- "). // Save the dialog marker ("-" or "- ").
@ -7136,7 +7136,7 @@ namespace Nikse.SubtitleEdit.Forms
// Add text + "..." + endTag to first subtitle. // Add text + "..." + endTag to first subtitle.
if (idx > 0) if (idx > 0)
p.Text = p.Text + (firstSubtitleEndsWithEllipsis ? "..." : "") + endTag; p.Text = p.Text + (firstSubtitleEndsWithEllipsis ? "..." : string.Empty) + endTag;
// Add positionTag + startTag + dialogMarker + "..." + lastWord to 'next'. // Add positionTag + startTag + dialogMarker + "..." + lastWord to 'next'.
next.Text = (idx > 0 ? positionTag : string.Empty) + next.Text = (idx > 0 ? positionTag : string.Empty) +
@ -7619,9 +7619,9 @@ namespace Nikse.SubtitleEdit.Forms
} }
if (originalCurrent != null && originalNew != null) if (originalCurrent != null && originalNew != null)
{ {
if (originalCurrent.Text.StartsWith("<i> ")) if (originalCurrent.Text.StartsWith("<i> ", StringComparison.Ordinal))
originalCurrent.Text = originalCurrent.Text.Remove(3, 1); originalCurrent.Text = originalCurrent.Text.Remove(3, 1);
if (originalNew.Text.StartsWith("<i> ")) if (originalNew.Text.StartsWith("<i> ", StringComparison.Ordinal))
originalCurrent.Text = originalCurrent.Text.Remove(3, 1); originalCurrent.Text = originalCurrent.Text.Remove(3, 1);
} }
_subtitleAlternate.InsertParagraphInCorrectTimeOrder(originalNew); _subtitleAlternate.InsertParagraphInCorrectTimeOrder(originalNew);
@ -7946,7 +7946,7 @@ namespace Nikse.SubtitleEdit.Forms
s = Utilities.UnbreakLine(nextParagraph.Text); s = Utilities.UnbreakLine(nextParagraph.Text);
if (s.StartsWith('-') || s.StartsWith("<i>-")) if (s.StartsWith('-') || s.StartsWith("<i>-"))
currentParagraph.Text += Environment.NewLine + s; currentParagraph.Text += Environment.NewLine + s;
else if (s.StartsWith("<i>")) else if (s.StartsWith("<i>", StringComparison.Ordinal))
currentParagraph.Text += Environment.NewLine + s.Insert(3, "- "); currentParagraph.Text += Environment.NewLine + s.Insert(3, "- ");
else else
currentParagraph.Text += Environment.NewLine + "- " + s; currentParagraph.Text += Environment.NewLine + "- " + s;
@ -9278,7 +9278,7 @@ namespace Nikse.SubtitleEdit.Forms
if (char_value >> 3 == 0) //0x0..7 if (char_value >> 3 == 0) //0x0..7
{ {
ascii = true; ascii = true;
text += ((color == 1) ? colors[char_value] : ""); // + (char)active_set[32]; text += ((color == 1) ? colors[char_value] : string.Empty); // + (char)active_set[32];
} }
else if (char_value >> 4 == 0) //0x8..F else if (char_value >> 4 == 0) //0x8..F
{ {
@ -10140,7 +10140,7 @@ namespace Nikse.SubtitleEdit.Forms
container = control as ContainerControl; container = control as ContainerControl;
} }
return control; return control;
} }
internal void MainKeyDown(object sender, KeyEventArgs e) internal void MainKeyDown(object sender, KeyEventArgs e)
{ {
@ -13317,7 +13317,7 @@ namespace Nikse.SubtitleEdit.Forms
} }
// create and insert // create and insert
var newParagraph = new Paragraph("", videoPositionInMilliseconds, videoPositionInMilliseconds + Configuration.Settings.General.NewEmptyDefaultMs); var newParagraph = new Paragraph(string.Empty, videoPositionInMilliseconds, videoPositionInMilliseconds + Configuration.Settings.General.NewEmptyDefaultMs);
if (GetCurrentSubtitleFormat().IsFrameBased) if (GetCurrentSubtitleFormat().IsFrameBased)
{ {
newParagraph.CalculateFrameNumbersFromTimeCodes(CurrentFrameRate); newParagraph.CalculateFrameNumbersFromTimeCodes(CurrentFrameRate);