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

Fix issue with "Max Time" after "split at cursor" - thx Jüri :)

Browse Source
This commit is contained in:
Nikolaj Olsson 2018-07-04 07:48:15 +02:00
parent 310c094fe1
commit 66b1e7820c
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libse/TimeCode.cs
View File

@ -6,18 +6,11 @@ namespace Nikse.SubtitleEdit.Core
{
public class TimeCode
{
public static readonly TimeCode MaxTime = new TimeCode(99, 59, 59, 999);
public const double BaseUnit = 1000.0; // Base unit of time
private double _totalMilliseconds;
public bool IsMaxTime
{
get
{
return Math.Abs(_totalMilliseconds - MaxTime.TotalMilliseconds) < 0.01;
}
}
public bool IsMaxTime => Math.Abs(_totalMilliseconds - MaxTimeTotalMilliseconds) < 0.01;
public const double MaxTimeTotalMilliseconds = 359999999; // new TimeCode(99, 59, 59, 999).TotalMilliseconds
public static TimeCode FromSeconds(double seconds)
{

6
src/Controls/TimeUpDown.cs
View File

@ -80,7 +80,7 @@ namespace Nikse.SubtitleEdit.Controls
double? milliseconds = GetTotalMilliseconds();
if (milliseconds.HasValue)
{
if (milliseconds.Value >= TimeCode.MaxTime.TotalMilliseconds - 0.1)
if (milliseconds.Value >= TimeCode.MaxTimeTotalMilliseconds - 0.1)
milliseconds = 0;
if (Mode == TimeMode.HHMMSSMS)
@ -150,7 +150,7 @@ namespace Nikse.SubtitleEdit.Controls
return new TimeCode();
if (string.IsNullOrWhiteSpace(maskedTextBox1.Text.RemoveChar('.').Replace(CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator, string.Empty).RemoveChar(',').RemoveChar(':')))
return TimeCode.MaxTime;
return new TimeCode(TimeCode.MaxTimeTotalMilliseconds);
if (!_dirty)
return new TimeCode(_initialTotalMilliseconds);
@ -243,7 +243,7 @@ namespace Nikse.SubtitleEdit.Controls
_initialTotalMilliseconds = value.TotalMilliseconds;
}
if (value == null || value.TotalMilliseconds >= TimeCode.MaxTime.TotalMilliseconds - 0.1)
if (value == null || value.TotalMilliseconds >= TimeCode.MaxTimeTotalMilliseconds - 0.1)
{
maskedTextBox1.Text = string.Empty;
return;

4
src/Forms/ImportText.cs
View File

@ -232,8 +232,8 @@ namespace Nikse.SubtitleEdit.Forms
{
foreach (Paragraph p in _subtitle.Paragraphs)
{
p.StartTime.TotalMilliseconds = TimeCode.MaxTime.TotalMilliseconds;
p.EndTime.TotalMilliseconds = TimeCode.MaxTime.TotalMilliseconds;
p.StartTime.TotalMilliseconds = TimeCode.MaxTimeTotalMilliseconds;
p.EndTime.TotalMilliseconds = TimeCode.MaxTimeTotalMilliseconds;
}
}

4
src/Forms/Main.cs
View File

@ -8714,8 +8714,8 @@ namespace Nikse.SubtitleEdit.Forms
if (currentParagraph.StartTime.IsMaxTime && currentParagraph.EndTime.IsMaxTime)
{
newParagraph.StartTime = TimeCode.MaxTime;
newParagraph.EndTime = TimeCode.MaxTime;
newParagraph.StartTime.TotalMilliseconds = TimeCode.MaxTimeTotalMilliseconds;
newParagraph.EndTime.TotalMilliseconds = TimeCode.MaxTimeTotalMilliseconds;
}
else
{