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

Minor update

Browse Source
This commit is contained in:
niksedk 2022-01-26 15:51:41 +01:00
parent 77920cf007
commit efa952b520
3 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dictionaries/en_US_user.xml
View File

@ -142,6 +142,7 @@
<word>cosy</word>
<word>cottonoid</word>
<word>could've</word>
<word>countertop</word>
<word>craniotomy</word>
<word>crossbone</word>
<word>crosshair</word>
@ -430,6 +431,7 @@
<word>skag</word>
<word>skank</word>
<word>skeevy</word>
<word>skosh</word>
<word>snuck</word>
<word>sodium</word>
<word>someplace</word>

2
Dictionaries/names.xml
View File

@ -716,6 +716,7 @@ This file is case sensitive.
<name>Binzhou</name>
<name>BIOS</name>
<name>Biratnagar</name>
<name>Birchwood</name>
<name>Birjand</name>
<name>Birmingham</name>
<name>Bishkek</name>
@ -2989,6 +2990,7 @@ This file is case sensitive.
<name>Kepner</name>
<name>Keppra</name>
<name>Kermit</name>
<name>Kerrville</name>
<name>Kessler</name>
<name>Kessman</name>
<name>Kevin</name>

47
src/ui/Forms/Main.cs
View File

@ -19228,6 +19228,7 @@ namespace Nikse.SubtitleEdit.Forms
if (IsAssa())
{
tmp.Header = _subtitle.Header;
ClipboardSetText(tmp.ToText(new AdvancedSubStationAlpha()).TrimEnd());
}
else
@ -19331,6 +19332,7 @@ namespace Nikse.SubtitleEdit.Forms
{
if (Clipboard.ContainsText())
{
var isAssa = IsAssa();
var text = Clipboard.GetText();
var tmp = new Subtitle();
SubtitleFormat format = new SubRip();
@ -19355,6 +19357,26 @@ namespace Nikse.SubtitleEdit.Forms
addMs = lastParagraph.EndTime.TotalMilliseconds - tmp.Paragraphs[0].StartTime.TotalMilliseconds + MinGapBetweenLines;
}
if (isAssa && format.Name == AdvancedSubStationAlpha.NameOfFormat)
{
addMs = 0;
if (string.IsNullOrWhiteSpace(_subtitle.Header))
{
_subtitle.Header = AdvancedSubStationAlpha.DefaultHeader;
}
var styles = AdvancedSubStationAlpha.GetStylesFromHeader(_subtitle.Header);
foreach (var tmpParagraph in tmp.Paragraphs)
{
if (!string.IsNullOrWhiteSpace(tmpParagraph.Extra) && !styles.Any(p => p.Equals(tmpParagraph.Extra, StringComparison.OrdinalIgnoreCase)))
{
var s = AdvancedSubStationAlpha.GetSsaStyle(tmpParagraph.Extra, tmp.Header);
_subtitle.Header = AdvancedSubStationAlpha.AddSsaStyle(s, _subtitle.Header);
}
}
}
var selectIndices = new List<int>();
for (int i = 0; i < tmp.Paragraphs.Count; i++)
{
@ -19523,6 +19545,7 @@ namespace Nikse.SubtitleEdit.Forms
else if (e.KeyCode == Keys.X && e.Modifiers == Keys.Control) //Ctrl+X = Cut to clipboard
{
var tmp = new Subtitle();
tmp.Header = _subtitle?.Header;
foreach (int i in SubtitleListview1.SelectedIndices)
{
var p = _subtitle.GetParagraphOrDefault(i);
@ -19533,7 +19556,7 @@ namespace Nikse.SubtitleEdit.Forms
}
e.SuppressKeyPress = true;
_cutText = tmp.ToText(new SubRip());
_cutText = IsAssa() ? tmp.ToText(new AdvancedSubStationAlpha()) : tmp.ToText(new SubRip());
ToolStripMenuItemDeleteClick(null, null);
}
else if (e.KeyCode == Keys.A && e.Modifiers == Keys.Control)
@ -30030,7 +30053,12 @@ namespace Nikse.SubtitleEdit.Forms
string text = Clipboard.GetText();
var tmp = new Subtitle();
var list = new List<string>(text.SplitToLines());
new SubRip().LoadSubtitle(tmp, list, null);
SubtitleFormat format = new SubRip();
if (new AdvancedSubStationAlpha().IsMine(list, null))
{
format = new AdvancedSubStationAlpha();
}
format.LoadSubtitle(tmp, list, null);
if (tmp.Paragraphs.Count == 0)
{
tmp = SubtitleFormat.LoadSubtitleFromLines(list, null) ?? new Subtitle();
@ -30151,6 +30179,8 @@ namespace Nikse.SubtitleEdit.Forms
}
else
{
var isAssa = IsAssa();
var assaStyles = AdvancedSubStationAlpha.GetStylesFromHeader(_subtitle.Header);
for (int i = 0; i + index < _subtitle.Paragraphs.Count && i < tmp.Paragraphs.Count; i++)
{
if (index + i < _subtitle.Paragraphs.Count)
@ -30160,6 +30190,19 @@ namespace Nikse.SubtitleEdit.Forms
_subtitle.Paragraphs[index + i].Text = tmp.Paragraphs[i].Text;
_subtitle.Paragraphs[index + i].StartTime.TotalMilliseconds = tmp.Paragraphs[i].StartTime.TotalMilliseconds;
_subtitle.Paragraphs[index + i].EndTime.TotalMilliseconds = tmp.Paragraphs[i].EndTime.TotalMilliseconds;
if (isAssa && format.Name == AdvancedSubStationAlpha.NameOfFormat)
{
_subtitle.Paragraphs[index + i].Extra = tmp.Paragraphs[i].Extra;
_subtitle.Paragraphs[index + i].Actor = tmp.Paragraphs[i].Actor;
if (!string.IsNullOrWhiteSpace(tmp.Paragraphs[i].Extra) &&
!assaStyles.Any(p => p.Equals(tmp.Paragraphs[i].Extra, StringComparison.OrdinalIgnoreCase)))
{
var s = AdvancedSubStationAlpha.GetSsaStyle(tmp.Paragraphs[i].Extra, tmp.Header);
_subtitle.Header = AdvancedSubStationAlpha.AddSsaStyle(s, _subtitle.Header);
assaStyles.Add(s.Name);
}
}
}
else if (form.PasteTimeCodesOnly)
{