Merge pull request #4450 from ivandrofly/goto-line

goto-line: display error message on both ENTER and LEFT-MOUSE click
This commit is contained in:
Nikolaj Olsson 2020-10-25 20:30:04 +01:00 committed by GitHub
commit 25ae0666ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -44,13 +44,7 @@ namespace Nikse.SubtitleEdit.Forms
{ {
if (e.KeyCode == Keys.Enter) if (e.KeyCode == Keys.Enter)
{ {
if (int.TryParse(textBox1.Text, out _lineNumber)) Validate(textBox1.Text);
{
if (_lineNumber >= _min && _lineNumber <= _max)
{
DialogResult = DialogResult.OK;
}
}
} }
else else
{ {
@ -90,20 +84,24 @@ namespace Nikse.SubtitleEdit.Forms
private void ButtonOkClick(object sender, EventArgs e) private void ButtonOkClick(object sender, EventArgs e)
{ {
if (int.TryParse(textBox1.Text, out _lineNumber)) Validate(textBox1.Text);
{
if (_lineNumber >= _min && _lineNumber <= _max)
{
DialogResult = DialogResult.OK;
return;
}
}
MessageBox.Show(string.Format(Configuration.Settings.Language.GoToLine.XIsNotAValidNumber, textBox1.Text));
} }
private void ButtonCancelClick(object sender, EventArgs e) private void ButtonCancelClick(object sender, EventArgs e)
{ {
DialogResult = DialogResult.Cancel; DialogResult = DialogResult.Cancel;
} }
private void Validate(string inp)
{
if (int.TryParse(inp, out _lineNumber) && _lineNumber >= _min && _lineNumber <= _max)
{
DialogResult = DialogResult.OK;
}
else
{
MessageBox.Show(string.Format(Configuration.Settings.Language.GoToLine.XIsNotAValidNumber, textBox1.Text));
}
}
} }
} }