From 2fab6e5d383b101df965e3ed561981c48757d6d8 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 19 Apr 2013 08:41:59 +0000 Subject: [PATCH] ran tabspace git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1798 99eadd0c-20b8-1223-b5c4-2a2b2df33de2 --- src/Forms/FixCommonErrors.cs | 4 ++-- src/Forms/HardSubExtract.cs | 4 ++-- src/Forms/ImportText.cs | 2 +- src/Forms/JoinSubtitles.cs | 4 ++-- src/Forms/Main.cs | 4 ++-- src/Forms/RemoveTextFromHearImpaired.cs | 4 ++-- src/Forms/VobSubOcr.cs | 4 ++-- src/Logic/Language.cs | 1 - src/Logic/Settings.cs | 4 ++-- .../AdvancedSubStationAlpha.cs | 6 +++--- .../SubtitleFormats/FinalCutProTest2Xml.cs | 2 +- src/Logic/SubtitleFormats/MicroDvd.cs | 4 ++-- src/Logic/SubtitleFormats/TimedText.cs | 2 +- .../SubtitleFormats/UnknownSubtitle52.cs | 20 +++++++++---------- src/Logic/TarReader.cs | 4 ++-- 15 files changed, 34 insertions(+), 35 deletions(-) diff --git a/src/Forms/FixCommonErrors.cs b/src/Forms/FixCommonErrors.cs index a234892e9..0c42e79df 100644 --- a/src/Forms/FixCommonErrors.cs +++ b/src/Forms/FixCommonErrors.cs @@ -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) && diff --git a/src/Forms/HardSubExtract.cs b/src/Forms/HardSubExtract.cs index 40e81212f..b9d96ee6d 100644 --- a/src/Forms/HardSubExtract.cs +++ b/src/Forms/HardSubExtract.cs @@ -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(); } - + } } diff --git a/src/Forms/ImportText.cs b/src/Forms/ImportText.cs index c017d0f8d..d2d5da696 100644 --- a/src/Forms/ImportText.cs +++ b/src/Forms/ImportText.cs @@ -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)) diff --git a/src/Forms/JoinSubtitles.cs b/src/Forms/JoinSubtitles.cs index 26cdb0b2b..c8a18e133 100644 --- a/src/Forms/JoinSubtitles.cs +++ b/src/Forms/JoinSubtitles.cs @@ -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++) { diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index bdfdb1a1a..95e21878f 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -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) - { + { } } } diff --git a/src/Forms/RemoveTextFromHearImpaired.cs b/src/Forms/RemoveTextFromHearImpaired.cs index f583e68c6..40b33615d 100644 --- a/src/Forms/RemoveTextFromHearImpaired.cs +++ b/src/Forms/RemoveTextFromHearImpaired.cs @@ -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" || diff --git a/src/Forms/VobSubOcr.cs b/src/Forms/VobSubOcr.cs index 6c11e7d6e..e722612a8 100644 --- a/src/Forms/VobSubOcr.cs +++ b/src/Forms/VobSubOcr.cs @@ -3819,9 +3819,9 @@ namespace Nikse.SubtitleEdit.Forms comboBoxOcrMethod.Items.RemoveAt(2); } - - + + private void InitializeTesseract() { diff --git a/src/Logic/Language.cs b/src/Logic/Language.cs index 0204e503a..c4aa326ec 100644 --- a/src/Logic/Language.cs +++ b/src/Logic/Language.cs @@ -2166,4 +2166,3 @@ Keep changes?", } } } - \ No newline at end of file diff --git a/src/Logic/Settings.cs b/src/Logic/Settings.cs index 18c4d88fd..090ab599f 100644 --- a/src/Logic/Settings.cs +++ b/src/Logic/Settings.cs @@ -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", ""); diff --git a/src/Logic/SubtitleFormats/AdvancedSubStationAlpha.cs b/src/Logic/SubtitleFormats/AdvancedSubStationAlpha.cs index 4c3c85643..a68139748 100644 --- a/src/Logic/SubtitleFormats/AdvancedSubStationAlpha.cs +++ b/src/Logic/SubtitleFormats/AdvancedSubStationAlpha.cs @@ -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(); } diff --git a/src/Logic/SubtitleFormats/FinalCutProTest2Xml.cs b/src/Logic/SubtitleFormats/FinalCutProTest2Xml.cs index 48f847071..33389d531 100644 --- a/src/Logic/SubtitleFormats/FinalCutProTest2Xml.cs +++ b/src/Logic/SubtitleFormats/FinalCutProTest2Xml.cs @@ -88,7 +88,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats " " + ""; - + string xmlTrackStructure = "Text3000FALSE251375148615041615FALSEblackFALSETextTextTextgeneratorvideostrTextA finales de los años sesenta, una joven pareja, Guy y Rosemary, fontnameFontLucida GrandefontsizeSize0100020fontstyleStyle14Plain1Bold2Italic3Bold/Italic41fontalignAlignment13Left1Center2Right32fontcolorFont Color255255255255originOrigin00fonttrackTracking-2002001leadingLeading-1001000aspectAspect0.151autokernAuto KerningTRUEsubpixelUse SubpixelTRUEBasic MotionbasicmotionmotionvideoscaleScale01000100rotationRotation-864086400centerCenter0.004709580.396648centerOffsetAnchor Point00video3506ED18-CB4D-41B8-A760-4D42356E4F321E6E96FD-94F6-4975-BDFE-7B360E909111"; diff --git a/src/Logic/SubtitleFormats/MicroDvd.cs b/src/Logic/SubtitleFormats/MicroDvd.cs index 5a1ef4866..fe2444d9a 100644 --- a/src/Logic/SubtitleFormats/MicroDvd.cs +++ b/src/Logic/SubtitleFormats/MicroDvd.cs @@ -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(); diff --git a/src/Logic/SubtitleFormats/TimedText.cs b/src/Logic/SubtitleFormats/TimedText.cs index 47e7dc9a9..2bd8c9593 100644 --- a/src/Logic/SubtitleFormats/TimedText.cs +++ b/src/Logic/SubtitleFormats/TimedText.cs @@ -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) { diff --git a/src/Logic/SubtitleFormats/UnknownSubtitle52.cs b/src/Logic/SubtitleFormats/UnknownSubtitle52.cs index 5b7d04c5d..29e57e5f0 100644 --- a/src/Logic/SubtitleFormats/UnknownSubtitle52.cs +++ b/src/Logic/SubtitleFormats/UnknownSubtitle52.cs @@ -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 diff --git a/src/Logic/TarReader.cs b/src/Logic/TarReader.cs index 8c01565f9..f89c12903 100644 --- a/src/Logic/TarReader.cs +++ b/src/Logic/TarReader.cs @@ -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)