mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-26 23:12:38 +02:00
ran tabspace
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@2453 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
parent
a8c9343a9c
commit
403209cb8f
@ -28,7 +28,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
buttonNextDifference.Text = Configuration.Settings.Language.CompareSubtitles.NextDifference;
|
||||
checkBoxShowOnlyDifferences.Text = Configuration.Settings.Language.CompareSubtitles.ShowOnlyDifferences;
|
||||
checkBoxIgnoreLineBreaks.Text = Configuration.Settings.Language.CompareSubtitles.IgnoreLineBreaks;
|
||||
checkBoxIgnoreLineBreaks.Visible = !string.IsNullOrEmpty(Configuration.Settings.Language.CompareSubtitles.ShowOnlyDifferences); // TODO: Remove in SE 3.4
|
||||
checkBoxIgnoreLineBreaks.Visible = !string.IsNullOrEmpty(Configuration.Settings.Language.CompareSubtitles.ShowOnlyDifferences); // TODO: Remove in SE 3.4
|
||||
if (!string.IsNullOrEmpty(Configuration.Settings.Language.CompareSubtitles.OnlyLookForDifferencesInText))
|
||||
checkBoxOnlyListDifferencesInText.Text = Configuration.Settings.Language.CompareSubtitles.OnlyLookForDifferencesInText;
|
||||
else
|
||||
@ -345,7 +345,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
string formatString = Configuration.Settings.Language.CompareSubtitles.XNumberOfDifferenceAndPercentChanged;
|
||||
if (GetBreakToLetter() && !string.IsNullOrEmpty(Configuration.Settings.Language.CompareSubtitles.XNumberOfDifferenceAndPercentLettersChanged))
|
||||
formatString = Configuration.Settings.Language.CompareSubtitles.XNumberOfDifferenceAndPercentLettersChanged;
|
||||
|
||||
|
||||
labelStatus.Text = string.Format(formatString, _differences.Count, wordsChanged * 100 / totalWords);
|
||||
}
|
||||
else
|
||||
@ -719,7 +719,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
activeListView = 'L';
|
||||
else if (p.X >= subtitleListView2.Left && p.X <= subtitleListView2.Left + subtitleListView2.Width + 2)
|
||||
activeListView = 'R';
|
||||
else
|
||||
else
|
||||
return;
|
||||
|
||||
if (subtitleListView1.SelectedItems.Count > 0 && activeListView == 'L')
|
||||
|
@ -937,7 +937,7 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
param.Bitmap.Save(fileName, ImageFormat);
|
||||
}
|
||||
imagesSavedCount++;
|
||||
@ -1650,7 +1650,7 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
|
||||
|
||||
var lefts = new List<float>();
|
||||
if (text.ToLower().Contains("<font") || text.ToLower().Contains("<i>"))
|
||||
{
|
||||
{
|
||||
foreach (string line in text.Split(Environment.NewLine.ToCharArray(), StringSplitOptions.RemoveEmptyEntries))
|
||||
{
|
||||
string lineNoHtml = Utilities.RemoveHtmlFontTag(line.Replace("<i>", string.Empty).Replace("</i>", string.Empty));
|
||||
@ -1712,7 +1712,7 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
|
||||
x = parameter.ScreenWidth / 2;
|
||||
}
|
||||
|
||||
bmp = new Bitmap(parameter.ScreenWidth, sizeY);
|
||||
bmp = new Bitmap(parameter.ScreenWidth, sizeY);
|
||||
|
||||
Graphics surface = Graphics.FromImage(bmp);
|
||||
surface.CompositingQuality = CompositingQuality.HighSpeed;
|
||||
@ -2186,7 +2186,7 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
|
||||
if (item.ToString() == Configuration.Settings.Tools.ExportFcpImageType)
|
||||
comboBoxImageFormat.SelectedIndex = i;
|
||||
i++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (_exportType == "VOBSUB")
|
||||
@ -2199,7 +2199,7 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
|
||||
comboBoxSubtitleFontSize.SelectedIndex = i;
|
||||
i++;
|
||||
}
|
||||
checkBoxSimpleRender.Checked = Configuration.Settings.Tools.ExportVobSubSimpleRendering;
|
||||
checkBoxSimpleRender.Checked = Configuration.Settings.Tools.ExportVobSubSimpleRendering;
|
||||
}
|
||||
else if (_exportType == "BLURAYSUP" || _exportType == "DOST" || _exportType == "FCP")
|
||||
{
|
||||
@ -2423,7 +2423,7 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
|
||||
comboBoxBorderWidth.SelectedIndex = Configuration.Settings.Tools.ExportLastBorderWidth;
|
||||
}
|
||||
catch
|
||||
{
|
||||
{
|
||||
}
|
||||
}
|
||||
checkBoxBold.Checked = Configuration.Settings.Tools.ExportLastFontBold;
|
||||
@ -2698,7 +2698,7 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
|
||||
Configuration.Settings.Tools.ExportFcpFontSize = (int)_subtitleFontSize;
|
||||
if (comboBoxImageFormat.SelectedItem != null)
|
||||
Configuration.Settings.Tools.ExportFcpImageType = comboBoxImageFormat.SelectedItem.ToString();
|
||||
|
||||
|
||||
}
|
||||
Configuration.Settings.Tools.ExportFontColor = _subtitleColor;
|
||||
Configuration.Settings.Tools.ExportBorderColor = _borderColor;
|
||||
|
@ -2799,7 +2799,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ((text.Contains(". -") || text.Contains("! -") || text.Contains("? -")) && Utilities.CountTagInText(text, Environment.NewLine) == 1)
|
||||
{
|
||||
string temp = Utilities.AutoBreakLine(text);
|
||||
@ -2845,7 +2845,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
AddFixToListView(p, fixAction, oldText, p.Text);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
if (noOfFixes > 0)
|
||||
LogStatus(_language.FixCommonOcrErrors, string.Format(_language.RemoveSpaceBetweenNumbersFixed, noOfFixes));
|
||||
|
@ -133,7 +133,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
Keys _mainCreateSetEndAddNewAndGoToNew = Keys.None;
|
||||
Keys _mainAdjustSetStartAndOffsetTheRest = Keys.None;
|
||||
Keys _mainAdjustSetEndAndOffsetTheRest = Keys.None;
|
||||
Keys _mainAdjustSetEndAndOffsetTheRestAndGoToNext = Keys.None;
|
||||
Keys _mainAdjustSetEndAndOffsetTheRestAndGoToNext = Keys.None;
|
||||
Keys _mainAdjustSetEndAndGotoNext = Keys.None;
|
||||
Keys _mainAdjustInsertViaEndAutoStartAndGoToNext = Keys.None;
|
||||
Keys _mainAdjustSetStartAutoDurationAndGoToNext = Keys.None;
|
||||
@ -164,7 +164,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
Keys _waveformSearchSilenceForward = Keys.None;
|
||||
Keys _waveformSearchSilenceBack = Keys.None;
|
||||
Keys _waveformAddTextAtHere = Keys.None;
|
||||
Keys _waveformFocusListView = Keys.None;
|
||||
Keys _waveformFocusListView = Keys.None;
|
||||
Keys _mainTranslateCustomSearch1 = Keys.None;
|
||||
Keys _mainTranslateCustomSearch2 = Keys.None;
|
||||
Keys _mainTranslateCustomSearch3 = Keys.None;
|
||||
@ -3035,7 +3035,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
private void SetUndockedWindowsTitle()
|
||||
{
|
||||
@ -3357,7 +3357,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
{
|
||||
openFileDialog1.InitialDirectory = saveFileDialog1.InitialDirectory;
|
||||
_converted = false;
|
||||
_fileName = saveFileDialog1.FileName;
|
||||
_fileName = saveFileDialog1.FileName;
|
||||
_fileDateTime = File.GetLastWriteTime(_fileName);
|
||||
SetTitle();
|
||||
MakeHistoryForUndo(_language.Menu.File.SaveAs);
|
||||
@ -5449,7 +5449,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
SubtitleListview1.AutoSizeAllColumns(this);
|
||||
}
|
||||
else if (SubtitleListview1.IsAlternateTextColumnVisible && _subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count == 0)
|
||||
{
|
||||
{
|
||||
RemoveAlternate(true);
|
||||
}
|
||||
|
||||
@ -5476,7 +5476,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
_subtitle.HistoryItems[_undoIndex].RedoParagraphs = null;
|
||||
_subtitle.HistoryItems[_undoIndex].RedoParagraphsAlternate = null;
|
||||
if (SubtitleListview1.IsAlternateTextColumnVisible && _subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count == 0)
|
||||
{
|
||||
{
|
||||
RemoveAlternate(true);
|
||||
}
|
||||
}
|
||||
@ -10653,7 +10653,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
{
|
||||
SubtitleListview1.Focus();
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
}
|
||||
else if (audioVisualizer.Focused && e.KeyCode == Keys.Delete)
|
||||
{
|
||||
ToolStripMenuItemDeleteClick(null, null);
|
||||
@ -10691,21 +10691,21 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
else if (mediaPlayer.VideoPlayer != null)
|
||||
{
|
||||
if (_mainAdjustSetStartAndOffsetTheRest == e.KeyData)
|
||||
if (_mainAdjustSetStartAndOffsetTheRest == e.KeyData)
|
||||
{
|
||||
ButtonSetStartAndOffsetRestClick(null, null);
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (_mainAdjustSetEndAndOffsetTheRest == e.KeyData)
|
||||
else if (_mainAdjustSetEndAndOffsetTheRest == e.KeyData)
|
||||
{
|
||||
SetEndAndOffsetTheRest(false);
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (_mainAdjustSetEndAndOffsetTheRestAndGoToNext == e.KeyData)
|
||||
else if (_mainAdjustSetEndAndOffsetTheRestAndGoToNext == e.KeyData)
|
||||
{
|
||||
SetEndAndOffsetTheRest(true);
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
}
|
||||
else if (_mainAdjustSetEndAndGotoNext == e.KeyData)
|
||||
{
|
||||
ButtonSetEndAndGoToNextClick(null, null);
|
||||
@ -10893,7 +10893,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
int index = SubtitleListview1.SelectedItems[0].Index;
|
||||
double videoPosition = mediaPlayer.CurrentPosition;
|
||||
if (!mediaPlayer.IsPaused)
|
||||
videoPosition -= Configuration.Settings.General.SetStartEndHumanDelay / 1000.0;
|
||||
videoPosition -= Configuration.Settings.General.SetStartEndHumanDelay / 1000.0;
|
||||
|
||||
var tc = new TimeCode(TimeSpan.FromSeconds(videoPosition));
|
||||
|
||||
@ -11258,7 +11258,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
audioVisualizer.Focus();
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (e.KeyCode == Keys.V && e.Modifiers == Keys.Control) //Ctrl+vPaste from clipboard
|
||||
{
|
||||
if (Clipboard.ContainsText())
|
||||
@ -14500,7 +14500,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
{
|
||||
}
|
||||
|
||||
MessageBox.Show(string.Format(_language.DropFileXNotAccepted, fileName));
|
||||
@ -14950,13 +14950,13 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
|
||||
|
||||
if (string.IsNullOrEmpty(_videoFileName))
|
||||
if (string.IsNullOrEmpty(_videoFileName))
|
||||
buttonOpenVideo_Click(null, null);
|
||||
if (_videoFileName == null)
|
||||
return;
|
||||
|
||||
if (ext != ".wav")
|
||||
{
|
||||
{
|
||||
MessageBox.Show(string.Format(".Wav only!", fileName));
|
||||
return;
|
||||
}
|
||||
@ -18810,7 +18810,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
private void SubtitleListview1_MouseEnter(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
if (!textBoxListViewText.Focused && !textBoxListViewTextAlternate.Focused && Configuration.Settings.VideoControls.WaveFormFocusOnMouseEnter &&
|
||||
if (!textBoxListViewText.Focused && !textBoxListViewTextAlternate.Focused && Configuration.Settings.VideoControls.WaveFormFocusOnMouseEnter &&
|
||||
Configuration.Settings.VideoControls.WaveFormListViewFocusOnMouseEnter && !SubtitleListview1.Focused && SubtitleListview1.CanFocus)
|
||||
SubtitleListview1.Focus();
|
||||
}
|
||||
|
@ -732,7 +732,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
audioVisualizerNode.Nodes.Add(Configuration.Settings.Language.Settings.WaveformPlayFirstSelectedSubtitle + GetShortcutText(Configuration.Settings.Shortcuts.WaveformPlayFirstSelected));
|
||||
audioVisualizerNode.Nodes.Add(Configuration.Settings.Language.Main.VideoControls.InsertNewSubtitleAtVideoPosition + GetShortcutText(Configuration.Settings.Shortcuts.MainWaveformInsertAtCurrentPosition));
|
||||
if (!string.IsNullOrEmpty(Configuration.Settings.Language.Settings.WaveformFocusListView))
|
||||
audioVisualizerNode.Nodes.Add(Configuration.Settings.Language.Settings.WaveformFocusListView + GetShortcutText(Configuration.Settings.Shortcuts.WaveformFocusListView));
|
||||
audioVisualizerNode.Nodes.Add(Configuration.Settings.Language.Settings.WaveformFocusListView + GetShortcutText(Configuration.Settings.Shortcuts.WaveformFocusListView));
|
||||
treeViewShortcuts.Nodes.Add(audioVisualizerNode);
|
||||
|
||||
foreach (TreeNode node in treeViewShortcuts.Nodes)
|
||||
@ -1462,7 +1462,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
|
||||
else if (Configuration.Settings.Language.Settings.WaveformFocusListView != null && text == Configuration.Settings.Language.Settings.WaveformFocusListView.Replace("&", string.Empty))
|
||||
Configuration.Settings.Shortcuts.WaveformFocusListView = GetShortcut(node.Text);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -753,7 +753,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
_currentSpellCheckWord.Index++;
|
||||
_currentWord = _currentWord.Trim("'".ToCharArray());
|
||||
}
|
||||
|
||||
|
||||
if (_postfix != null && _postfix == "'")
|
||||
{
|
||||
_currentSpellCheckWord.Text = _currentWord + _postfix;
|
||||
@ -801,7 +801,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
private string SetWords(string s)
|
||||
{
|
||||
s = ReplaceHtmlTagsWithBlanks(s);
|
||||
s = ReplaceKnownWordsOrNamesWithBlanks(s);
|
||||
s = ReplaceKnownWordsOrNamesWithBlanks(s);
|
||||
_words = Split(s);
|
||||
return s;
|
||||
}
|
||||
@ -850,7 +850,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
start = -1;
|
||||
}
|
||||
}
|
||||
return s;
|
||||
return s;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@ -999,7 +999,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
if (!namesItem.EndsWith("s"))
|
||||
_namesEtcListWithApostrophe.Add(namesItem + "'s");
|
||||
if (!namesItem.EndsWith("s"))
|
||||
_namesEtcListWithApostrophe.Add(namesItem + "’s");
|
||||
_namesEtcListWithApostrophe.Add(namesItem + "’s");
|
||||
else if (!namesItem.EndsWith("'"))
|
||||
_namesEtcListWithApostrophe.Add(namesItem + "'");
|
||||
}
|
||||
|
@ -1274,7 +1274,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
nDvbBmp.MakeBackgroundTransparent((int)numericUpDownAutoTransparentAlphaMax.Value);
|
||||
if (checkBoxTransportStreamGrayscale.Checked)
|
||||
nDvbBmp.GrayScale();
|
||||
dvbBmp.Dispose();
|
||||
dvbBmp.Dispose();
|
||||
return nDvbBmp.GetBitmap();
|
||||
}
|
||||
|
||||
@ -7136,7 +7136,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
newDbvSub.Pes = dvbSub.Pes;
|
||||
newDbvSub.ActiveImageIndex = i;
|
||||
newDbvSub.StartMilliseconds = dvbSub.StartMilliseconds;
|
||||
newDbvSub.EndMilliseconds = dvbSub.EndMilliseconds;
|
||||
newDbvSub.EndMilliseconds = dvbSub.EndMilliseconds;
|
||||
if (newDbvSub.Pes.ObjectDataList[i].TopFieldDataBlockLength > 8)
|
||||
list.Add(newDbvSub);
|
||||
}
|
||||
|
@ -258,7 +258,7 @@
|
||||
public string XNumberOfDifferenceAndPercentChanged { get; set; }
|
||||
public string XNumberOfDifferenceAndPercentLettersChanged { get; set; }
|
||||
public string ShowOnlyDifferences { get; set; }
|
||||
public string IgnoreLineBreaks { get; set; }
|
||||
public string IgnoreLineBreaks { get; set; }
|
||||
public string OnlyLookForDifferencesInText { get; set; }
|
||||
public string CannotCompareWithImageBasedSubtitles { get; set; }
|
||||
}
|
||||
@ -294,7 +294,7 @@
|
||||
public string GapToNext { get; set; }
|
||||
public string BridgeGapsSmallerThanXPart1 { get; set; }
|
||||
public string BridgeGapsSmallerThanXPart2 { get; set; }
|
||||
public string MinMsBetweenLines { get; set; }
|
||||
public string MinMsBetweenLines { get; set; }
|
||||
public string ProlongEndTime { get; set; }
|
||||
public string DivideEven { get; set; }
|
||||
}
|
||||
@ -1703,7 +1703,7 @@
|
||||
public string WaveformAddTextHere { get; set; }
|
||||
public string WaveformPlayNewSelection { get; set; }
|
||||
public string WaveformPlayFirstSelectedSubtitle { get; set; }
|
||||
public string WaveformFocusListView { get; set; }
|
||||
public string WaveformFocusListView { get; set; }
|
||||
public string GoBack1Frame { get; set; }
|
||||
public string GoForward1Frame { get; set; }
|
||||
public string GoBack100Milliseconds { get; set; }
|
||||
|
@ -952,7 +952,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
if (IsColorClose(Color.Black, brightest, 10))
|
||||
return Color.Transparent;
|
||||
return brightest;
|
||||
}
|
||||
}
|
||||
|
||||
private bool IsColorClose(Color color1, Color color2, int maxDiff)
|
||||
{
|
||||
|
@ -1239,7 +1239,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
settings.General.MininumMillisecondsBetweenLines = Convert.ToInt32(subNode.InnerText);
|
||||
subNode = node.SelectSingleNode("SetStartEndHumanDelay");
|
||||
if (subNode != null)
|
||||
settings.General.SetStartEndHumanDelay = Convert.ToInt32(subNode.InnerText);
|
||||
settings.General.SetStartEndHumanDelay = Convert.ToInt32(subNode.InnerText);
|
||||
subNode = node.SelectSingleNode("AutoWrapLineWhileTyping");
|
||||
if (subNode != null)
|
||||
settings.General.AutoWrapLineWhileTyping = Convert.ToBoolean(subNode.InnerText);
|
||||
@ -1542,7 +1542,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
settings.Tools.ExportVobSubSimpleRendering = Convert.ToBoolean(subNode.InnerText);
|
||||
subNode = node.SelectSingleNode("ExportVobSubLanguage");
|
||||
if (subNode != null)
|
||||
settings.Tools.ExportVobSubLanguage = subNode.InnerText;
|
||||
settings.Tools.ExportVobSubLanguage = subNode.InnerText;
|
||||
subNode = node.SelectSingleNode("ExportBluRayFontName");
|
||||
if (subNode != null)
|
||||
settings.Tools.ExportBluRayFontName = subNode.InnerText;
|
||||
@ -1557,7 +1557,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
settings.Tools.ExportFcpFontSize = Convert.ToInt32(subNode.InnerText);
|
||||
subNode = node.SelectSingleNode("ExportFcpImageType");
|
||||
if (subNode != null)
|
||||
settings.Tools.ExportFcpImageType = subNode.InnerText;
|
||||
settings.Tools.ExportFcpImageType = subNode.InnerText;
|
||||
subNode = node.SelectSingleNode("ExportLastFontSize");
|
||||
if (subNode != null)
|
||||
settings.Tools.ExportLastFontSize = Convert.ToInt32(subNode.InnerText);
|
||||
@ -1655,7 +1655,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
settings.SubtitleSettings.SamiFullHtmlEncode = Convert.ToBoolean(subNode.InnerText);
|
||||
subNode = node.SelectSingleNode("SamiFullHtmlEncodeNumeric");
|
||||
if (subNode != null)
|
||||
settings.SubtitleSettings.SamiFullHtmlEncodeNumeric = Convert.ToBoolean(subNode.InnerText);
|
||||
settings.SubtitleSettings.SamiFullHtmlEncodeNumeric = Convert.ToBoolean(subNode.InnerText);
|
||||
subNode = node.SelectSingleNode("TimedText10TimeCodeFormat");
|
||||
if (subNode != null)
|
||||
settings.SubtitleSettings.TimedText10TimeCodeFormat = subNode.InnerText;
|
||||
@ -1860,7 +1860,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
settings.VideoControls.WaveFormFocusOnMouseEnter = Convert.ToBoolean(subNode.InnerText);
|
||||
subNode = node.SelectSingleNode("WaveFormListViewFocusOnMouseEnter");
|
||||
if (subNode != null)
|
||||
settings.VideoControls.WaveFormListViewFocusOnMouseEnter = Convert.ToBoolean(subNode.InnerText);
|
||||
settings.VideoControls.WaveFormListViewFocusOnMouseEnter = Convert.ToBoolean(subNode.InnerText);
|
||||
subNode = node.SelectSingleNode("WaveformBorderHitMs");
|
||||
if (subNode != null)
|
||||
settings.VideoControls.WaveformBorderHitMs = Convert.ToInt32(subNode.InnerText);
|
||||
@ -2204,7 +2204,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
settings.Shortcuts.MainListViewColumnPaste = subNode.InnerText;
|
||||
subNode = node.SelectSingleNode("MainListViewFocusWaveform");
|
||||
if (subNode != null)
|
||||
settings.Shortcuts.MainListViewFocusWaveform = subNode.InnerText;
|
||||
settings.Shortcuts.MainListViewFocusWaveform = subNode.InnerText;
|
||||
subNode = node.SelectSingleNode("MainEditReverseStartAndEndingForRTL");
|
||||
if (subNode != null)
|
||||
settings.Shortcuts.MainEditReverseStartAndEndingForRTL = subNode.InnerText;
|
||||
@ -2330,7 +2330,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
settings.Shortcuts.WaveformAddTextHere = subNode.InnerText;
|
||||
subNode = node.SelectSingleNode("WaveformFocusListView");
|
||||
if (subNode != null)
|
||||
settings.Shortcuts.WaveformFocusListView = subNode.InnerText;
|
||||
settings.Shortcuts.WaveformFocusListView = subNode.InnerText;
|
||||
subNode = node.SelectSingleNode("MainTranslateCustomSearch1");
|
||||
if (subNode != null)
|
||||
settings.Shortcuts.MainTranslateCustomSearch1 = subNode.InnerText;
|
||||
@ -2492,7 +2492,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
textWriter.WriteElementString("SubtitleMinimumDisplayMilliseconds", settings.General.SubtitleMinimumDisplayMilliseconds.ToString());
|
||||
textWriter.WriteElementString("SubtitleMaximumDisplayMilliseconds", settings.General.SubtitleMaximumDisplayMilliseconds.ToString());
|
||||
textWriter.WriteElementString("MininumMillisecondsBetweenLines", settings.General.MininumMillisecondsBetweenLines.ToString());
|
||||
textWriter.WriteElementString("SetStartEndHumanDelay", settings.General.SetStartEndHumanDelay.ToString());
|
||||
textWriter.WriteElementString("SetStartEndHumanDelay", settings.General.SetStartEndHumanDelay.ToString());
|
||||
textWriter.WriteElementString("AutoWrapLineWhileTyping", settings.General.AutoWrapLineWhileTyping.ToString());
|
||||
textWriter.WriteElementString("SubtitleMaximumCharactersPerSeconds", settings.General.SubtitleMaximumCharactersPerSeconds.ToString(System.Globalization.CultureInfo.InvariantCulture));
|
||||
textWriter.WriteElementString("SubtitleOptimalCharactersPerSeconds", settings.General.SubtitleOptimalCharactersPerSeconds.ToString(System.Globalization.CultureInfo.InvariantCulture));
|
||||
@ -2602,17 +2602,17 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
textWriter.WriteElementString("ExportBluRayFontSize", settings.Tools.ExportBluRayFontSize.ToString());
|
||||
textWriter.WriteElementString("ExportFcpFontName", settings.Tools.ExportFcpFontName);
|
||||
textWriter.WriteElementString("ExportFcpFontSize", settings.Tools.ExportFcpFontSize.ToString());
|
||||
textWriter.WriteElementString("ExportFcpImageType", settings.Tools.ExportFcpImageType);
|
||||
textWriter.WriteElementString("ExportFcpImageType", settings.Tools.ExportFcpImageType);
|
||||
textWriter.WriteElementString("ExportLastFontSize", settings.Tools.ExportLastFontSize.ToString());
|
||||
textWriter.WriteElementString("ExportLastLineHeight", settings.Tools.ExportLastLineHeight.ToString());
|
||||
textWriter.WriteElementString("ExportLastBorderWidth", settings.Tools.ExportLastBorderWidth.ToString());
|
||||
textWriter.WriteElementString("ExportLastFontBold", settings.Tools.ExportLastFontBold.ToString());
|
||||
textWriter.WriteElementString("ExportLastFontBold", settings.Tools.ExportLastFontBold.ToString());
|
||||
textWriter.WriteElementString("ExportBluRayVideoResolution", settings.Tools.ExportBluRayVideoResolution);
|
||||
textWriter.WriteElementString("ExportFontColor", settings.Tools.ExportFontColor.ToArgb().ToString());
|
||||
textWriter.WriteElementString("ExportBorderColor", settings.Tools.ExportBorderColor.ToArgb().ToString());
|
||||
textWriter.WriteElementString("ExportBottomMargin", settings.Tools.ExportBottomMargin.ToString());
|
||||
textWriter.WriteElementString("ExportBluRayBottomMargin", settings.Tools.ExportBluRayBottomMargin.ToString());
|
||||
textWriter.WriteElementString("ExportBluRayShadow", settings.Tools.ExportBluRayShadow.ToString());
|
||||
textWriter.WriteElementString("ExportBluRayShadow", settings.Tools.ExportBluRayShadow.ToString());
|
||||
textWriter.WriteElementString("FixCommonErrorsFixOverlapAllowEqualEndStart", settings.Tools.FixCommonErrorsFixOverlapAllowEqualEndStart.ToString());
|
||||
textWriter.WriteElementString("ImportTextSplitting", settings.Tools.ImportTextSplitting);
|
||||
textWriter.WriteElementString("ImportTextMergeShortLines", settings.Tools.ImportTextMergeShortLines.ToString());
|
||||
@ -2712,7 +2712,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
textWriter.WriteElementString("WaveFormDrawGrid", settings.VideoControls.WaveFormDrawGrid.ToString());
|
||||
textWriter.WriteElementString("WaveFormAllowOverlap", settings.VideoControls.WaveFormAllowOverlap.ToString());
|
||||
textWriter.WriteElementString("WaveFormFocusOnMouseEnter", settings.VideoControls.WaveFormFocusOnMouseEnter.ToString());
|
||||
textWriter.WriteElementString("WaveFormListViewFocusOnMouseEnter", settings.VideoControls.WaveFormListViewFocusOnMouseEnter.ToString());
|
||||
textWriter.WriteElementString("WaveFormListViewFocusOnMouseEnter", settings.VideoControls.WaveFormListViewFocusOnMouseEnter.ToString());
|
||||
textWriter.WriteElementString("WaveformBorderHitMs", settings.VideoControls.WaveformBorderHitMs.ToString());
|
||||
textWriter.WriteElementString("WaveFormGridColor", settings.VideoControls.WaveFormGridColor.ToArgb().ToString());
|
||||
textWriter.WriteElementString("WaveFormColor", settings.VideoControls.WaveFormColor.ToArgb().ToString());
|
||||
@ -2837,7 +2837,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
textWriter.WriteElementString("MainListViewColumnDeleteText", settings.Shortcuts.MainListViewColumnDeleteText);
|
||||
textWriter.WriteElementString("MainListViewColumnInsertText", settings.Shortcuts.MainListViewColumnInsertText);
|
||||
textWriter.WriteElementString("MainListViewColumnPaste", settings.Shortcuts.MainListViewColumnPaste);
|
||||
textWriter.WriteElementString("MainListViewFocusWaveform", settings.Shortcuts.MainListViewFocusWaveform);
|
||||
textWriter.WriteElementString("MainListViewFocusWaveform", settings.Shortcuts.MainListViewFocusWaveform);
|
||||
textWriter.WriteElementString("MainEditReverseStartAndEndingForRTL", settings.Shortcuts.MainEditReverseStartAndEndingForRTL);
|
||||
textWriter.WriteElementString("MainTextBoxItalic", settings.Shortcuts.MainTextBoxItalic);
|
||||
textWriter.WriteElementString("MainTextBoxSplitAtCursor", settings.Shortcuts.MainTextBoxSplitAtCursor);
|
||||
@ -2879,7 +2879,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
textWriter.WriteElementString("WaveformSearchSilenceForward", settings.Shortcuts.WaveformSearchSilenceForward);
|
||||
textWriter.WriteElementString("WaveformSearchSilenceBack", settings.Shortcuts.WaveformSearchSilenceBack);
|
||||
textWriter.WriteElementString("WaveformAddTextHere", settings.Shortcuts.WaveformAddTextHere);
|
||||
textWriter.WriteElementString("WaveformFocusListView", settings.Shortcuts.WaveformFocusListView);
|
||||
textWriter.WriteElementString("WaveformFocusListView", settings.Shortcuts.WaveformFocusListView);
|
||||
textWriter.WriteElementString("MainTranslateCustomSearch1", settings.Shortcuts.MainTranslateCustomSearch1);
|
||||
textWriter.WriteElementString("MainTranslateCustomSearch2", settings.Shortcuts.MainTranslateCustomSearch2);
|
||||
textWriter.WriteElementString("MainTranslateCustomSearch3", settings.Shortcuts.MainTranslateCustomSearch3);
|
||||
|
@ -71,7 +71,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
|
||||
</w:body>
|
||||
</w:document>";
|
||||
|
||||
|
||||
|
||||
public override string ToText(Subtitle subtitle, string title)
|
||||
{
|
||||
string xmlStructure = Layout.Replace("'", "\"");
|
||||
@ -163,7 +163,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
|
||||
//</w:tc>
|
||||
var tc2 = xml.CreateElement("w:tc", "http://schemas.openxmlformats.org/wordprocessingml/2006/main");
|
||||
paragraph.AppendChild(tc2);
|
||||
|
||||
|
||||
var n3sub1 = xml.CreateElement("w:tcPr", "http://schemas.openxmlformats.org/wordprocessingml/2006/main");
|
||||
tc2.AppendChild(n3sub1);
|
||||
|
||||
@ -212,7 +212,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
|
||||
n3sub1sub3sub2.AppendChild(text);
|
||||
}
|
||||
tc2.AppendChild(n3sub1sub3);
|
||||
|
||||
|
||||
return paragraph;
|
||||
}
|
||||
|
||||
@ -222,7 +222,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
|
||||
}
|
||||
|
||||
public override void LoadSubtitle(Subtitle subtitle, List<string> lines, string fileName)
|
||||
{
|
||||
{
|
||||
_errorCount = 0;
|
||||
var sb = new StringBuilder();
|
||||
lines.ForEach(line => sb.AppendLine(line));
|
||||
|
@ -506,7 +506,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
|
||||
"136e", //136e=?
|
||||
"94ce", //94ce=?
|
||||
"2c2f", //?
|
||||
|
||||
|
||||
"1130", // ®
|
||||
"1131", // °
|
||||
"1132", // ½
|
||||
@ -523,7 +523,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
|
||||
"113d", // î
|
||||
"113e", // ô
|
||||
"113f", // û
|
||||
|
||||
|
||||
"9130", // ®
|
||||
"9131", // °
|
||||
"9132", // ½
|
||||
|
@ -66,7 +66,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
|
||||
;» Sticky mode: OFF
|
||||
;» Right justification ragged left: OFF
|
||||
;» Parallelogram filter: OFF
|
||||
;» Coding standard: EIA-608" + Environment.NewLine +
|
||||
;» Coding standard: EIA-608" + Environment.NewLine +
|
||||
";» \"Bottom\" row: 15" + @"
|
||||
;» Lines per caption: 15
|
||||
;» Characters per line: 32
|
||||
@ -118,7 +118,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
|
||||
if (timeParts.Length == 1)
|
||||
{
|
||||
try
|
||||
{
|
||||
{
|
||||
TimeCode start = DecodeTimeCode(timeParts[0]);
|
||||
if (p != null && p.EndTime.TotalMilliseconds == 0)
|
||||
p.EndTime.TotalMilliseconds = start.TotalMilliseconds - Configuration.Settings.General.MininumMillisecondsBetweenLines;
|
||||
|
@ -123,7 +123,7 @@ namespace Nikse.SubtitleEdit.Logic.TransportStream
|
||||
|
||||
return DataBuffer[1];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public List<SubtitleSegment> SubtitleSegments { get; set; }
|
||||
public List<ClutDefinitionSegment> ClutDefinitions { get; set; }
|
||||
|
@ -9,9 +9,9 @@ namespace Nikse.SubtitleEdit.Logic.TransportStream
|
||||
public int FramingCode { get; set; }
|
||||
public int MagazineAndPacketAddress { get; set; }
|
||||
public byte[] DataBlock { get; set; }
|
||||
|
||||
|
||||
public EbuPesDataFieldText(byte[] buffer, int index, int length)
|
||||
{
|
||||
{
|
||||
FieldParity = (buffer[index] & Helper.B00100000) > 0;
|
||||
LineOffset = buffer[index] & Helper.B00011111;
|
||||
FramingCode = buffer[index + 1];
|
||||
|
@ -9,7 +9,7 @@
|
||||
public EbuPesDataFieldText FieldText;
|
||||
|
||||
public EbuPesDataField()
|
||||
{
|
||||
{
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -210,7 +210,7 @@ namespace Nikse.SubtitleEdit.Logic.TransportStream
|
||||
}
|
||||
DvbSubtitlesLookup.Add(pid, subList);
|
||||
}
|
||||
}
|
||||
}
|
||||
SubtitlePacketIds.Clear();
|
||||
foreach (int key in DvbSubtitlesLookup.Keys)
|
||||
SubtitlePacketIds.Add(key);
|
||||
|
@ -5,7 +5,7 @@ namespace Nikse.SubtitleEdit.Logic.TransportStream
|
||||
public class TransportStreamSubtitle
|
||||
{
|
||||
private ulong _startMilliseconds;
|
||||
public ulong StartMilliseconds
|
||||
public ulong StartMilliseconds
|
||||
{
|
||||
get
|
||||
{
|
||||
@ -13,7 +13,7 @@ namespace Nikse.SubtitleEdit.Logic.TransportStream
|
||||
return 0;
|
||||
return _startMilliseconds - OffsetMilliseconds;
|
||||
}
|
||||
set
|
||||
set
|
||||
{
|
||||
_startMilliseconds = value + OffsetMilliseconds;
|
||||
}
|
||||
@ -97,7 +97,7 @@ namespace Nikse.SubtitleEdit.Logic.TransportStream
|
||||
else
|
||||
return _bdSup.BitmapObjects.Count;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -1299,7 +1299,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
count = GetCount(text, "không", "tôi", "anh", "đó", "Tôi", "ông");
|
||||
if (count > bestCount)
|
||||
return "vi"; // Vietnamese
|
||||
|
||||
|
||||
count = GetCount(text, "hogy", "lesz", "tudom", "vagy", "mondtam", "még");
|
||||
if (count > bestCount)
|
||||
return "hu"; // Hungarian
|
||||
@ -2824,14 +2824,14 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
for (int i = 0; i < len; i++)
|
||||
{
|
||||
switch (text[i])
|
||||
{
|
||||
{
|
||||
case '<':
|
||||
sb.Append("&#" + (int)text[i] + ";");
|
||||
break;
|
||||
case '>':
|
||||
sb.Append("&#" + (int)text[i] + ";");
|
||||
break;
|
||||
case '"':
|
||||
case '"':
|
||||
sb.Append("&#" + (int)text[i] + ";");
|
||||
break;
|
||||
case '&':
|
||||
@ -3422,7 +3422,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
// plus literals are encoded as %2b normally so this should be safe
|
||||
text = text.Replace("+", " ");
|
||||
return System.Uri.UnescapeDataString(text);
|
||||
}
|
||||
}
|
||||
|
||||
public static void CheckAutoWrap(TextBox textBox, KeyEventArgs e, int numberOfNewLines)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user