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

remove trailing whitespace

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1216 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
XhmikosR 2012-06-01 14:09:30 +00:00
parent 6be7587cc9
commit bb5dc53877
10 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.bat
View File

@ -42,7 +42,7 @@ IF "%~1" == "" (
:START
PUSHD "src"
CALL "%VS100COMNTOOLS%vsvars32.bat"
CALL "%VS100COMNTOOLS%vsvars32.bat" x86
TITLE %BUILDTYPE%ing SubtitleEdit - Release^|Any CPU...
"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" SubtitleEdit.sln^

12
src/Forms/SubStationAlphaStyles.cs
View File

@ -134,7 +134,7 @@ namespace Nikse.SubtitleEdit.Forms
if (comboBoxFontName.Left > numericUpDownFontSize.Left)
numericUpDownFontSize.Left = comboBoxFontName.Left;
else
comboBoxFontName.Left = numericUpDownFontSize.Left;
comboBoxFontName.Left = numericUpDownFontSize.Left;
numericUpDownOutline.Left = radioButtonOutline.Left + radioButtonOutline.Width + 5;
labelShadow.Left = numericUpDownOutline.Left + numericUpDownOutline.Width + 5;
@ -256,7 +256,7 @@ namespace Nikse.SubtitleEdit.Forms
g.FillPath(new SolidBrush(Color.FromArgb(200, panelBackColor.BackColor)), shadowPath);
}
}
if (outline > 0 && radioButtonOutline.Checked)
g.DrawPath(new Pen(panelOutlineColor.BackColor, outline), path);
g.FillPath(new SolidBrush(panelPrimaryColor.BackColor), path);
@ -732,7 +732,7 @@ namespace Nikse.SubtitleEdit.Forms
doRepeat = GetSsaStyle(style.Name).LoadedFromHeader;
count++;
}
}
}
_doUpdate = false;
AddStyle(style);
@ -764,7 +764,7 @@ namespace Nikse.SubtitleEdit.Forms
else
{
Header += Environment.NewLine + newLine;
}
}
}
}
@ -796,9 +796,9 @@ namespace Nikse.SubtitleEdit.Forms
}
private void textBoxStyleName_TextChanged(object sender, EventArgs e)
{
{
if (listViewStyles.SelectedItems.Count == 1)
{
{
if (_doUpdate)
{
if (!GetSsaStyle(textBoxStyleName.Text).LoadedFromHeader)

4
src/Logic/Language.cs
View File

@ -1413,12 +1413,12 @@ can edit in same subtitle file (collaboration)",
MiddleRight = "Middle/right",
BottomLeft = "Bottom/left",
BottomCenter = "Bottom/center",
BottomRight = "Bottom/right",
BottomRight = "Bottom/right",
Colors = "Colors",
Margins = "Margins",
MarginLeft = "Margin left",
MarginRight = "Margin right",
MarginVertical = "Margin vertical",
MarginVertical = "Margin vertical",
Border = "Border",
PlusShadow = "+ Shadow",
OpaqueBox = "Opaque box (uses outline color)",

2
src/Logic/LanguageStructure.cs
View File

@ -1372,7 +1372,7 @@
public string Border { get; set; }
public string PlusShadow { get; set; }
public string OpaqueBox { get; set; }
}
}
public class PointSync
{

2
src/Logic/SubtitleFormats/AdvancedSubStationAlpha.cs
View File

@ -430,7 +430,7 @@ Format: Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text
{
int number;
if (int.TryParse(f, out number))
{
{
Color temp = Color.FromArgb(number);
return Color.FromArgb(255, temp.B, temp.G, temp.R);
}

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

@ -536,7 +536,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
0x50AD, // 傭
0x6295, // 投
0x8A34, // 訴
0x2659, // …
0x2659, // …
0x2A90, // 太
0x8B90, // 邋
0x624E, // 遢
@ -549,13 +549,13 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
0x5E8A, // 床
0x63DB, // 換
0x6210, // 成
};

2
src/Logic/SubtitleFormats/SubtitleFormat.cs
View File

@ -74,7 +74,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
new SwiftText(),
new TimedText10(),
new TimedText200604(),
new TimedText(),
new TimedText(),
new TimeXml(),
new TitleExchangePro(),
new TmpegEncText(),

2
src/Logic/SubtitleFormats/TimedText.cs
View File

@ -65,7 +65,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
{
string xmlStructure =
"<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + Environment.NewLine +
"<tt xmlns=\"http://www.w3.org/2006/10/ttaf1\" xmlns:ttp=\"http://www.w3.org/2006/10/ttaf1#parameter\" ttp:timeBase=\"media\" xmlns:tts=\"http://www.w3.org/2006/10/ttaf1#style\" xml:lang=\"en\" xmlns:ttm=\"http://www.w3.org/2006/10/ttaf1#metadata\">" + Environment.NewLine +
"<tt xmlns=\"http://www.w3.org/2006/10/ttaf1\" xmlns:ttp=\"http://www.w3.org/2006/10/ttaf1#parameter\" ttp:timeBase=\"media\" xmlns:tts=\"http://www.w3.org/2006/10/ttaf1#style\" xml:lang=\"en\" xmlns:ttm=\"http://www.w3.org/2006/10/ttaf1#metadata\">" + Environment.NewLine +
" <head>" + Environment.NewLine +
" <metadata>" + Environment.NewLine +
" <ttm:title></ttm:title>" + Environment.NewLine +

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

@ -68,7 +68,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
"<tt xmlns=\"http://www.w3.org/2006/04/ttaf1\" xmlns:tts=\"http://www.w3.org/2006/04/ttaf1#styling\">" + Environment.NewLine +
" <head>" + Environment.NewLine +
" <styling>" + Environment.NewLine +
" <style id=\"defaultSpeaker\" tts:fontSize=\"12px\" tts:fontFamily=\"SansSerif\" tts:fontWeight=\"normal\" tts:fontStyle=\"normal\" tts:textDecoration=\"none\" tts:color=\"white\" tts:backgroundColor=\"black\" tts:textAlign=\"center\" />" + Environment.NewLine +
" <style id=\"defaultSpeaker\" tts:fontSize=\"12px\" tts:fontFamily=\"SansSerif\" tts:fontWeight=\"normal\" tts:fontStyle=\"normal\" tts:textDecoration=\"none\" tts:color=\"white\" tts:backgroundColor=\"black\" tts:textAlign=\"center\" />" + Environment.NewLine +
" </styling>" + Environment.NewLine +
" </head>" + Environment.NewLine +
" <body id=\"thebody\" style=\"defaultCaption\">" + Environment.NewLine +
@ -222,8 +222,8 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
foreach (Paragraph p in subtitle.Paragraphs)
{
p.StartTime.Milliseconds *= 10;
p.EndTime.Milliseconds *= 10;
}
p.EndTime.Milliseconds *= 10;
}
}
subtitle.Renumber(1);
}

8
src/Logic/SubtitleFormats/Ultech130.cs
View File

@ -270,8 +270,8 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
// sb.Append("<font color=\"red\">");
// font = true;
//}
//else
//else
if (b == 0x11 && b2 == 0x2e)
{
sb.Append("<i>");
@ -282,7 +282,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
//foreach (char ch in code)
// codeBytes.Insert(0, ch);
//if (codeBytes[13] == '0' && codeBytes[14] == '0' && codeBytes[12] == '1' && codeBytes[6] == '1')
//{ // preamble address code
//{ // preamble address code
// if (code.Substring(11, 4) == "1000")
// {
// sb.Append("<font color=\"green\">");
@ -409,7 +409,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
//// else if (code.Substring(11, 4) == "0101")
//// sb.Append("<font color=\"yellow\">");
//}
}
else if (b == 0x80)
{