Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-27 14:32:35 +01:00
Code Issues Projects Releases Wiki Activity

remove trailing whitespace and update the version in build.bat and Manifest.manifest

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1122 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
XhmikosR 2012-04-15 16:00:40 +00:00
parent bf0d7b23df
commit 47ff265341
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.bat
View File

@ -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

10
src/Forms/ExtractDateTimeInfo.cs
View File

@ -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();

4
src/Forms/Main.cs
View File

@ -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();

2
src/Logic/Settings.cs
View File

@ -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);

6
src/Logic/SubtitleFormats/CheetahCaption.cs
View File

@ -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;

2
src/Logic/Utilities.cs
View File

@ -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;

2
src/Properties/Manifest.manifest
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="SubtitleEdit"
processorArchitecture="*"
version="3.2.3.0"
version="3.2.7.0"
type="win32"
/>
<description>SubtitleEdit</description>