Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-28 06:52:35 +01:00
Code Issues Projects Releases Wiki Activity

ran tabspace

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1676 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
XhmikosR 2013-02-23 03:49:24 +00:00
parent d73057319d
commit f0f6dbbe18
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Forms/BatchConvert.cs
View File

@ -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;
}
}

2
src/Forms/FixCommonErrors.cs
View File

@ -191,7 +191,7 @@ namespace Nikse.SubtitleEdit.Forms
public string Language
{
get
{
{
var ci = (CultureInfo)comboBoxLanguage.SelectedItem;
if (ci == null)
return "en";

16
src/Forms/Main.cs
View File

@ -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)

2
src/Forms/VobSubOcr.cs
View File

@ -4280,7 +4280,7 @@ namespace Nikse.SubtitleEdit.Forms
private void clearToolStripMenuItem_Click(object sender, EventArgs e)
{
listBoxUnknownWords.Items.Clear();
}
}
}
}

2
src/Logic/Language.cs
View File

@ -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;

6
src/Logic/LanguageStructure.cs
View File

@ -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
{

6
src/Logic/Settings.cs
View File

@ -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);

2
src/Logic/Utilities.cs
View File

@ -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)