remove trailing whitespace

git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@927 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
XhmikosR 2012-01-13 10:38:01 +00:00
parent 682b39fb52
commit f81c645697
5 changed files with 14 additions and 14 deletions

View File

@ -468,7 +468,7 @@ namespace Nikse.SubtitleEdit.Forms
i+1, p.StartTime, p.EndTime, p.Text, Environment.NewLine);
Paragraph prev = _subtitle.GetParagraphOrDefault(i - 1);
Paragraph next = _subtitle.GetParagraphOrDefault(i + 1);
Paragraph next = _subtitle.GetParagraphOrDefault(i + 1);
double wantedDisplayTime = Utilities.GetDisplayMillisecondsFromText(p.Text);

View File

@ -396,7 +396,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
catch (Exception exception)
{
{
Console.WriteLine("Unable to set encoding (" + exception.Message +") - using UTF-8");
targetEncoding = Encoding.UTF8;
}
@ -424,8 +424,8 @@ namespace Nikse.SubtitleEdit.Forms
int converted = 0;
int errors = 0;
var formats = SubtitleFormat.AllSubtitleFormats;
string outputFileName;
string outputFileName;
foreach (string fileName in files)
{
count++;
@ -598,15 +598,15 @@ namespace Nikse.SubtitleEdit.Forms
FreeConsole();
}
string FormatOutputFileNameForBatchConvert(string fileName, string extension)
{
string outputFileName = Path.ChangeExtension(fileName,extension);
string FormatOutputFileNameForBatchConvert(string fileName, string extension)
{
string outputFileName = Path.ChangeExtension(fileName,extension);
if (File.Exists(outputFileName))
outputFileName = Path.ChangeExtension(fileName, Guid.NewGuid().ToString() + extension);
return outputFileName;
}
return outputFileName;
}
void AudioWaveForm_OnNonParagraphRightClicked(double seconds, Paragraph paragraph)
{
addParagraphHereToolStripMenuItem.Visible = false;

View File

@ -103,7 +103,7 @@ namespace Nikse.SubtitleEdit.Forms
else if (e.KeyCode == Keys.Up && e.Modifiers == Keys.Alt && WindowState == FormWindowState.Maximized)
{
_mainForm.GotoPrevSubPosFromvideoPos();
e.Handled = true;
e.Handled = true;
}
else if (e.Modifiers == Keys.Alt && e.KeyCode == Keys.Down && WindowState == FormWindowState.Maximized)
{

View File

@ -8,7 +8,7 @@ namespace Nikse.SubtitleEdit.Logic
{
public byte[] Buffer1 { get; set; }
public byte[] Buffer2 {get; set;}
public int Length { get { return Buffer1.Length + Buffer2.Length; } }
public int Length { get { return Buffer1.Length + Buffer2.Length; } }
}
unsafe public class NikseBitmap

View File

@ -693,7 +693,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
fs.WriteByte(0x0a); // sometimes 0x0b?
fs.WriteByte(0xfe);
fs.WriteByte(0x02); //2=centered, 1=left aligned, 0=right aligned, 09=Fount2 (large font),
fs.WriteByte(0x02); //2=centered, 1=left aligned, 0=right aligned, 09=Fount2 (large font),
//55=safe area override (too long line), 0A=Fount2 + centered, 06=centered + safe area override
fs.WriteByte(0x03);
@ -717,7 +717,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
text = text.Replace("</I>", "</i>");
if (!text.Contains("<i>"))
return text;
if (Utilities.CountTagInText(text, "<i>") == 1 && text.StartsWith("<i>") && text.EndsWith("</i>"))
return "<" + Utilities.RemoveHtmlTags(text).Replace(Environment.NewLine, Environment.NewLine + "<");