From f0f6dbbe184d11673b21a13a74f7c213da8872ae Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 23 Feb 2013 03:49:24 +0000 Subject: [PATCH] ran tabspace git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1676 99eadd0c-20b8-1223-b5c4-2a2b2df33de2 --- src/Forms/BatchConvert.cs | 10 +++++----- src/Forms/FixCommonErrors.cs | 2 +- src/Forms/Main.cs | 16 ++++++++-------- src/Forms/VobSubOcr.cs | 2 +- src/Logic/Language.cs | 2 +- src/Logic/LanguageStructure.cs | 6 +++--- src/Logic/Settings.cs | 6 +++--- src/Logic/Utilities.cs | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/Forms/BatchConvert.cs b/src/Forms/BatchConvert.cs index 066f51dbd..26bd83d03 100644 --- a/src/Forms/BatchConvert.cs +++ b/src/Forms/BatchConvert.cs @@ -25,7 +25,7 @@ namespace Nikse.SubtitleEdit.Forms public string Error { get; set; } public string FileName { get; set; } public string ToFormat { get; set; } - public SubtitleFormat SourceFormat { get; set; } + public SubtitleFormat SourceFormat { get; set; } public ThreadDoWorkParameter(bool fixCommonErrors, bool multipleReplace, ListViewItem item, Subtitle subtitle, SubtitleFormat format, Encoding encoding, string language, string fileName, string toFormat, SubtitleFormat sourceFormat) { @@ -46,7 +46,7 @@ namespace Nikse.SubtitleEdit.Forms string _ssaStyle; FormRemoveTextForHearImpaired _removeForHI = new FormRemoveTextForHearImpaired(); ChangeCasing _changeCasing = new ChangeCasing(); - ChangeCasingNames _changeCasingNames = new ChangeCasingNames(); + ChangeCasingNames _changeCasingNames = new ChangeCasingNames(); bool _converting = false; int _count = 0; int _converted = 0; @@ -643,7 +643,7 @@ namespace Nikse.SubtitleEdit.Forms else if (!worker3.IsBusy) worker3.RunWorkerAsync(parameter); } - + } catch { @@ -660,7 +660,7 @@ namespace Nikse.SubtitleEdit.Forms Application.DoEvents(); } catch - { + { } System.Threading.Thread.Sleep(100); } @@ -731,7 +731,7 @@ namespace Nikse.SubtitleEdit.Forms progressBar1.Value++; labelStatus.Text = progressBar1.Value + " / " + progressBar1.Maximum; if (progressBar1.Value == progressBar1.Maximum) - labelStatus.Text = string.Empty; + labelStatus.Text = string.Empty; } } diff --git a/src/Forms/FixCommonErrors.cs b/src/Forms/FixCommonErrors.cs index ad597e312..6c0c207e6 100644 --- a/src/Forms/FixCommonErrors.cs +++ b/src/Forms/FixCommonErrors.cs @@ -191,7 +191,7 @@ namespace Nikse.SubtitleEdit.Forms public string Language { get - { + { var ci = (CultureInfo)comboBoxLanguage.SelectedItem; if (ci == null) return "en"; diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index 1a5ff7b72..8be97cd25 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -5205,13 +5205,13 @@ namespace Nikse.SubtitleEdit.Forms toolStripMenuItemWebVTT.DropDownItems.Add(style, null, WebVTTSetVoice); } if (string.IsNullOrEmpty(_language.Menu.ContextMenu.WebVTTSetNewVoice)) //TODO: In 3.4 remove if - toolStripMenuItemWebVTT.DropDownItems.Add("Set new voice...", null, WebVTTSetNewVoice); + toolStripMenuItemWebVTT.DropDownItems.Add("Set new voice...", null, WebVTTSetNewVoice); else - toolStripMenuItemWebVTT.DropDownItems.Add(_language.Menu.ContextMenu.WebVTTSetNewVoice, null, WebVTTSetNewVoice); + toolStripMenuItemWebVTT.DropDownItems.Add(_language.Menu.ContextMenu.WebVTTSetNewVoice, null, WebVTTSetNewVoice); if (voices.Count > 0) { if (string.IsNullOrEmpty(_language.Menu.ContextMenu.WebVTTRemoveVoices)) //TODO: In 3.4 remove if - toolStripMenuItemWebVTT.DropDownItems.Add("Remove voices", null, WebVTTRemoveVoices); + toolStripMenuItemWebVTT.DropDownItems.Add("Remove voices", null, WebVTTRemoveVoices); else toolStripMenuItemWebVTT.DropDownItems.Add(_language.Menu.ContextMenu.WebVTTRemoveVoices, null, WebVTTRemoveVoices); } @@ -5301,7 +5301,7 @@ namespace Nikse.SubtitleEdit.Forms toolStripSeparatorAdvancedFunctions.Visible = SubtitleListview1.SelectedItems.Count == 1 && noNetWorkSession; } } - toolStripMenuItemPasteSpecial.Visible = Clipboard.ContainsText(); + toolStripMenuItemPasteSpecial.Visible = Clipboard.ContainsText(); } void tsi_Click(object sender, EventArgs e) @@ -7767,7 +7767,7 @@ namespace Nikse.SubtitleEdit.Forms } else if (line.Trim() == "[Events]") { - footerOn = false; + footerOn = false; } else if (line.Trim() == "[Fonts]" || line.Trim() == "[Graphics]") { @@ -7797,8 +7797,8 @@ namespace Nikse.SubtitleEdit.Forms } } } - } - + } + if (!_subtitle.Header.Contains("[Events]")) { _subtitle.Header = _subtitle.Header.Trim() + Environment.NewLine + @@ -12073,7 +12073,7 @@ namespace Nikse.SubtitleEdit.Forms toolStripSeparator20.Visible = subtitleLoaded; toolStripMenuItemImportXSub.Visible = !string.IsNullOrEmpty(_language.OpenXSubFiles) && !string.IsNullOrEmpty(_language.XSubFiles); - + } private void toolStripMenuItemOpenContainingFolder_Click(object sender, EventArgs e) diff --git a/src/Forms/VobSubOcr.cs b/src/Forms/VobSubOcr.cs index 5ce6e3d99..789bc7eb9 100644 --- a/src/Forms/VobSubOcr.cs +++ b/src/Forms/VobSubOcr.cs @@ -4280,7 +4280,7 @@ namespace Nikse.SubtitleEdit.Forms private void clearToolStripMenuItem_Click(object sender, EventArgs e) { listBoxUnknownWords.Items.Clear(); - } + } } } diff --git a/src/Logic/Language.cs b/src/Logic/Language.cs index 9f9e01aa9..a3469ddea 100644 --- a/src/Logic/Language.cs +++ b/src/Logic/Language.cs @@ -52,7 +52,7 @@ namespace Nikse.SubtitleEdit.Logic public LanguageStructure.MatroskaSubtitleChooser MatroskaSubtitleChooser; public LanguageStructure.MergeDoubleLines MergeDoubleLines; public LanguageStructure.MergeShortLines MergedShortLines; - public LanguageStructure.ModifySelection ModifySelection; + public LanguageStructure.ModifySelection ModifySelection; public LanguageStructure.MultipleReplace MultipleReplace; public LanguageStructure.NetworkChat NetworkChat; public LanguageStructure.NetworkJoin NetworkJoin; diff --git a/src/Logic/LanguageStructure.cs b/src/Logic/LanguageStructure.cs index 1355486a9..6e12be572 100644 --- a/src/Logic/LanguageStructure.cs +++ b/src/Logic/LanguageStructure.cs @@ -920,7 +920,7 @@ public string ReverseRightToLeftStartEnd { get; set; } public string ShowOriginalTextInAudioAndVideoPreview { get; set; } public string ModifySelection { get; set; } - public string InverseSelection { get; set; } + public string InverseSelection { get; set; } } public class ToolsMenu { @@ -1084,7 +1084,7 @@ public string SaveSelectedLines { get; set; } public string WebVTTSetNewVoice { get; set; } public string WebVTTRemoveVoices { get; set; } - + } public FileMenu File { get; set; } @@ -1208,7 +1208,7 @@ public string SubtractFromCurrentSelection { get; set; } public string IntersectWithCurrentSelection { get; set; } public string MatchingLinesX { get; set; } - } + } public class MultipleReplace { diff --git a/src/Logic/Settings.cs b/src/Logic/Settings.cs index 3d831ca64..645551465 100644 --- a/src/Logic/Settings.cs +++ b/src/Logic/Settings.cs @@ -107,7 +107,7 @@ namespace Nikse.SubtitleEdit.Logic public bool BatchConvertFixCasing { get; set; } public bool BatchConvertRemoveTextForHI { get; set; } public bool BatchConvertFixCommonErrors { get; set; } - public bool BatchConvertMultipleReplace { get; set; } + public bool BatchConvertMultipleReplace { get; set; } public string BatchConvertLanguage { get; set; } public string ModifySelectionText { get; set; } public string ModifySelectionRule { get; set; } @@ -1251,7 +1251,7 @@ namespace Nikse.SubtitleEdit.Logic settings.Tools.SpellCheckOneLetterWords = Convert.ToBoolean(subNode.InnerText); subNode = node.SelectSingleNode("SpellCheckEnglishAllowInQuoteAsIng"); if (subNode != null) - settings.Tools.SpellCheckEnglishAllowInQuoteAsIng = Convert.ToBoolean(subNode.InnerText); + settings.Tools.SpellCheckEnglishAllowInQuoteAsIng = Convert.ToBoolean(subNode.InnerText); subNode = node.SelectSingleNode("OcrFixUseHardcodedRules"); if (subNode != null) settings.Tools.OcrFixUseHardcodedRules = Convert.ToBoolean(subNode.InnerText); @@ -2153,7 +2153,7 @@ namespace Nikse.SubtitleEdit.Logic textWriter.WriteElementString("UnicodeSymbolsToInsert", settings.Tools.UnicodeSymbolsToInsert); textWriter.WriteElementString("SpellCheckAutoChangeNames", settings.Tools.SpellCheckAutoChangeNames.ToString()); textWriter.WriteElementString("SpellCheckOneLetterWords", settings.Tools.SpellCheckOneLetterWords.ToString()); - textWriter.WriteElementString("SpellCheckEnglishAllowInQuoteAsIng", settings.Tools.SpellCheckEnglishAllowInQuoteAsIng.ToString()); + textWriter.WriteElementString("SpellCheckEnglishAllowInQuoteAsIng", settings.Tools.SpellCheckEnglishAllowInQuoteAsIng.ToString()); textWriter.WriteElementString("OcrFixUseHardcodedRules", settings.Tools.OcrFixUseHardcodedRules.ToString()); textWriter.WriteElementString("Interjections", settings.Tools.Interjections); textWriter.WriteElementString("MicrosoftBingApiId", settings.Tools.MicrosoftBingApiId); diff --git a/src/Logic/Utilities.cs b/src/Logic/Utilities.cs index 8d0c3abc8..e07cc5b45 100644 --- a/src/Logic/Utilities.cs +++ b/src/Logic/Utilities.cs @@ -1259,7 +1259,7 @@ namespace Nikse.SubtitleEdit.Logic if (count > bestCount) return "fi"; // Finnish - count = GetCount(text, "sînt", "aici", "Sînt", "domnule", "pentru", "Vreau") + + count = GetCount(text, "sînt", "aici", "Sînt", "domnule", "pentru", "Vreau") + GetCount(text, "trãiascã", "niciodatã", "înseamnã", "vorbesti", "oamenii", "Asteaptã") + GetCount(text, "fãcut", "Fãrã", "spune", "decât", "pentru", "vreau"); if (count > bestCount)