diff --git a/src/Forms/Main.Designer.cs b/src/Forms/Main.Designer.cs index 6b79cf3b4..a7df936d7 100644 --- a/src/Forms/Main.Designer.cs +++ b/src/Forms/Main.Designer.cs @@ -2773,7 +2773,7 @@ this.toolStripSeparator11, this.toolStripMenuItemWaveFormPlaySelection}); this.contextMenuStripWaveForm.Name = "contextMenuStripWaveForm"; - this.contextMenuStripWaveForm.Size = new System.Drawing.Size(183, 142); + this.contextMenuStripWaveForm.Size = new System.Drawing.Size(183, 164); // // addParagraphHereToolStripMenuItem // diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index ba3f4ef60..27f61d415 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -62,10 +62,12 @@ namespace Nikse.SubtitleEdit.Forms VideoInfo _videoInfo; int _repeatCount = -1; double _endSeconds = -1; + const double EndDelay = 0.05; int _autoContinueDelayCount = -1; long _lastTextKeyDownTicks = 0; System.Windows.Forms.Timer _timerAddHistoryWhenDone = new Timer(); string _timerAddHistoryWhenDoneText; + double? _audioWaveFormRightClickSeconds = null; private bool AutoRepeatContinueOn { @@ -316,6 +318,8 @@ namespace Nikse.SubtitleEdit.Forms splitToolStripMenuItem1.Visible = true; mergeWithPreviousToolStripMenuItem.Visible = true; mergeWithNextToolStripMenuItem.Visible = true; + + _audioWaveFormRightClickSeconds = seconds; contextMenuStripWaveForm.Show(MousePosition.X, MousePosition.Y); } @@ -3209,6 +3213,11 @@ namespace Nikse.SubtitleEdit.Forms } private void SplitLineToolStripMenuItemClick(object sender, EventArgs e) + { + SplitSelectedParagraph(null); + } + + private void SplitSelectedParagraph(double? splitSeconds) { if (_subtitle.Paragraphs.Count > 0 && SubtitleListview1.SelectedItems.Count > 0) { @@ -3222,11 +3231,13 @@ namespace Nikse.SubtitleEdit.Forms var newParagraph = new Paragraph(); double middle = currentParagraph.StartTime.TotalMilliseconds + (currentParagraph.Duration.TotalMilliseconds / 2.0); + if (splitSeconds.HasValue && splitSeconds.Value > (currentParagraph.StartTime.TotalSeconds + 0.2) && splitSeconds.Value < (currentParagraph.EndTime.TotalSeconds - 0.2)) + middle = splitSeconds.Value * 1000.0; newParagraph.EndTime.TotalMilliseconds = currentParagraph.EndTime.TotalMilliseconds; currentParagraph.EndTime.TotalMilliseconds = middle; newParagraph.StartTime.TotalMilliseconds = currentParagraph.EndTime.TotalMilliseconds + 1; - _subtitle.Paragraphs.Insert(firstSelectedIndex+1, newParagraph); + _subtitle.Paragraphs.Insert(firstSelectedIndex + 1, newParagraph); string[] lines = currentParagraph.Text.Split(Environment.NewLine.ToCharArray(), StringSplitOptions.RemoveEmptyEntries); @@ -3253,6 +3264,7 @@ namespace Nikse.SubtitleEdit.Forms ShowStatus(_language.LineSplitted); SubtitleListview1.SelectedIndexChanged += SubtitleListview1_SelectedIndexChanged; RefreshSelectedParagraph(); + _change = true; } } @@ -4299,6 +4311,90 @@ namespace Nikse.SubtitleEdit.Forms e.SuppressKeyPress = true; } } + else if (e.Modifiers == Keys.Alt && e.KeyCode == Keys.D1) + { + if (SubtitleListview1.SelectedItems.Count > 0 && _subtitle != null && mediaPlayer.VideoPlayer != null) + { + Paragraph p = _subtitle.GetParagraphOrDefault(SubtitleListview1.SelectedItems[0].Index); + if (p != null) + { + mediaPlayer.CurrentPosition = p.StartTime.TotalSeconds; + e.SuppressKeyPress = true; + } + } + } + else if (e.Modifiers == Keys.Alt && e.KeyCode == Keys.D2) + { + if (SubtitleListview1.SelectedItems.Count > 0 && _subtitle != null && mediaPlayer.VideoPlayer != null) + { + Paragraph p = _subtitle.GetParagraphOrDefault(SubtitleListview1.SelectedItems[0].Index); + if (p != null) + { + mediaPlayer.CurrentPosition = p.EndTime.TotalSeconds; + e.SuppressKeyPress = true; + } + } + } + else if (e.Modifiers == Keys.Alt && e.KeyCode == Keys.D3) + { + if (SubtitleListview1.SelectedItems.Count > 0 && _subtitle != null && mediaPlayer.VideoPlayer != null) + { + int index = SubtitleListview1.SelectedItems[0].Index -1; + Paragraph p = _subtitle.GetParagraphOrDefault(index); + if (p != null) + { + SubtitleListview1.SelectIndexAndEnsureVisible(index); + mediaPlayer.CurrentPosition = p.StartTime.TotalSeconds; + e.SuppressKeyPress = true; + } + } + } + else if (e.Modifiers == Keys.Alt && e.KeyCode == Keys.D4) + { + if (SubtitleListview1.SelectedItems.Count > 0 && _subtitle != null && mediaPlayer.VideoPlayer != null) + { + int index = SubtitleListview1.SelectedItems[0].Index + 1; + Paragraph p = _subtitle.GetParagraphOrDefault(index); + if (p != null) + { + SubtitleListview1.SelectIndexAndEnsureVisible(index); + mediaPlayer.CurrentPosition = p.StartTime.TotalSeconds; + e.SuppressKeyPress = true; + } + } + } + else if (e.Modifiers == Keys.None && e.KeyCode == Keys.F4) + { + if (SubtitleListview1.SelectedItems.Count > 0 && _subtitle != null && mediaPlayer.VideoPlayer != null) + { + mediaPlayer.Pause(); + Paragraph p = _subtitle.GetParagraphOrDefault(SubtitleListview1.SelectedItems[0].Index); + if (p != null) + { + if (Math.Abs(mediaPlayer.CurrentPosition - p.StartTime.TotalSeconds) < 0.1) + mediaPlayer.CurrentPosition = p.EndTime.TotalSeconds; + else + mediaPlayer.CurrentPosition = p.StartTime.TotalSeconds; + e.SuppressKeyPress = true; + } + + } + } + else if (e.Modifiers == Keys.None && e.KeyCode == Keys.F5) + { + if (SubtitleListview1.SelectedItems.Count > 0 && _subtitle != null && mediaPlayer.VideoPlayer != null) + { + Paragraph p = _subtitle.GetParagraphOrDefault(SubtitleListview1.SelectedItems[0].Index); + if (p != null) + { + mediaPlayer.CurrentPosition = p.StartTime.TotalSeconds; + Utilities.ShowSubtitle(_subtitle.Paragraphs, labelSubtitle, mediaPlayer.VideoPlayer); + mediaPlayer.Play(); + _endSeconds = p.EndTime.TotalSeconds; + e.SuppressKeyPress = true; + } + } + } else if (e.Modifiers == Keys.None && e.KeyCode == Keys.F6) { if (mediaPlayer.VideoPlayer != null) @@ -5643,6 +5739,7 @@ namespace Nikse.SubtitleEdit.Forms if (_endSeconds >= 0 && mediaPlayer.CurrentPosition > _endSeconds && !AutoRepeatContinueOn) { mediaPlayer.Pause(); + mediaPlayer.CurrentPosition = _endSeconds + EndDelay; _endSeconds = -1; } @@ -6136,12 +6233,12 @@ namespace Nikse.SubtitleEdit.Forms } private void splitToolStripMenuItem1_Click(object sender, EventArgs e) - { + { int index = _subtitle.GetIndex(AudioWaveForm.RightClickedParagraph); if (index >= 0) { SubtitleListview1.SelectIndexAndEnsureVisible(index); - SplitLineToolStripMenuItemClick(null, null); + SplitSelectedParagraph(_audioWaveFormRightClickSeconds); } } diff --git a/src/Forms/Main.resx b/src/Forms/Main.resx index 21ead9cd3..f900f0d02 100644 --- a/src/Forms/Main.resx +++ b/src/Forms/Main.resx @@ -291,47 +291,47 @@ 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 RK5CYII= diff --git a/src/Forms/ShowHistory.cs b/src/Forms/ShowHistory.cs index f755a43d5..db2feb994 100644 --- a/src/Forms/ShowHistory.cs +++ b/src/Forms/ShowHistory.cs @@ -38,6 +38,8 @@ namespace Nikse.SubtitleEdit.Forms AddHistoryItemToListView(item); } ListViewHistorySelectedIndexChanged(null, null); + if (listViewHistory.Items.Count > 0) + listViewHistory.Items[listViewHistory.Items.Count - 1].Selected = true; } private void AddHistoryItemToListView(HistoryItem hi) diff --git a/src/Logic/ImageSplitter.cs b/src/Logic/ImageSplitter.cs index 117783846..f209b40e3 100644 --- a/src/Logic/ImageSplitter.cs +++ b/src/Logic/ImageSplitter.cs @@ -308,7 +308,11 @@ namespace Nikse.SubtitleEdit.Logic (c2.A == 0 || IsColorClose(c2, Color.Black, 280))) { cursivePoints.Add(new Point(newX, newY)); - newX--; + if (newX > 1) + newX--; + else + cursiveOk = false; + newY++; } else diff --git a/src/Resources/da-DK.xml b/src/Resources/da-DK.xml index 96efbe8da..9366e87a1 100644 --- a/src/Resources/da-DK.xml +++ b/src/Resources/da-DK.xml @@ -372,7 +372,7 @@ Sammenlign... Import/OCR undertekster fra VOB/IFO (dvd) ... Importer/OCR VobSub (sub/idx) undertekst... - Importer/OCR BluRay sup fil... + Importer/OCR Blu-ray sup fil... Importer undertekster fra Matroska fil... Importer undertekst med manuel valgt tegnsæt... Importer tekst... @@ -673,10 +673,10 @@ Fortsæt? Header ikke gyldig VobSub fil: {0} Åbn VobSub (sub/idx) undertekst... VobSub undertekst filer - Åbn BluRay sup fil... - BluRay sup filer + Åbn Blu-ray sup fil... + Blu-ray sup filer Før import af VobSub undertekst - Før import af BluRay sup undertekst + Før import af Blu-ray sup undertekst Før vis udvalgte linjer tidligere/senere Vis tidligere/senere udført på udvalgte linjer Dobbelt ord via regex {0} @@ -978,7 +978,7 @@ Fortsæt? Importer/OCR VobSub (sub/idx) undertekst - Importer/OCR BluRay (.sup) undertekst + Importer/OCR Blu-ray (.sup) undertekst OCR-metoden OCR via Microsoft Office Document Imaging (MODI). Kræver MS Office OCR via Tesseract diff --git a/src/Resources/da-DK.xml.zip b/src/Resources/da-DK.xml.zip index 5eef89dec..4b03e70b3 100644 Binary files a/src/Resources/da-DK.xml.zip and b/src/Resources/da-DK.xml.zip differ