Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-22 11:12:36 +01:00
Code Issues Projects Releases Wiki Activity

paragraph: add helper to detect default/empty paragraph

Browse Source
This commit is contained in:
Ivandro Ismael 2019-04-14 22:29:39 +01:00
parent 6df08631ba
commit 943ca3fec7
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libse/Paragraph.cs
View File

@ -51,6 +51,8 @@ namespace Nikse.SubtitleEdit.Core
public string Bookmark { get; set; }
public bool IsDefault => StartTime.TotalMilliseconds == 0 && EndTime.TotalMilliseconds == 0 && string.IsNullOrEmpty(Text);
private string GenerateId()
{
return Guid.NewGuid().ToString();

4
libse/SubtitleFormats/SubRip.cs
View File

@ -122,8 +122,8 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
ReadLine(subtitle, line, next, nextNext, nextNextNext);
}
if (_paragraph != null && _paragraph.ToString() != new Paragraph().ToString() &&
(subtitle.Paragraphs.Count > 0 || _paragraph.EndTime.TotalMilliseconds > 0.001))
if (_paragraph?.IsDefault == false)
{
subtitle.Paragraphs.Add(_paragraph);
}

11
src/Forms/Compare.cs
View File

@ -22,7 +22,6 @@ namespace Nikse.SubtitleEdit.Forms
private readonly Color _backDifferenceColor = Color.FromArgb(255, 90, 90);
private readonly Color _foregroundDifferenceColor = Color.FromArgb(225, 0, 0);
private bool _loadingConfig = true;
private static readonly string EmptyParagraphString = new Paragraph().ToString();
public Compare()
{
@ -247,12 +246,12 @@ namespace Nikse.SubtitleEdit.Forms
{
bool addIndexToDifferences = false;
Utilities.GetTotalAndChangedWords(p1.Text, p2.Text, ref totalWords, ref wordsChanged, checkBoxIgnoreLineBreaks.Checked, checkBoxIgnoreFormatting.Checked, ShouldBreakToLetter());
if (p1.ToString() == EmptyParagraphString)
if (p1.IsDefault)
{
addIndexToDifferences = true;
subtitleListView1.ColorOut(index, Color.Salmon);
}
else if (p2.ToString() == EmptyParagraphString)
else if (p2.IsDefault)
{
addIndexToDifferences = true;
subtitleListView2.ColorOut(index, Color.Salmon);
@ -279,12 +278,12 @@ namespace Nikse.SubtitleEdit.Forms
{
Utilities.GetTotalAndChangedWords(p1.Text, p2.Text, ref totalWords, ref wordsChanged, checkBoxIgnoreLineBreaks.Checked, checkBoxIgnoreFormatting.Checked, ShouldBreakToLetter());
bool addIndexToDifferences = false;
if (p1.ToString() == EmptyParagraphString)
if (p1.IsDefault)
{
addIndexToDifferences = true;
subtitleListView1.ColorOut(index, Color.Salmon);
}
else if (p2.ToString() == EmptyParagraphString)
else if (p2.IsDefault)
{
addIndexToDifferences = true;
subtitleListView2.ColorOut(index, Color.Salmon);
@ -1119,7 +1118,7 @@ namespace Nikse.SubtitleEdit.Forms
private string GetHtmlText(Paragraph p, string text)
{
if (p.ToString() == EmptyParagraphString)
if (p.IsDefault)
{
return string.Empty;
}