mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Set focus on "Generate button" on window show for generate video+hard-burn
This commit is contained in:
parent
c297aebfb3
commit
2adc9b4493
43
src/ui/Forms/GenerateVideo.Designer.cs
generated
43
src/ui/Forms/GenerateVideo.Designer.cs
generated
@ -32,7 +32,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
this.components = new System.ComponentModel.Container();
|
||||
this.panelColor = new System.Windows.Forms.Panel();
|
||||
this.buttonColor = new System.Windows.Forms.Button();
|
||||
this.buttonOK = new System.Windows.Forms.Button();
|
||||
this.buttonGenerate = new System.Windows.Forms.Button();
|
||||
this.buttonCancel = new System.Windows.Forms.Button();
|
||||
this.progressBar1 = new System.Windows.Forms.ProgressBar();
|
||||
this.labelDuration = new System.Windows.Forms.Label();
|
||||
@ -67,9 +67,9 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
this.nTSC720x480ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.x352ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.x272ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripMenuItemResBrowse = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.buttonVideoChooseStandardRes = new System.Windows.Forms.Button();
|
||||
this.buttonChooseDuration = new System.Windows.Forms.Button();
|
||||
this.toolStripMenuItemResBrowse = new System.Windows.Forms.ToolStripMenuItem();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numericUpDownWidth)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numericUpDownHeight)).BeginInit();
|
||||
this.groupBoxBackground.SuspendLayout();
|
||||
@ -98,15 +98,15 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
//
|
||||
// buttonOK
|
||||
//
|
||||
this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.buttonOK.ImeMode = System.Windows.Forms.ImeMode.NoControl;
|
||||
this.buttonOK.Location = new System.Drawing.Point(549, 217);
|
||||
this.buttonOK.Name = "buttonOK";
|
||||
this.buttonOK.Size = new System.Drawing.Size(121, 23);
|
||||
this.buttonOK.TabIndex = 20;
|
||||
this.buttonOK.Text = "Generate";
|
||||
this.buttonOK.UseVisualStyleBackColor = true;
|
||||
this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
|
||||
this.buttonGenerate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.buttonGenerate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
|
||||
this.buttonGenerate.Location = new System.Drawing.Point(549, 217);
|
||||
this.buttonGenerate.Name = "buttonGenerate";
|
||||
this.buttonGenerate.Size = new System.Drawing.Size(121, 23);
|
||||
this.buttonGenerate.TabIndex = 20;
|
||||
this.buttonGenerate.Text = "Generate";
|
||||
this.buttonGenerate.UseVisualStyleBackColor = true;
|
||||
this.buttonGenerate.Click += new System.EventHandler(this.buttonOK_Click);
|
||||
//
|
||||
// buttonCancel
|
||||
//
|
||||
@ -368,7 +368,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
this.x272ToolStripMenuItem,
|
||||
this.toolStripMenuItemResBrowse});
|
||||
this.contextMenuStripRes.Name = "contextMenuStripRes";
|
||||
this.contextMenuStripRes.Size = new System.Drawing.Size(204, 356);
|
||||
this.contextMenuStripRes.Size = new System.Drawing.Size(204, 334);
|
||||
//
|
||||
// x2160ToolStripMenuItem
|
||||
//
|
||||
@ -468,6 +468,13 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
this.x272ToolStripMenuItem.Text = "640x272";
|
||||
this.x272ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick);
|
||||
//
|
||||
// toolStripMenuItemResBrowse
|
||||
//
|
||||
this.toolStripMenuItemResBrowse.Name = "toolStripMenuItemResBrowse";
|
||||
this.toolStripMenuItemResBrowse.Size = new System.Drawing.Size(203, 22);
|
||||
this.toolStripMenuItemResBrowse.Text = "...";
|
||||
this.toolStripMenuItemResBrowse.Click += new System.EventHandler(this.toolStripMenuItemResBrowse_Click);
|
||||
//
|
||||
// buttonVideoChooseStandardRes
|
||||
//
|
||||
this.buttonVideoChooseStandardRes.Location = new System.Drawing.Point(323, 60);
|
||||
@ -488,13 +495,6 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
this.buttonChooseDuration.UseVisualStyleBackColor = true;
|
||||
this.buttonChooseDuration.Click += new System.EventHandler(this.buttonChooseDuration_Click);
|
||||
//
|
||||
// toolStripMenuItemResBrowse
|
||||
//
|
||||
this.toolStripMenuItemResBrowse.Name = "toolStripMenuItemResBrowse";
|
||||
this.toolStripMenuItemResBrowse.Size = new System.Drawing.Size(203, 22);
|
||||
this.toolStripMenuItemResBrowse.Text = "...";
|
||||
this.toolStripMenuItemResBrowse.Click += new System.EventHandler(this.toolStripMenuItemResBrowse_Click);
|
||||
//
|
||||
// GenerateVideo
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
@ -514,7 +514,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
this.Controls.Add(this.numericUpDownWidth);
|
||||
this.Controls.Add(this.labelDuration);
|
||||
this.Controls.Add(this.progressBar1);
|
||||
this.Controls.Add(this.buttonOK);
|
||||
this.Controls.Add(this.buttonGenerate);
|
||||
this.Controls.Add(this.buttonCancel);
|
||||
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
|
||||
this.MaximizeBox = false;
|
||||
@ -525,6 +525,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
|
||||
this.Text = "GenerateVideo";
|
||||
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.GenerateVideo_FormClosing);
|
||||
this.Shown += new System.EventHandler(this.GenerateVideo_Shown);
|
||||
((System.ComponentModel.ISupportInitialize)(this.numericUpDownWidth)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numericUpDownHeight)).EndInit();
|
||||
this.groupBoxBackground.ResumeLayout(false);
|
||||
@ -539,7 +540,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
#endregion
|
||||
private System.Windows.Forms.Panel panelColor;
|
||||
private System.Windows.Forms.Button buttonColor;
|
||||
private System.Windows.Forms.Button buttonOK;
|
||||
private System.Windows.Forms.Button buttonGenerate;
|
||||
private System.Windows.Forms.Button buttonCancel;
|
||||
private System.Windows.Forms.ProgressBar progressBar1;
|
||||
private System.Windows.Forms.Label labelDuration;
|
||||
|
@ -61,7 +61,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
labelFrameRate.Text = LanguageSettings.Current.General.FrameRate;
|
||||
groupBoxBackground.Text = LanguageSettings.Current.GenerateBlankVideo.Background;
|
||||
buttonColor.Text = LanguageSettings.Current.Settings.ChooseColor;
|
||||
buttonOK.Text = LanguageSettings.Current.Watermark.Generate;
|
||||
buttonGenerate.Text = LanguageSettings.Current.Watermark.Generate;
|
||||
labelResolution.Text = LanguageSettings.Current.ExportPngXml.VideoResolution;
|
||||
labelPleaseWait.Text = LanguageSettings.Current.General.PleaseWait;
|
||||
buttonCancel.Text = LanguageSettings.Current.General.Cancel;
|
||||
@ -198,7 +198,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
|
||||
private void EnableDisableControls(bool enable)
|
||||
{
|
||||
buttonOK.Enabled = enable;
|
||||
buttonGenerate.Enabled = enable;
|
||||
numericUpDownDurationMinutes.Enabled = enable;
|
||||
numericUpDownWidth.Enabled = enable;
|
||||
numericUpDownHeight.Enabled = enable;
|
||||
@ -235,7 +235,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
private void buttonCancel_Click(object sender, EventArgs e)
|
||||
{
|
||||
_abort = true;
|
||||
if (buttonOK.Enabled)
|
||||
if (buttonGenerate.Enabled)
|
||||
{
|
||||
DialogResult = DialogResult.Cancel;
|
||||
}
|
||||
@ -353,5 +353,10 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void GenerateVideo_Shown(object sender, EventArgs e)
|
||||
{
|
||||
buttonGenerate.Show();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
24
src/ui/Forms/GenerateVideoWithHardSubs.Designer.cs
generated
24
src/ui/Forms/GenerateVideoWithHardSubs.Designer.cs
generated
@ -31,7 +31,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
this.progressBar1 = new System.Windows.Forms.ProgressBar();
|
||||
this.buttonOK = new System.Windows.Forms.Button();
|
||||
this.buttonGenerate = new System.Windows.Forms.Button();
|
||||
this.buttonCancel = new System.Windows.Forms.Button();
|
||||
this.labelPleaseWait = new System.Windows.Forms.Label();
|
||||
this.numericUpDownFontSize = new System.Windows.Forms.NumericUpDown();
|
||||
@ -114,15 +114,15 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
//
|
||||
// buttonOK
|
||||
//
|
||||
this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.buttonOK.ImeMode = System.Windows.Forms.ImeMode.NoControl;
|
||||
this.buttonOK.Location = new System.Drawing.Point(646, 570);
|
||||
this.buttonOK.Name = "buttonOK";
|
||||
this.buttonOK.Size = new System.Drawing.Size(121, 23);
|
||||
this.buttonOK.TabIndex = 4;
|
||||
this.buttonOK.Text = "Generate";
|
||||
this.buttonOK.UseVisualStyleBackColor = true;
|
||||
this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
|
||||
this.buttonGenerate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.buttonGenerate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
|
||||
this.buttonGenerate.Location = new System.Drawing.Point(646, 570);
|
||||
this.buttonGenerate.Name = "buttonGenerate";
|
||||
this.buttonGenerate.Size = new System.Drawing.Size(121, 23);
|
||||
this.buttonGenerate.TabIndex = 4;
|
||||
this.buttonGenerate.Text = "Generate";
|
||||
this.buttonGenerate.UseVisualStyleBackColor = true;
|
||||
this.buttonGenerate.Click += new System.EventHandler(this.buttonOK_Click);
|
||||
//
|
||||
// buttonCancel
|
||||
//
|
||||
@ -841,7 +841,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
this.Controls.Add(this.labelProgress);
|
||||
this.Controls.Add(this.labelPleaseWait);
|
||||
this.Controls.Add(this.progressBar1);
|
||||
this.Controls.Add(this.buttonOK);
|
||||
this.Controls.Add(this.buttonGenerate);
|
||||
this.Controls.Add(this.buttonCancel);
|
||||
this.Controls.Add(this.textBoxLog);
|
||||
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
|
||||
@ -874,7 +874,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.ProgressBar progressBar1;
|
||||
private System.Windows.Forms.Button buttonOK;
|
||||
private System.Windows.Forms.Button buttonGenerate;
|
||||
private System.Windows.Forms.Button buttonCancel;
|
||||
private System.Windows.Forms.Label labelPleaseWait;
|
||||
private System.Windows.Forms.NumericUpDown numericUpDownFontSize;
|
||||
|
@ -41,7 +41,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
Text = LanguageSettings.Current.GenerateVideoWithBurnedInSubs.Title;
|
||||
_assaSubtitle = new Subtitle(assaSubtitle);
|
||||
_inputVideoFileName = inputVideoFileName;
|
||||
buttonOK.Text = LanguageSettings.Current.Watermark.Generate;
|
||||
buttonGenerate.Text = LanguageSettings.Current.Watermark.Generate;
|
||||
labelPleaseWait.Text = LanguageSettings.Current.General.PleaseWait;
|
||||
labelResolution.Text = LanguageSettings.Current.SubStationAlphaProperties.Resolution;
|
||||
labelPreviewPleaseWait.Text = LanguageSettings.Current.General.PleaseWait;
|
||||
@ -172,14 +172,14 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
checkBoxRightToLeft.Checked = Configuration.Settings.General.RightToLeftMode && LanguageAutoDetect.CouldBeRightToLeftLanguage(_assaSubtitle);
|
||||
textBoxLog.Visible = false;
|
||||
|
||||
UiUtil.FixLargeFonts(this, buttonOK);
|
||||
UiUtil.FixLargeFonts(this, buttonGenerate);
|
||||
UiUtil.FixFonts(this, 2000);
|
||||
}
|
||||
|
||||
private void buttonCancel_Click(object sender, EventArgs e)
|
||||
{
|
||||
_abort = true;
|
||||
if (buttonOK.Enabled)
|
||||
if (buttonGenerate.Enabled)
|
||||
{
|
||||
DialogResult = DialogResult.Cancel;
|
||||
}
|
||||
@ -215,7 +215,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
private void buttonOK_Click(object sender, EventArgs e)
|
||||
{
|
||||
_log = new StringBuilder();
|
||||
buttonOK.Enabled = false;
|
||||
buttonGenerate.Enabled = false;
|
||||
var oldFontSizeEnabled = numericUpDownFontSize.Enabled;
|
||||
numericUpDownFontSize.Enabled = false;
|
||||
|
||||
@ -223,7 +223,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
{
|
||||
if (saveDialog.ShowDialog(this) != DialogResult.OK)
|
||||
{
|
||||
buttonOK.Enabled = true;
|
||||
buttonGenerate.Enabled = true;
|
||||
numericUpDownFontSize.Enabled = true;
|
||||
return;
|
||||
}
|
||||
@ -240,7 +240,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
catch
|
||||
{
|
||||
MessageBox.Show($"Cannot overwrite video file { VideoFileName} - probably in use!");
|
||||
buttonOK.Enabled = true;
|
||||
buttonGenerate.Enabled = true;
|
||||
numericUpDownFontSize.Enabled = oldFontSizeEnabled;
|
||||
return;
|
||||
}
|
||||
@ -929,7 +929,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
if (!File.Exists(_inputVideoFileName))
|
||||
{
|
||||
MessageBox.Show(string.Format(LanguageSettings.Current.Main.FileNotFound, _inputVideoFileName));
|
||||
buttonOK.Enabled = false;
|
||||
buttonGenerate.Enabled = false;
|
||||
return;
|
||||
}
|
||||
|
||||
@ -937,6 +937,8 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
numericUpDownTargetFileSize.Value = Math.Max(targetFileSizeMb, numericUpDownTargetFileSize.Minimum);
|
||||
_loading = false;
|
||||
UiUtil.FixFonts(groupBoxSettings, 2000);
|
||||
|
||||
buttonGenerate.Focus();
|
||||
}
|
||||
|
||||
private void checkBoxTargetFileSize_CheckedChanged(object sender, EventArgs e)
|
||||
|
Loading…
Reference in New Issue
Block a user