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

Merge pull request #1940 from ivandrofly/compare-01

Browse Source 
[Compare] - Minor refact.
This commit is contained in:
Nikolaj Olsson 2016-09-05 05:28:48 +02:00 committed by GitHub
commit 2488c31d3f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Forms/Compare.cs
View File

@ -43,6 +43,7 @@ namespace Nikse.SubtitleEdit.Forms
UiUtil.FixLargeFonts(this, buttonOK);
subtitleListView1.UseSyntaxColoring = false;
subtitleListView2.UseSyntaxColoring = false;
openFileDialog1.Filter = Utilities.GetOpenDialogFilter();
}
public void Initialize(Subtitle subtitle1, string subtitleFileName1, string title)
@ -65,8 +66,6 @@ namespace Nikse.SubtitleEdit.Forms
{
}
}
openFileDialog1.Filter = Utilities.GetOpenDialogFilter();
subtitleListView1.SelectIndexAndEnsureVisible(0);
_language1 = LanguageAutoDetect.AutoDetectGoogleLanguage(_subtitle1);
}
@ -86,7 +85,6 @@ namespace Nikse.SubtitleEdit.Forms
if (!string.IsNullOrEmpty(subtitleFileName1) && File.Exists(subtitleFileName1))
openFileDialog1.InitialDirectory = Path.GetDirectoryName(subtitleFileName1);
openFileDialog1.Filter = Utilities.GetOpenDialogFilter();
subtitleListView1.SelectIndexAndEnsureVisible(0);
subtitleListView2.SelectIndexAndEnsureVisible(0);
}
@ -857,8 +855,14 @@ namespace Nikse.SubtitleEdit.Forms
string.Empty, MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
string filePath = files[0];
if (FileUtil.IsDirectory(filePath))
{
MessageBox.Show(Configuration.Settings.Language.Main.ErrorDirectoryDropNotAllowed,
string.Empty, MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
var listExt = new List<string>();
foreach (var s in Utilities.GetOpenDialogFilter().Split(new[] { '*' }, StringSplitOptions.RemoveEmptyEntries))
{