mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Work on #7560
This commit is contained in:
parent
3aa10f8b03
commit
ffc754d4e9
@ -11391,13 +11391,11 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
{
|
{
|
||||||
if (timerAutoDuration.Enabled)
|
if (timerAutoDuration.Enabled)
|
||||||
{
|
{
|
||||||
timerAutoDuration.Stop();
|
StopAutoDuration();
|
||||||
labelAutoDuration.Visible = false;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
timerAutoDuration.Start();
|
StartAutoDuration();
|
||||||
labelAutoDuration.Visible = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
e.SuppressKeyPress = true;
|
e.SuppressKeyPress = true;
|
||||||
@ -18579,7 +18577,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
duration <= 60_000)
|
duration <= 60_000)
|
||||||
{
|
{
|
||||||
MakeHistoryForUndoOnlyIfNotRecent(string.Format(_language.VideoControls.BeforeChangingTimeInWaveformX, "#" + _subtitle.Paragraphs[index].Number + " " + _subtitle.Paragraphs[index].Text));
|
MakeHistoryForUndoOnlyIfNotRecent(string.Format(_language.VideoControls.BeforeChangingTimeInWaveformX, "#" + _subtitle.Paragraphs[index].Number + " " + _subtitle.Paragraphs[index].Text));
|
||||||
var newEndTime = new TimeCode(videoTimeCode.TotalMilliseconds - (double)MinGapBetweenLines);
|
var newEndTime = new TimeCode(videoTimeCode.TotalMilliseconds - MinGapBetweenLines);
|
||||||
double charactersPerSecond = Utilities.GetCharactersPerSecond(new Paragraph(p) { EndTime = newEndTime });
|
double charactersPerSecond = Utilities.GetCharactersPerSecond(new Paragraph(p) { EndTime = newEndTime });
|
||||||
if (charactersPerSecond <= Configuration.Settings.General.SubtitleMaximumCharactersPerSeconds)
|
if (charactersPerSecond <= Configuration.Settings.General.SubtitleMaximumCharactersPerSeconds)
|
||||||
{
|
{
|
||||||
@ -18588,13 +18586,14 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
|
|
||||||
SubtitleListview1.SetStartTimeAndDuration(index, _subtitle.Paragraphs[index], _subtitle.GetParagraphOrDefault(index + 1), _subtitle.GetParagraphOrDefault(index - 1));
|
SubtitleListview1.SetStartTimeAndDuration(index, _subtitle.Paragraphs[index], _subtitle.GetParagraphOrDefault(index + 1), _subtitle.GetParagraphOrDefault(index - 1));
|
||||||
SetDurationInSeconds(_subtitle.Paragraphs[index].DurationTotalSeconds);
|
SetDurationInSeconds(_subtitle.Paragraphs[index].DurationTotalSeconds);
|
||||||
var newP = InsertNewParagraphAtPosition(newEndTime.TotalMilliseconds);
|
var newP = InsertNewParagraphAtPosition(newEndTime.TotalMilliseconds + MinGapBetweenLines);
|
||||||
if (audioVisualizer.WavePeaks != null && newP.EndTime.TotalSeconds >= audioVisualizer.EndPositionSeconds - 0.1)
|
if (audioVisualizer.WavePeaks != null && newP.EndTime.TotalSeconds >= audioVisualizer.EndPositionSeconds - 0.1)
|
||||||
{
|
{
|
||||||
audioVisualizer.StartPositionSeconds = Math.Max(0, newP.StartTime.TotalSeconds - 0.1);
|
audioVisualizer.StartPositionSeconds = Math.Max(0, newP.StartTime.TotalSeconds - 0.1);
|
||||||
}
|
}
|
||||||
|
|
||||||
UpdateSourceView();
|
UpdateSourceView();
|
||||||
|
StartAutoDuration();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -24867,6 +24866,12 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
labelAutoDuration.Visible = false;
|
labelAutoDuration.Visible = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void StartAutoDuration()
|
||||||
|
{
|
||||||
|
timerAutoDuration.Start();
|
||||||
|
labelAutoDuration.Visible = true;
|
||||||
|
}
|
||||||
|
|
||||||
private void TextBoxListViewTextLeave(object sender, EventArgs e)
|
private void TextBoxListViewTextLeave(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
StopAutoDuration();
|
StopAutoDuration();
|
||||||
|
Loading…
Reference in New Issue
Block a user