Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-22 11:12:36 +01:00
Code Issues Projects Releases Wiki Activity

Faster switching from source view to list view in main window

Browse Source
This commit is contained in:
niksedk 2016-01-05 21:18:47 +01:00
parent f28dfb6b81
commit 5e2ef4b0e4
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libse/ContainerFormats/MaterialExchangeFormat/MxfParser.cs
View File

@ -84,7 +84,7 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.MaterialExchangeFormat
var list = new List<string>(s.SplitToLines());
var subtitle = new Subtitle();
return subtitle.ReloadLoadSubtitle(list, null) != null;
return subtitle.ReloadLoadSubtitle(list, null, null) != null;
}
private void ReadHeaderPartitionPack(Stream stream)

8
libse/Subtitle.cs
View File

@ -93,9 +93,15 @@ namespace Nikse.SubtitleEdit.Core
return _paragraphs.FirstOrDefault(p => p.ID == id);
}
public SubtitleFormat ReloadLoadSubtitle(List<string> lines, string fileName)
public SubtitleFormat ReloadLoadSubtitle(List<string> lines, string fileName, SubtitleFormat format)
{
Paragraphs.Clear();
if (format != null && format.IsMine(lines, fileName))
{
format.LoadSubtitle(this, lines, fileName);
_format = format;
return format;
}
foreach (SubtitleFormat subtitleFormat in SubtitleFormat.AllSubtitleFormats)
{
if (subtitleFormat.IsMine(lines, fileName))

16
src/Forms/Main.cs
View File

@ -1778,7 +1778,7 @@ namespace Nikse.SubtitleEdit.Forms
encoding = GetCurrentEncoding();
var list = new List<string>(subtitles[0].SplitToLines());
_subtitle = new Subtitle();
var mxfFormat = _subtitle.ReloadLoadSubtitle(list, null);
var mxfFormat = _subtitle.ReloadLoadSubtitle(list, null, null);
SetCurrentFormat(mxfFormat);
_fileName = Path.GetFileNameWithoutExtension(fileName);
SetTitle();
@ -4566,14 +4566,9 @@ namespace Nikse.SubtitleEdit.Forms
SaveSubtitleListviewIndices();
if (!string.IsNullOrWhiteSpace(textBoxSource.Text))
{
var temp = new Subtitle(_subtitle);
SubtitleFormat format = GetCurrentSubtitleFormat();
var list = new List<string>(textBoxSource.Lines);
if (format != null && format.IsMine(list, null))
format.LoadSubtitle(temp, list, null);
else
format = temp.ReloadLoadSubtitle(new List<string>(textBoxSource.Lines), null);
var list = textBoxSource.Lines.ToList();
format = new Subtitle().ReloadLoadSubtitle(list, null, format);
if (format == null)
{
MessageBox.Show(_language.UnableToParseSourceView);
@ -4581,7 +4576,7 @@ namespace Nikse.SubtitleEdit.Forms
}
_sourceViewChange = false;
MakeHistoryForUndo(_language.BeforeChangesMadeInSourceView);
_subtitle.ReloadLoadSubtitle(new List<string>(textBoxSource.Lines), null);
_subtitle.ReloadLoadSubtitle(list, null, format);
if (format.IsFrameBased)
_subtitle.CalculateTimeCodesFromFrameNumbers(CurrentFrameRate);
int index = 0;
@ -17182,8 +17177,7 @@ namespace Nikse.SubtitleEdit.Forms
if (currentFormat != null && !currentFormat.IsTextBased)
return;
var temp = new Subtitle(_subtitle);
SubtitleFormat format = temp.ReloadLoadSubtitle(new List<string>(textBoxSource.Lines), null);
SubtitleFormat format = new Subtitle().ReloadLoadSubtitle(textBoxSource.Lines.ToList(), null, currentFormat);
if (format == null)
e.Cancel = true;
}