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

ran tabspace

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1798 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
XhmikosR 2013-04-19 08:41:59 +00:00
parent a88873b6c0
commit 2fab6e5d38
15 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Forms/FixCommonErrors.cs
View File

@ -690,7 +690,7 @@ namespace Nikse.SubtitleEdit.Forms
double diff = prev.EndTime.TotalMilliseconds - p.StartTime.TotalMilliseconds;
if (prev != null && !prev.StartTime.IsMaxTime && !p.StartTime.IsMaxTime && diff >= 0 && !(canBeEqual && diff == 0))
{
int diffHalf = (int)(diff / 2);
if (!Configuration.Settings.Tools.FixCommonErrorsFixOverlapAllowEqualEndStart && p.StartTime.TotalMilliseconds == prev.EndTime.TotalMilliseconds &&
prev.Duration.TotalMilliseconds > 100)
@ -2295,7 +2295,7 @@ namespace Nikse.SubtitleEdit.Forms
bool isPrevEndOfLine = IsPrevoiusTextEndOfParagraph(prevText);
if (prevText == " .")
isPrevEndOfLine = true;
isPrevEndOfLine = true;
if (!text.StartsWith("www.") &&
(firstLetter != firstLetter.ToUpper() || IsTurkishLittleI(firstLetter)) &&
!"0123456789".Contains(firstLetter) &&

4
src/Forms/HardSubExtract.cs
View File

@ -51,7 +51,7 @@ namespace Nikse.SubtitleEdit.Forms
File.Delete(fileName);
}
catch
{
{
}
return bmp;
}
@ -81,6 +81,6 @@ namespace Nikse.SubtitleEdit.Forms
nbmp.MakeOneColorRemoverOthers(Color.White, 50);
pictureBox2.Image = nbmp.GetBitmap();
}
}
}

2
src/Forms/ImportText.cs
View File

@ -251,7 +251,7 @@ namespace Nikse.SubtitleEdit.Forms
if (sb.Length > 0)
{
_subtitle.Paragraphs.Add(new Paragraph() { Text = Utilities.AutoBreakLine(sb.ToString()) });
}
}
sb = new StringBuilder();
}
else if (!ContainsLetters(line))

4
src/Forms/JoinSubtitles.cs
View File

@ -32,7 +32,7 @@ namespace Nikse.SubtitleEdit.Forms
Text = Configuration.Settings.Language.JoinSubtitles.Title;
groupBoxPreview.Text = Configuration.Settings.Language.JoinSubtitles.Information;
buttonJoin.Text = Configuration.Settings.Language.JoinSubtitles.Join;
buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
FixLargeFonts();
}
@ -128,7 +128,7 @@ namespace Nikse.SubtitleEdit.Forms
return;
}
}
JoinedFormat = lastFormat;
JoinedFormat = lastFormat;
for (int outer = 0; outer < subtitles.Count; outer++)
{

4
src/Forms/Main.cs
View File

@ -9564,11 +9564,11 @@ namespace Nikse.SubtitleEdit.Forms
else if (e.Modifiers == (Keys.Control | Keys.Alt | Keys.Shift) && e.KeyCode == Keys.X)
{
if (!string.IsNullOrEmpty(_videoFileName))
{
{
e.SuppressKeyPress = true;
var form = new HardSubExtract(_videoFileName);
if (form.ShowDialog(this) == DialogResult.OK)
{
{
}
}
}

4
src/Forms/RemoveTextFromHearImpaired.cs
View File

@ -232,7 +232,7 @@ namespace Nikse.SubtitleEdit.Forms
}
private void AddWarning()
{
{
if (_warnings == null || _warningIndex < 0)
return;
@ -749,7 +749,7 @@ namespace Nikse.SubtitleEdit.Forms
text.StartsWith("engine ") ||
text == "roars" ||
text == "scoff" ||
text == "screeches" ||
text == "screeches" ||
text == "shouts" ||
text == "shrieks" ||
text == "sigh" ||

4
src/Forms/VobSubOcr.cs
View File

@ -3819,9 +3819,9 @@ namespace Nikse.SubtitleEdit.Forms
comboBoxOcrMethod.Items.RemoveAt(2);
}
private void InitializeTesseract()
{

1
src/Logic/Language.cs
View File

@ -2166,4 +2166,3 @@ Keep changes?",
}
}
}

4
src/Logic/Settings.cs
View File

@ -1390,7 +1390,7 @@ namespace Nikse.SubtitleEdit.Logic
settings.Tools.GenerateTimeCodePatterns = subNode.InnerText;
subNode = node.SelectSingleNode("MusicSymbolStyle");
if (subNode != null)
settings.Tools.MusicSymbolStyle = subNode.InnerText;
settings.Tools.MusicSymbolStyle = subNode.InnerText;
settings.SubtitleSettings = new Nikse.SubtitleEdit.Logic.SubtitleSettings();
node = doc.DocumentElement.SelectSingleNode("SubtitleSettings");
@ -2245,7 +2245,7 @@ namespace Nikse.SubtitleEdit.Logic
textWriter.WriteElementString("ImportTextSplitting", settings.Tools.ImportTextSplitting);
textWriter.WriteElementString("ImportTextMergeShortLines", settings.Tools.ImportTextMergeShortLines.ToString());
textWriter.WriteElementString("GenerateTimeCodePatterns", settings.Tools.GenerateTimeCodePatterns);
textWriter.WriteElementString("MusicSymbolStyle", settings.Tools.MusicSymbolStyle);
textWriter.WriteElementString("MusicSymbolStyle", settings.Tools.MusicSymbolStyle);
textWriter.WriteEndElement();
textWriter.WriteStartElement("SubtitleSettings", "");

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

@ -35,9 +35,9 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
lines.Add(line);
format.LoadSubtitle(sub, lines, string.Empty);
return sub.Header;
}
}
}
public override string Extension
{
@ -1181,7 +1181,7 @@ Format: Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text
sb.AppendLine(style.ToRawAss(styleFormat));
styleAdded = true;
}
}
}
return sb.ToString();
}

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

@ -88,7 +88,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
" <track></track>" +
"</video><audio><format><samplecharacteristics><depth>16</depth><samplerate>48000</samplerate></samplecharacteristics></format><outputs><group><index>1</index><numchannels>2</numchannels><downmix>0</downmix><channel><index>1</index></channel><channel><index>2</index></channel></group></outputs><in>-1</in><out>-1</out><track><enabled>TRUE</enabled><locked>FALSE</locked><outputchannelindex>1</outputchannelindex></track><track><enabled>TRUE</enabled><locked>FALSE</locked><outputchannelindex>2</outputchannelindex></track><track><enabled>TRUE</enabled><locked>FALSE</locked><outputchannelindex>1</outputchannelindex></track><track><enabled>TRUE</enabled><locked>FALSE</locked><outputchannelindex>2</outputchannelindex></track><filter><effect><name>Audio Levels</name><effectid>audiolevels</effectid><effectcategory>audiolevels</effectcategory><effecttype>audiolevels</effecttype><mediatype>audio</mediatype><parameter><name>Level</name><parameterid>level</parameterid><valuemin>0</valuemin><valuemax>3.98109</valuemax><value>1</value></parameter></effect></filter></audio></media></sequence></xmeml>";
string xmlTrackStructure =
"<generatoritem id=\"Text\"><name>Text</name><duration>3000</duration><rate><ntsc>FALSE</ntsc><timebase>25</timebase></rate><in>1375</in><out>1486</out><start>1504</start><end>1615</end><anamorphic>FALSE</anamorphic><alphatype>black</alphatype><logginginfo><scene/><shottake/><lognote/><good>FALSE</good></logginginfo><labels><label2/></labels><comments><mastercomment1/><mastercomment2/><mastercomment3/><mastercomment4/></comments><effect><name>Text</name><effectid>Text</effectid><effectcategory>Text</effectcategory><effecttype>generator</effecttype><mediatype>video</mediatype><parameter><parameterid>str</parameterid><name>Text</name><value><i>A finales de los años sesenta, una joven pareja, Guy y Rosemary,</i> </value></parameter><parameter><parameterid>fontname</parameterid><name>Font</name><value>Lucida Grande</value></parameter><parameter><parameterid>fontsize</parameterid><name>Size</name><valuemin>0</valuemin><valuemax>1000</valuemax><value>20</value></parameter><parameter><parameterid>fontstyle</parameterid><name>Style</name><valuemin>1</valuemin><valuemax>4</valuemax><valuelist><valueentry><name>Plain</name><value>1</value></valueentry><valueentry><name>Bold</name><value>2</value></valueentry><valueentry><name>Italic</name><value>3</value></valueentry><valueentry><name>Bold/Italic</name><value>4</value></valueentry></valuelist><value>1</value></parameter><parameter><parameterid>fontalign</parameterid><name>Alignment</name><valuemin>1</valuemin><valuemax>3</valuemax><valuelist><valueentry><name>Left</name><value>1</value></valueentry><valueentry><name>Center</name><value>2</value></valueentry><valueentry><name>Right</name><value>3</value></valueentry></valuelist><value>2</value></parameter><parameter><parameterid>fontcolor</parameterid><name>Font Color</name><value><alpha>255</alpha><red>255</red><green>255</green><blue>255</blue></value></parameter><parameter><parameterid>origin</parameterid><name>Origin</name><value><horiz>0</horiz><vert>0</vert></value></parameter><parameter><parameterid>fonttrack</parameterid><name>Tracking</name><valuemin>-200</valuemin><valuemax>200</valuemax><value>1</value></parameter><parameter><parameterid>leading</parameterid><name>Leading</name><valuemin>-100</valuemin><valuemax>100</valuemax><value>0</value></parameter><parameter><parameterid>aspect</parameterid><name>Aspect</name><valuemin>0.1</valuemin><valuemax>5</valuemax><value>1</value></parameter><parameter><parameterid>autokern</parameterid><name>Auto Kerning</name><value>TRUE</value></parameter><parameter><parameterid>subpixel</parameterid><name>Use Subpixel</name><value>TRUE</value></parameter></effect><filter><effect><name>Basic Motion</name><effectid>basic</effectid><effectcategory>motion</effectcategory><effecttype>motion</effecttype><mediatype>video</mediatype><parameter><parameterid>scale</parameterid><name>Scale</name><valuemin>0</valuemin><valuemax>1000</valuemax><value>100</value></parameter><parameter><parameterid>rotation</parameterid><name>Rotation</name><valuemin>-8640</valuemin><valuemax>8640</valuemax><value>0</value></parameter><parameter><parameterid>center</parameterid><name>Center</name><value><horiz>0.00470958</horiz><vert>0.396648</vert></value></parameter><parameter><parameterid>centerOffset</parameterid><name>Anchor Point</name><value><horiz>0</horiz><vert>0</vert></value></parameter></effect></filter><sourcetrack><mediatype>video</mediatype></sourcetrack><itemhistory><uuid>3506ED18-CB4D-41B8-A760-4D42356E4F32</uuid><uuid>1E6E96FD-94F6-4975-BDFE-7B360E909111</uuid></itemhistory></generatoritem>";

4
src/Logic/SubtitleFormats/MicroDvd.cs
View File

@ -256,10 +256,10 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
string[] parts = text.Split("|".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
int count = 0;
var lineSb = new StringBuilder();
foreach (string s2 in parts)
{
if (count > 0)
lineSb.AppendLine();

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

@ -231,7 +231,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
else
{
subtitle.Paragraphs.Add(new Paragraph(TimedText10.GetTimeCode(start, false), TimedText10.GetTimeCode(end, false), text));
}
}
}
else if (node.Attributes["dur"] != null)
{

20
src/Logic/SubtitleFormats/UnknownSubtitle52.cs
View File

@ -8,7 +8,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
public class UnknownSubtitle52 : SubtitleFormat
{
//#00001 10:00:02.00 10:00:04.13 00:00:02.13 #F CC00000D0 #C
//#00001 10:00:02.00 10:00:04.13 00:00:02.13 #F CC00000D0 #C
static readonly Regex RegexTimeCodes = new Regex(@"^\#\d\d\d\d\d\t\d\d:\d\d:\d\d\.\d\d\t\d\d:\d\d:\d\d\.\d\d\t\d\d:\d\d:\d\d\.\d\d\t.*$", RegexOptions.Compiled);
public override string Extension
@ -42,21 +42,21 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
const string timeFormat = "{0:00}:{1:00}:{2:00}.{3:00}";
var sb = new StringBuilder();
string header = @"FILE_INFO_BEGIN
VIDEOFILE:
VIDEOFILE:
ORIG_TITLE: [TITLE]
PGM_TITLE:
PGM_TITLE:
EP_TITLE: 03
PROD:
PROD:
TRANSL: SDI Media
CLIENT: FIC-HD
COMMENT:
COMMENT:
TAPE#: TN10179565
CRE_DATE:
REP_DATE:
TR_DATE:
PROG_LEN:
CRE_DATE:
REP_DATE:
TR_DATE:
PROG_LEN:
SOM: 09:59:35:00
TRA_FONT:
TRA_FONT:
LANG_CO: English
LIST_FONT: Arial Unicode MS 450
TV_SYS: 625/50

4
src/Logic/TarReader.cs
View File

@ -2,7 +2,7 @@
using System.IO;
namespace Nikse.SubtitleEdit.Logic
{
{
public class TarReader
{
@ -29,7 +29,7 @@ namespace Nikse.SubtitleEdit.Logic
stream.Position = 0;
while (pos + 512 < length)
{
stream.Seek(pos, SeekOrigin.Begin);
var th = new TarHeader(stream);
if (th.FileSizeInBytes > 0)