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

remove trailing whitespace

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1311 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
XhmikosR 2012-08-05 13:00:27 +00:00
parent d129876305
commit 424cf3deab
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ChangeLog.txt
View File

@ -11,7 +11,7 @@ Subtitle Edit Changelog
* New setting in Options: "Max. chars/second"
* New settings in Options regarding "Min. duration" + "Max. duration"
* New settings in Options regarding syntax coloring
* Several other new subtitle formats
* Several other new subtitle formats
* New settings in Options, center subtitle (in SE text boxes)
* Tools -> Join subtitles (merge of multiple parts)
* Tools -> Apply duration limits

10
src/Forms/ExportPngXml.cs
View File

@ -104,7 +104,7 @@ namespace Nikse.SubtitleEdit.Forms
{
text = p.Text.Substring(0, 6);
alignment = GetSsaAlignment(text, alignment);
}
else if (text.Length > 6)
{
@ -196,7 +196,7 @@ namespace Nikse.SubtitleEdit.Forms
EndTime = (long) parameter.P.EndTime.TotalMilliseconds,
Width = parameter.ScreenWidth,
Height = parameter.ScreenHeight
};
};
parameter.Buffer = Logic.BluRaySup.BluRaySupPicture.CreateSupFrame(brSub, parameter.Bitmap, parameter.FramesPerSeconds, parameter.BottomMargin, parameter.Alignment);
}
else if (parameter.Type == "VOBSUB")
@ -593,9 +593,9 @@ namespace Nikse.SubtitleEdit.Forms
x = width - param.Bitmap.Width - border;
y = border;
break;
default: // ContentAlignment.BottomCenter:
default: // ContentAlignment.BottomCenter:
break;
}
}
sb.AppendLine(" <Graphic Width=\"" + param.Bitmap.Width.ToString() + "\" Height=\"" +
param.Bitmap.Height.ToString() + "\" X=\"" + x.ToString() + "\" Y=\"" + y.ToString() +
@ -1128,7 +1128,7 @@ namespace Nikse.SubtitleEdit.Forms
int w = groupBoxExportImage.Width - 4;
pictureBox1.Width = bmp.Width;
pictureBox1.Height = bmp.Height;
pictureBox1.Top = groupBoxExportImage.Height - bmp.Height - int.Parse(comboBoxBottomMargin.Text);
pictureBox1.Top = groupBoxExportImage.Height - bmp.Height - int.Parse(comboBoxBottomMargin.Text);
pictureBox1.Left = (w - bmp.Width) / 2;
var alignment = GetAlignmentFromParagraph(_subtitle.Paragraphs[subtitleListView1.SelectedItems[0].Index], _format, _subtitle);
if (_exportType == "BDNXML" || _exportType == "BLURAYSUP")

4
src/Forms/Main.cs
View File

@ -7256,7 +7256,7 @@ namespace Nikse.SubtitleEdit.Forms
outZStream.Close();
inStream.Close();
}
if (!error)
mergedVobSubPacks.Add(new VobSubMergedPack(buffer, TimeSpan.FromMilliseconds(p.StartMilliseconds), 32, null));
}
@ -7360,7 +7360,7 @@ namespace Nikse.SubtitleEdit.Forms
foreach (var sup in list)
{
sup.StartTime = (long)((p.StartMilliseconds - 45) * 90.0);
sup.EndTime = (long)((p.EndMilliseconds - 45) * 90.0);
sup.EndTime = (long)((p.EndMilliseconds - 45) * 90.0);
subtitles.Add(sup);
// fix overlapping

2
src/Logic/BluRaySup/BluRaySupPicture.cs
View File

@ -616,7 +616,7 @@ namespace Nikse.SubtitleEdit.Logic.BluRaySup
pic.WindowXOffset = (pic.Width - bm.Width) / 2;
pic.WindowYOffset = pic.Height - (bm.Height + bottomMargin);
break;
}
}
int yOfs = pic.WindowYOffset - Core.CropOfsY;
if (yOfs < 0)

2
src/Logic/Settings.cs
View File

@ -1850,7 +1850,7 @@ namespace Nikse.SubtitleEdit.Logic
textWriter.WriteElementString("SplitOutputFolder", settings.Tools.SplitOutputFolder);
textWriter.WriteElementString("SplitNumberOfParts", settings.Tools.SplitNumberOfParts.ToString());
textWriter.WriteElementString("SplitVia", settings.Tools.SplitVia);
textWriter.WriteElementString("NewEmptyTranslationText", settings.Tools.NewEmptyTranslationText);
textWriter.WriteElementString("NewEmptyTranslationText", settings.Tools.NewEmptyTranslationText);
textWriter.WriteEndElement();
textWriter.WriteStartElement("SubtitleSettings", "");

2
src/Logic/Spellcheck/VoikkoSpellCheck.cs
View File

@ -140,7 +140,7 @@ namespace Nikse.SubtitleEdit.Logic.SpellCheck
}
public VoikkoSpellCheck(string baseFolder, string dictionaryFolder)
{
{
LoadLibVoikkoDynamic(baseFolder);
IntPtr error = new IntPtr();

10
src/Logic/SubtitleFormats/Cavena890.cs
View File

@ -95,7 +95,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
bool isChinese = false;
foreach (Paragraph p in subtitle.Paragraphs)
{
{
if (p.Text.Contains("的") ||
p.Text.Contains("是") ||
p.Text.Contains("啊") ||
@ -150,9 +150,9 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
buffer[191] = 0x4F;
buffer[192] = 0x41;
if (isChinese)
{
{
buffer[187] = 0x43; // CCKM44
buffer[188] = 0x43;
buffer[189] = 0x4B;
@ -164,7 +164,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
buffer[193] = 0x2E;
buffer[194] = 0x56;
buffer[208] = 0xf6;
buffer[209] = 0x01;
@ -329,7 +329,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
}
else if (_language != null && _language.StartsWith("CCKM44"))
{
encoding = Encoding.GetEncoding(1201);
encoding = Encoding.GetEncoding(1201);
if (index < 49)
{
if (i + 3 < text.Length && text.Substring(i, 3) == "<i>")

4
src/Logic/Utilities.cs
View File

@ -204,7 +204,7 @@ namespace Nikse.SubtitleEdit.Logic
videoPlayerContainer.SetSubtitleText(text, p);
return index;
}
break;
break;
}
}
index++;
@ -1390,7 +1390,7 @@ namespace Nikse.SubtitleEdit.Logic
{
var extraExtensions = Configuration.Settings.General.OpenSubtitleExtraExtensions.Split(";".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
foreach (string ext in extraExtensions)
{
{
if (ext.StartsWith("*.") && !sb.ToString().ToLower().Contains(ext.ToLower()))
AddExtension(sb, ext);
}