mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
BinEdit - if via start file, then exit clean + show in task bar
This commit is contained in:
parent
d3d05acbcb
commit
335943ef60
@ -271,7 +271,7 @@ namespace Nikse.SubtitleEdit.Forms.BinaryEdit
|
||||
private int _columnIndexCps = -1;
|
||||
private int _columnIndexWpm = -1;
|
||||
|
||||
public BinEdit(string fileName)
|
||||
public BinEdit(string fileName, bool loading)
|
||||
{
|
||||
UiUtil.PreInitialize(this);
|
||||
InitializeComponent();
|
||||
@ -288,6 +288,11 @@ namespace Nikse.SubtitleEdit.Forms.BinaryEdit
|
||||
panelBackground.BackColor = Configuration.Settings.Tools.BinEditBackgroundColor;
|
||||
labelSyntaxError.Text = string.Empty;
|
||||
|
||||
if (loading)
|
||||
{
|
||||
ShowInTaskbar = true;
|
||||
}
|
||||
|
||||
fileToolStripMenuItem.Text = LanguageSettings.Current.Main.Menu.File.Title;
|
||||
openFileToolStripMenuItem.Text = LanguageSettings.Current.Main.Menu.File.Open;
|
||||
saveFileAsToolStripMenuItem.Text = LanguageSettings.Current.Main.Menu.File.SaveAs;
|
||||
|
@ -482,6 +482,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
if (fileName.Equals("/batchconvertui", StringComparison.OrdinalIgnoreCase) || fileName.Equals("-batchconvertui", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
new BatchConvert(this.Icon).ShowDialog();
|
||||
Opacity = 0;
|
||||
Environment.Exit(0);
|
||||
}
|
||||
|
||||
@ -2880,10 +2881,18 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
{
|
||||
if (Configuration.Settings.Tools.BDOpenIn == "EDIT")
|
||||
{
|
||||
using (var form = new BinaryEdit.BinEdit(fileName))
|
||||
using (var form = new BinaryEdit.BinEdit(fileName, _loading))
|
||||
{
|
||||
form.ShowDialog(this);
|
||||
}
|
||||
|
||||
if (_loading)
|
||||
{
|
||||
_exitWhenLoaded = _loading;
|
||||
_forceClose = _loading;
|
||||
Opacity = 0;
|
||||
SuspendLayout();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -34766,7 +34775,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
"All files|*.*";
|
||||
if (openFileDialog1.ShowDialog(this) == DialogResult.OK)
|
||||
{
|
||||
using (var form = new BinaryEdit.BinEdit(openFileDialog1.FileName))
|
||||
using (var form = new BinaryEdit.BinEdit(openFileDialog1.FileName, false))
|
||||
{
|
||||
form.ShowDialog(this);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user