Ran CodeMaid.

This commit is contained in:
XhmikosR 2016-01-24 12:51:04 +02:00
parent e709c67ec1
commit f13d7c1b81
482 changed files with 739 additions and 742 deletions

View File

@ -467,4 +467,4 @@ namespace Nikse.SubtitleEdit.Core.BluRaySup
}
}
}
}

View File

@ -807,4 +807,4 @@ namespace Nikse.SubtitleEdit.Core.BluRaySup
}
}
}
}

View File

@ -569,4 +569,4 @@ namespace Nikse.SubtitleEdit.Core.BluRaySup
}
}
}
}

View File

@ -87,4 +87,4 @@ namespace Nikse.SubtitleEdit.Core.BluRaySup
public const double FpsTrg = FpsPal;
}
}
}

View File

@ -57,4 +57,4 @@ namespace Nikse.SubtitleEdit.Core.BluRaySup
/// </summary>
public int YOffset { get; set; }
}
}
}

View File

@ -34,4 +34,4 @@ namespace Nikse.SubtitleEdit.Core.BluRaySup
public byte[] ImageBuffer { get; set; }
}
}
}

View File

@ -47,4 +47,4 @@ namespace Nikse.SubtitleEdit.Core.BluRaySup
}
}
}
}

View File

@ -119,4 +119,4 @@ namespace Nikse.SubtitleEdit.Core.BluRaySup
}
}
}
}

View File

@ -17,4 +17,4 @@ namespace Nikse.SubtitleEdit.Core
}
}
}
}

View File

@ -231,4 +231,4 @@ namespace Nikse.SubtitleEdit.Core
}
}
}
}

View File

@ -50,4 +50,4 @@
return string.Format(@"{0} ({1})", _id, _dataSize);
}
}
}
}

View File

@ -1,7 +1,7 @@
using System;
using Nikse.SubtitleEdit.Core.VobSub;
using System;
using System.IO;
using System.Text;
using Nikse.SubtitleEdit.Core.VobSub;
namespace Nikse.SubtitleEdit.Core.ContainerFormats.MaterialExchangeFormat
{
@ -152,4 +152,4 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.MaterialExchangeFormat
}
}
}
}

View File

@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.IO;
namespace Nikse.SubtitleEdit.Core.ContainerFormats.MaterialExchangeFormat
@ -121,4 +120,4 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.MaterialExchangeFormat
}
}
}
}

View File

@ -1,9 +1,9 @@
using System;
using Nikse.SubtitleEdit.Core.ContainerFormats.Ebml;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using Nikse.SubtitleEdit.Core.ContainerFormats.Ebml;
namespace Nikse.SubtitleEdit.Core.ContainerFormats.Matroska
{
@ -645,4 +645,4 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.Matroska
return encoding.GetString(buffer);
}
}
}
}

View File

@ -1,9 +1,9 @@
using System;
using Nikse.SubtitleEdit.Core.SubtitleFormats;
using Nikse.SubtitleEdit.Core.VobSub;
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using Nikse.SubtitleEdit.Core.SubtitleFormats;
using Nikse.SubtitleEdit.Core.VobSub;
namespace Nikse.SubtitleEdit.Core.ContainerFormats.Mp4.Boxes
{
@ -197,4 +197,4 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.Mp4.Boxes
}
}
}
}

View File

@ -1,7 +1,7 @@
using System;
using Nikse.SubtitleEdit.Core.ContainerFormats.Mp4.Boxes;
using System;
using System.Collections.Generic;
using System.IO;
using Nikse.SubtitleEdit.Core.ContainerFormats.Mp4.Boxes;
namespace Nikse.SubtitleEdit.Core.ContainerFormats.Mp4
{

View File

@ -448,4 +448,4 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats
#endregion WAVE processing
}
}
}

View File

@ -479,4 +479,4 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats
}
}
}
}

View File

@ -1,11 +1,11 @@
// Ripped from http://www.codeproject.com/KB/recipes/DetectEncoding.aspx
using Nikse.SubtitleEdit.Core.DetectEncoding.Multilang;
using System;
using System.Collections.Generic;
using System.IO;
using System.Runtime.InteropServices;
using System.Text;
using Nikse.SubtitleEdit.Core.DetectEncoding.Multilang;
namespace Nikse.SubtitleEdit.Core.DetectEncoding
{

View File

@ -255,4 +255,4 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
}
}
}
}

View File

@ -954,4 +954,4 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
}
}
}
}

View File

@ -6,4 +6,4 @@
CaseSensitive,
RegEx
}
}
}

View File

@ -6,4 +6,4 @@
AllLines,
SelectionAndForward,
}
}
}

View File

@ -12,4 +12,4 @@
AddToNamesEtc,
ChangeWholeText
}
}
}

View File

@ -14,4 +14,4 @@
WordsPerMinute,
Style,
}
}
}

View File

@ -121,4 +121,4 @@ namespace Nikse.SubtitleEdit.Core
_pBase = null;
}
}
}
}

View File

@ -101,4 +101,4 @@ namespace Nikse.SubtitleEdit.Core
return base.ReadByte();
}
}
}
}

View File

@ -301,4 +301,4 @@ namespace Nikse.SubtitleEdit.Core
return ((File.GetAttributes(path) & FileAttributes.Directory) == FileAttributes.Directory);
}
}
}
}

View File

@ -18,6 +18,7 @@ namespace Nikse.SubtitleEdit.Core.Forms
private int _successCount;
public string Error { get; set; }
public bool Done
{
get
@ -25,6 +26,7 @@ namespace Nikse.SubtitleEdit.Core.Forms
return _successCount == 1;
}
}
public string LatestVersionNumber { get; set; }
public string LatestChangeLog { get; set; }
@ -183,4 +185,4 @@ namespace Nikse.SubtitleEdit.Core.Forms
}
}
}
}

View File

@ -1,6 +1,6 @@
using System.Collections.Generic;
using Nikse.SubtitleEdit.Core.SubtitleFormats;
using System.Collections.Generic;
using System.Text;
using Nikse.SubtitleEdit.Core.SubtitleFormats;
namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
{
@ -42,6 +42,7 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
}
private string _language = "en";
public string Language
{
get { return _language; }
@ -54,6 +55,7 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
}
private Encoding _encoding = Encoding.UTF8;
public Encoding Encoding
{
get { return _encoding; }
@ -66,4 +68,4 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
}
}
}
}

View File

@ -123,4 +123,4 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
}
}
}
}

View File

@ -1,5 +1,4 @@

namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
{
public class FixHyphensAdd : IFixCommonError
{

View File

@ -1,5 +1,4 @@

namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
{
public class FixHyphensRemove : IFixCommonError
{

View File

@ -40,4 +40,4 @@
callbacks.UpdateFixStatus(noOfLongLines, language.BreakLongLines, string.Format(language.XLineBreaksAdded, noOfLongLines));
}
}
}
}

View File

@ -156,4 +156,4 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
}
}
}
}

View File

@ -163,4 +163,4 @@
}
}
}
}

View File

@ -493,4 +493,4 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
}
}
}
}

View File

@ -1,6 +1,6 @@
using System.Collections.Generic;
using Nikse.SubtitleEdit.Core.SubtitleFormats;
using System.Collections.Generic;
using System.Text;
using Nikse.SubtitleEdit.Core.SubtitleFormats;
namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
{

View File

@ -1,7 +1,4 @@
using System;
using System.Text.RegularExpressions;
namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
{
public class RemoveSpaceBetweenNumbers : IFixCommonError
{
@ -29,4 +26,4 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
}
}
}
}

View File

@ -661,7 +661,6 @@ namespace Nikse.SubtitleEdit.Core.Forms
text = "<i>" + text.Remove(0, removeText.Length).TrimStart(' ');
}
if (oldText != text)
{
// insert spaces before "-"
@ -1256,4 +1255,4 @@ namespace Nikse.SubtitleEdit.Core.Forms
}
}
}
}

View File

@ -45,4 +45,4 @@ namespace Nikse.SubtitleEdit.Core.Forms
}
}
}
}

View File

@ -140,4 +140,4 @@ namespace Nikse.SubtitleEdit.Core.Forms
}
}
}
}

View File

@ -49,4 +49,4 @@ namespace Nikse.SubtitleEdit.Core
return $"{Timestamp.Hour:00}:{Timestamp.Minute:00}:{Timestamp.Second:00}";
}
}
}
}

View File

@ -700,4 +700,4 @@ namespace Nikse.SubtitleEdit.Core
}
}
}
}

View File

@ -615,4 +615,4 @@ namespace Nikse.SubtitleEdit.Core
}
}
}
}

View File

@ -2504,4 +2504,4 @@ Keep changes?",
}
}
}
}

View File

@ -1364,6 +1364,7 @@
//translation helper
public string AutoRepeat { get; set; }
public string AutoRepeatOn { get; set; }
public string AutoRepeatCount { get; set; }
public string AutoContinue { get; set; }
@ -1383,6 +1384,7 @@
// create/adjust
public string InsertNewSubtitleAtVideoPosition { get; set; }
public string Auto { get; set; }
public string PlayFromJustBeforeText { get; set; }
public string Pause { get; set; }
@ -2327,4 +2329,4 @@
}
}
}
}

View File

@ -202,4 +202,4 @@ namespace Nikse.SubtitleEdit.Core
}
}
}
}

View File

@ -85,4 +85,4 @@
}
}
}
}

View File

@ -1,10 +1,10 @@
using System;
using Nikse.SubtitleEdit.Core.VobSub;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Imaging;
using System.IO;
using System.Runtime.InteropServices;
using Nikse.SubtitleEdit.Core.VobSub;
namespace Nikse.SubtitleEdit.Core
{
@ -1098,7 +1098,7 @@ namespace Nikse.SubtitleEdit.Core
var pixels = new byte[_bitmapData.Length];
int offsetDest = 0;
for (int y = Height-1; y >= 0; y--) // takes lines from bottom lines to top (mirrowed horizontally)
for (int y = Height - 1; y >= 0; y--) // takes lines from bottom lines to top (mirrowed horizontally)
{
for (int x = 0; x < Width; x++)
{
@ -1119,4 +1119,4 @@ namespace Nikse.SubtitleEdit.Core
}
}
}
}

View File

@ -53,4 +53,4 @@ namespace Nikse.SubtitleEdit.Core
return string.Compare(Text, o.Text, StringComparison.Ordinal);
}
}
}
}

View File

@ -155,4 +155,4 @@ namespace Nikse.SubtitleEdit.Core
}
}
}
}
}

View File

@ -1,5 +1,5 @@
using System.Security;
using Microsoft.Win32;
using Microsoft.Win32;
using System.Security;
namespace Nikse.SubtitleEdit.Core
{
@ -40,4 +40,4 @@ namespace Nikse.SubtitleEdit.Core
return null;
}
}
}
}

View File

@ -1,8 +1,8 @@
using System;
using Nikse.SubtitleEdit.Core.Interfaces;
using System;
using System.Collections.Generic;
using System.Text;
using System.Text.RegularExpressions;
using Nikse.SubtitleEdit.Core.Interfaces;
namespace Nikse.SubtitleEdit.Core
{
@ -263,4 +263,4 @@ namespace Nikse.SubtitleEdit.Core
}
}
}

View File

@ -732,7 +732,7 @@ namespace Nikse.SubtitleEdit.Core
public int LineOcrMinLineHeight { get; set; }
public int LineOcrMaxLineHeight { get; set; }
public string LastBinaryImageCompareDb { get; set; }
public string LastBinaryImageSpellCheck { get; set; }
public string LastBinaryImageSpellCheck { get; set; }
public VobSubOcrSettings()
{
@ -1849,7 +1849,7 @@ namespace Nikse.SubtitleEdit.Core
settings.SubtitleSettings.SsaMarginRight = Convert.ToInt32(subNode.InnerText);
subNode = node.SelectSingleNode("SsaMarginTopBottom");
if (subNode != null)
settings.SubtitleSettings.SsaMarginTopBottom= Convert.ToInt32(subNode.InnerText);
settings.SubtitleSettings.SsaMarginTopBottom = Convert.ToInt32(subNode.InnerText);
subNode = node.SelectSingleNode("DCinemaFontFile");
if (subNode != null)
settings.SubtitleSettings.DCinemaFontFile = subNode.InnerText;
@ -2242,10 +2242,10 @@ namespace Nikse.SubtitleEdit.Core
settings.VobSubOcr.LineOcrMinLineHeight = Convert.ToInt32(subNode.InnerText);
subNode = node.SelectSingleNode("LineOcrMaxLineHeight");
if (subNode != null)
settings.VobSubOcr.LineOcrMaxLineHeight = Convert.ToInt32(subNode.InnerText);
settings.VobSubOcr.LineOcrMaxLineHeight = Convert.ToInt32(subNode.InnerText);
subNode = node.SelectSingleNode("LastBinaryImageCompareDb");
if (subNode != null)
settings.VobSubOcr.LastBinaryImageCompareDb = subNode.InnerText;
settings.VobSubOcr.LastBinaryImageCompareDb = subNode.InnerText;
subNode = node.SelectSingleNode("LastBinaryImageSpellCheck");
if (subNode != null)
settings.VobSubOcr.LastBinaryImageSpellCheck = subNode.InnerText;
@ -3299,4 +3299,4 @@ namespace Nikse.SubtitleEdit.Core
}
}
}
}

View File

@ -1,7 +1,7 @@
using System;
using Nikse.SubtitleEdit.Core.SubtitleFormats;
using System;
using System.Drawing;
using System.Text;
using Nikse.SubtitleEdit.Core.SubtitleFormats;
namespace Nikse.SubtitleEdit.Core
{
@ -202,4 +202,4 @@ namespace Nikse.SubtitleEdit.Core
return s.Substring(0, s.Length - 1);
}
}
}
}

View File

@ -226,4 +226,4 @@ namespace Nikse.SubtitleEdit.Core
}
}
}
}

View File

@ -283,4 +283,4 @@ namespace Nikse.SubtitleEdit.Core
}
}
}
}

View File

@ -583,4 +583,4 @@ namespace Nikse.SubtitleEdit.Core
}
}
}
}

View File

@ -146,4 +146,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -132,4 +132,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -138,4 +138,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -128,4 +128,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -93,4 +93,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -98,4 +98,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
subtitle.Renumber();
}
}
}
}

View File

@ -1522,4 +1522,4 @@ Format: Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text
}
}
}
}

View File

@ -127,4 +127,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -145,4 +145,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -189,4 +189,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -110,7 +110,6 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
header[2082] = 0x01;
header[2085] = 0x01;
// Microsoft Sans Serif
header[2088] = 0x4d;
header[2089] = 0x69;
@ -372,4 +371,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -127,4 +127,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -329,4 +329,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -265,4 +265,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -156,4 +156,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -172,4 +172,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -152,4 +152,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -243,4 +243,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -108,4 +108,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -717,7 +717,6 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
_languageIdLine2 = LanguageIdRussian;
}
// Chinese
else if (_languageIdLine1 == LanguageIdChineseSimplified)
{
@ -730,7 +729,6 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
_languageIdLine2 = LanguageIdChineseTraditional;
}
int i = 455;
int lastNumber = -1;
while (i < buffer.Length - 20)
@ -991,4 +989,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -354,4 +354,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -148,7 +148,6 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
text = text.Remove(0, 5);
}
// special language codes...
text = text.Replace("ÔA", "Á");
text = text.Replace("ÔE", "É");

View File

@ -94,4 +94,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -127,4 +127,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -178,4 +178,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -732,4 +732,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -777,4 +777,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -785,4 +785,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -85,4 +85,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -97,6 +97,6 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
subtitle.Renumber();
}
}
}
}

View File

@ -145,4 +145,4 @@ LICENSE=
subtitle.Renumber();
}
}
}
}

View File

@ -90,4 +90,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -145,4 +145,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -13,7 +13,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
public class Ebu : SubtitleFormat
{
const string LanguageCodeChinese = "75";
private const string LanguageCodeChinese = "75";
public interface IEbuUiHelper
{
@ -382,7 +382,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
else if (Configuration.Settings.SubtitleSettings.EbuStlTeletextUseDoubleHeight)
{
newline = encoding.GetString(new byte[] {0x8a, 0x8a, 0x0d, 0x0d }); // 0d==double height
newline = encoding.GetString(new byte[] { 0x8a, 0x8a, 0x0d, 0x0d }); // 0d==double height
}
if (header.DisplayStandardCode == "0") // 0=Open subtitling
{
@ -1162,22 +1162,21 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
sb.Append("<u>");
else if (b == underlineOff && header.LanguageCode != LanguageCodeChinese)
sb.Append("</u>");
else if (b == 0xd3 && header.CharacterCodeTableNumber == "00") // Latin
{
sb.Append("©");
sb.Append("©");
}
else if (b == 0xd4 && header.CharacterCodeTableNumber == "00") // Latin
{
sb.Append("™");
sb.Append("™");
}
else if (b == 0xd5 && header.CharacterCodeTableNumber == "00") // Latin
{
sb.Append("♪");
sb.Append("♪");
}
//else if (b == 0xD0) // em-dash
// sb.Append('');
//else if (b == 0xD0) // em-dash
// sb.Append('');
else if (b == textFieldTerminator)
break;
else if ((b >= 0x20 && b <= 0x7F) || b >= 0xA1 || header.LanguageCode == LanguageCodeChinese)
@ -1243,4 +1242,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -114,4 +114,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -51,4 +51,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -159,4 +159,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -72,4 +72,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
LoadF4TextSubtitle(subtitle, text);
}
}
}
}

View File

@ -153,4 +153,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

View File

@ -92,4 +92,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
subtitle.Renumber();
}
}
}
}

View File

@ -162,4 +162,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
subtitle.Renumber();
}
}
}
}

Some files were not shown because too many files have changed in this diff Show More