diff --git a/build.bat b/build.bat index 6a94584fc..3e8523503 100644 --- a/build.bat +++ b/build.bat @@ -1,7 +1,7 @@ @ECHO OFF SETLOCAL -SET "VERSION=3.2.6" +SET "VERSION=3.2.7" SET "SEVENZIP_PATH=%PROGRAMFILES%\7-Zip\7z.exe" CD /D %~dp0 diff --git a/src/Forms/ExtractDateTimeInfo.cs b/src/Forms/ExtractDateTimeInfo.cs index 87d16b770..56ccd804f 100644 --- a/src/Forms/ExtractDateTimeInfo.cs +++ b/src/Forms/ExtractDateTimeInfo.cs @@ -66,16 +66,16 @@ namespace Nikse.SubtitleEdit.Forms private DateTime GetStartDateTime() { - return new DateTime(dateTimePicker1.Value.Year, dateTimePicker1.Value.Month, dateTimePicker1.Value.Day, - timeUpDownStartTime.TimeCode.Hours, timeUpDownStartTime.TimeCode.Minutes, - timeUpDownStartTime.TimeCode.Seconds, timeUpDownStartTime.TimeCode.Milliseconds); + return new DateTime(dateTimePicker1.Value.Year, dateTimePicker1.Value.Month, dateTimePicker1.Value.Day, + timeUpDownStartTime.TimeCode.Hours, timeUpDownStartTime.TimeCode.Minutes, + timeUpDownStartTime.TimeCode.Seconds, timeUpDownStartTime.TimeCode.Milliseconds); } private void buttonOK_Click(object sender, EventArgs e) { DateTimeSubtitle = new Subtitle(); - DateTime start = GetStartDateTime(); - double durationInSeconds = timeUpDownDuration.TimeCode.TotalSeconds; + DateTime start = GetStartDateTime(); + double durationInSeconds = timeUpDownDuration.TimeCode.TotalSeconds; for (int i = 0; i < durationInSeconds; i++) { Paragraph p = new Paragraph(); diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index 2973ab3f6..e8ddc75ef 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -13485,7 +13485,7 @@ namespace Nikse.SubtitleEdit.Forms if (applyDurationLimits.ShowDialog(this) == DialogResult.OK) { MakeHistoryForUndo(_language.BeforeDisplayTimeAdjustment); - + if (onlySelectedLines) { // we only update selected lines int i = 0; @@ -13527,7 +13527,7 @@ namespace Nikse.SubtitleEdit.Forms if (extractDateTimeInfo.ShowDialog(this) == DialogResult.OK) { if (ContinueNewOrExit()) - { + { MakeHistoryForUndo(_language.BeforeDisplayTimeAdjustment); ResetSubtitle(); diff --git a/src/Logic/Settings.cs b/src/Logic/Settings.cs index 91519af34..d42911cde 100644 --- a/src/Logic/Settings.cs +++ b/src/Logic/Settings.cs @@ -1839,7 +1839,7 @@ namespace Nikse.SubtitleEdit.Logic textWriter.WriteElementString("MainListViewItalic", settings.Shortcuts.MainListViewItalic); textWriter.WriteElementString("MainListViewToggleDashes", settings.Shortcuts.MainListViewToggleDashes); textWriter.WriteElementString("MainTextBoxItalic", settings.Shortcuts.MainTextBoxItalic); - textWriter.WriteElementString("MainTextBoxSplitAtCursor", settings.Shortcuts.MainTextBoxSplitAtCursor); + textWriter.WriteElementString("MainTextBoxSplitAtCursor", settings.Shortcuts.MainTextBoxSplitAtCursor); textWriter.WriteElementString("MainCreateInsertSubAtVideoPos", settings.Shortcuts.MainCreateInsertSubAtVideoPos); textWriter.WriteElementString("MainCreatePlayFromJustBefore", settings.Shortcuts.MainCreatePlayFromJustBefore); textWriter.WriteElementString("MainCreateSetStart", settings.Shortcuts.MainCreateSetStart); diff --git a/src/Logic/SubtitleFormats/CheetahCaption.cs b/src/Logic/SubtitleFormats/CheetahCaption.cs index fc6b32efa..2b3a3e97c 100644 --- a/src/Logic/SubtitleFormats/CheetahCaption.cs +++ b/src/Logic/SubtitleFormats/CheetahCaption.cs @@ -60,7 +60,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats fs.WriteByte(0x10); // ?? buffer = Encoding.ASCII.GetBytes(text); - fs.Write(buffer, 0, buffer.Length); // Text starter på index 19 (0 baseret) + fs.Write(buffer, 0, buffer.Length); // Text starter på index 19 (0 baseret) } fs.Close(); } @@ -115,7 +115,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats int i = 128; Paragraph last = null; while (i < buffer.Length - 20) - { + { Paragraph p = new Paragraph(); int length = buffer[i]; int textLength = length - 20; @@ -137,7 +137,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats last.EndTime.TotalMilliseconds = p.StartTime.TotalMilliseconds - Configuration.Settings.General.MininumMillisecondsBetweenLines; p.EndTime = DecodeTimeStamp(buffer, i + 6); - p.Text = Encoding.ASCII.GetString(buffer, i + start, textLength); + p.Text = Encoding.ASCII.GetString(buffer, i + start, textLength); p.Text = p.Text.Replace("\0\0\0\0", Environment.NewLine); subtitle.Paragraphs.Add(p); last = p; diff --git a/src/Logic/Utilities.cs b/src/Logic/Utilities.cs index e7a2ff76e..4f388226d 100644 --- a/src/Logic/Utilities.cs +++ b/src/Logic/Utilities.cs @@ -97,7 +97,7 @@ namespace Nikse.SubtitleEdit.Logic info.Width = dh.Width; info.Height = dh.Height; info.FramesPerSecond = dh.FrameRate; - info.TotalFrames = dh.TotalFrames; + info.TotalFrames = dh.TotalFrames; info.TotalMilliseconds = dh.TotalMilliseconds; info.TotalSeconds = info.TotalMilliseconds / 1000.0; info.VideoCodec = dh.VideoHandler; diff --git a/src/Properties/Manifest.manifest b/src/Properties/Manifest.manifest index 5079d38b8..1d43c1d09 100644 --- a/src/Properties/Manifest.manifest +++ b/src/Properties/Manifest.manifest @@ -3,7 +3,7 @@ SubtitleEdit