mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Merge branch 'master' into feature/add-sentence-continuation-style
# Conflicts: # src/Forms/Main.cs
This commit is contained in:
commit
0ec30d8299
@ -7087,6 +7087,19 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
}
|
||||
|
||||
private void RefreshSelectedParagraphs()
|
||||
{
|
||||
for (int i = 0; i < SubtitleListview1.SelectedIndices.Count; i++)
|
||||
{
|
||||
var index = SubtitleListview1.SelectedIndices[i];
|
||||
var p = _subtitle.GetParagraphOrDefault(index);
|
||||
if (p != null)
|
||||
{
|
||||
SubtitleListview1.SetStartTimeAndDuration(index, p, _subtitle.GetParagraphOrDefault(index + 1), _subtitle.GetParagraphOrDefault(index - 1));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private int GetPositionFromWordIndex(string text, int wordIndex)
|
||||
{
|
||||
var sb = new StringBuilder();
|
||||
@ -10308,12 +10321,18 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
|
||||
private void ExtendBeforeToolStripMenuItemClick(object sender, EventArgs e)
|
||||
{
|
||||
ExtendSelectedLinesToPreviousLine();
|
||||
if (_subtitle.Paragraphs.Count > 0 && SubtitleListview1.SelectedItems.Count > 0)
|
||||
{
|
||||
ExtendSelectedLinesToPreviousLine();
|
||||
}
|
||||
}
|
||||
|
||||
private void ExtendAfterToolStripMenuItemClick(object sender, EventArgs e)
|
||||
{
|
||||
ExtendSelectedLinesToNextLine();
|
||||
if (_subtitle.Paragraphs.Count > 0 && SubtitleListview1.SelectedItems.Count > 0)
|
||||
{
|
||||
ExtendSelectedLinesToNextLine();
|
||||
}
|
||||
}
|
||||
|
||||
private static string ChangeAllLinesTagsToSingleTag(string text, string tag)
|
||||
@ -14722,7 +14741,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
}
|
||||
|
||||
RefreshSelectedParagraph();
|
||||
RefreshSelectedParagraphs();
|
||||
}
|
||||
}
|
||||
|
||||
@ -14763,7 +14782,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
}
|
||||
|
||||
RefreshSelectedParagraph();
|
||||
RefreshSelectedParagraphs();
|
||||
}
|
||||
}
|
||||
|
||||
@ -14808,7 +14827,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
}
|
||||
|
||||
RefreshSelectedParagraph();
|
||||
RefreshSelectedParagraphs();
|
||||
}
|
||||
}
|
||||
|
||||
@ -14853,7 +14872,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
}
|
||||
|
||||
RefreshSelectedParagraph();
|
||||
RefreshSelectedParagraphs();
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user