mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-28 06:52:35 +01:00
Fixed no more missing last lines in 'Merge short lines' - thx Pax :)
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1540 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
parent
913dd91d07
commit
48a5c37cc8
@ -188,6 +188,9 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
lineNumbers = new StringBuilder();
|
lineNumbers = new StringBuilder();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (!lastMerged)
|
||||||
|
mergedSubtitle.Paragraphs.Add(new Paragraph(subtitle.GetParagraphOrDefault(subtitle.Paragraphs.Count-1)));
|
||||||
|
|
||||||
listViewFixes.ItemChecked += listViewFixes_ItemChecked;
|
listViewFixes.ItemChecked += listViewFixes_ItemChecked;
|
||||||
return mergedSubtitle;
|
return mergedSubtitle;
|
||||||
}
|
}
|
||||||
@ -303,15 +306,11 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
int count;
|
int count;
|
||||||
_mergedSubtitle = MergeShortLinesInSubtitle(_subtitle, mergedIndexes, out count, (double)numericUpDownMaxMillisecondsBetweenLines.Value, (int)numericUpDownMaxCharacters.Value, false);
|
_mergedSubtitle = MergeShortLinesInSubtitle(_subtitle, mergedIndexes, out count, (double)numericUpDownMaxMillisecondsBetweenLines.Value, (int)numericUpDownMaxCharacters.Value, false);
|
||||||
NumberOfMerges = count;
|
NumberOfMerges = count;
|
||||||
|
|
||||||
SubtitleListview1.Fill(_subtitle);
|
SubtitleListview1.Fill(_subtitle);
|
||||||
|
|
||||||
foreach (var index in mergedIndexes)
|
foreach (var index in mergedIndexes)
|
||||||
{
|
{
|
||||||
SubtitleListview1.SetBackgroundColor(index, Color.Green);
|
SubtitleListview1.SetBackgroundColor(index, Color.Green);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
SubtitleListview1.EndUpdate();
|
SubtitleListview1.EndUpdate();
|
||||||
groupBoxLinesFound.Text = string.Format(Configuration.Settings.Language.MergedShortLines.NumberOfMergesX, NumberOfMerges);
|
groupBoxLinesFound.Text = string.Format(Configuration.Settings.Language.MergedShortLines.NumberOfMergesX, NumberOfMerges);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user