This commit is contained in:
Nikolaj Olsson 2024-06-23 08:36:46 +02:00
parent e519c6322a
commit d7af38dda0
9 changed files with 398 additions and 376 deletions

View File

@ -4000,6 +4000,12 @@ namespace Nikse.SubtitleEdit.Core.Settings
settings.Tools.GenVideoNonAssaBox = Convert.ToBoolean(subNode.InnerText, CultureInfo.InvariantCulture);
}
subNode = node.SelectSingleNode("GenTransparentVideoNonAssaBox");
if (subNode != null)
{
settings.Tools.GenTransparentVideoNonAssaBox = Convert.ToBoolean(subNode.InnerText, CultureInfo.InvariantCulture);
}
subNode = node.SelectSingleNode("GenVideoNonAssaBoxColor");
if (subNode != null)
{
@ -9169,6 +9175,7 @@ namespace Nikse.SubtitleEdit.Core.Settings
textWriter.WriteElementString("GenVideoTargetFileSize", settings.Tools.GenVideoTargetFileSize.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("GenVideoFontSizePercentOfHeight", settings.Tools.GenVideoFontSizePercentOfHeight.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("GenVideoNonAssaBox", settings.Tools.GenVideoNonAssaBox.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("GenTransparentVideoNonAssaBox", settings.Tools.GenTransparentVideoNonAssaBox.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("GenVideoNonAssaBoxColor", ToHtml(settings.Tools.GenVideoNonAssaBoxColor));
textWriter.WriteElementString("GenVideoNonAssaTextColor", ToHtml(settings.Tools.GenVideoNonAssaTextColor));
textWriter.WriteElementString("GenVideoNonAssaAlignRight", settings.Tools.GenVideoNonAssaAlignRight.ToString(CultureInfo.InvariantCulture));

View File

@ -377,6 +377,7 @@ namespace Nikse.SubtitleEdit.Core.Settings
public bool GenVideoTargetFileSize { get; set; }
public float GenVideoFontSizePercentOfHeight { get; set; }
public bool GenVideoNonAssaBox { get; set; }
public bool GenTransparentVideoNonAssaBox { get; set; }
public Color GenVideoNonAssaBoxColor { get; set; }
public Color GenVideoNonAssaTextColor { get; set; }
public bool GenVideoNonAssaAlignRight { get; set; }

View File

@ -37,12 +37,6 @@
this.addFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.contextMenuStripBatch = new System.Windows.Forms.ContextMenuStrip(this.components);
this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.numericUpDownFontSize = new Nikse.SubtitleEdit.Controls.NikseUpDown();
this.labelFontSize = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.labelPass = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.labelProgress = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.labelPleaseWait = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.textBoxLog = new Nikse.SubtitleEdit.Controls.NikseTextBox();
this.bAspectRatio916180270ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.aAspectRatio916270480ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.bAspectRatio916360540ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -61,11 +55,7 @@
this.k2048x1080ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.uHD3840x2160ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.x2160ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.useSourceResolutionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.contextMenuStripRes = new System.Windows.Forms.ContextMenuStrip(this.components);
this.nikseLabelOutline = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.numericUpDownOutline = new Nikse.SubtitleEdit.Controls.NikseUpDown();
this.checkBoxFontBold = new System.Windows.Forms.CheckBox();
this.panelForeColor = new System.Windows.Forms.Panel();
this.panelOutlineColor = new System.Windows.Forms.Panel();
@ -74,24 +64,32 @@
this.buttonForeColor = new System.Windows.Forms.Button();
this.checkBoxBox = new System.Windows.Forms.CheckBox();
this.checkBoxAlignRight = new System.Windows.Forms.CheckBox();
this.labelInfo = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.checkBoxRightToLeft = new System.Windows.Forms.CheckBox();
this.comboBoxSubtitleFont = new Nikse.SubtitleEdit.Controls.NikseComboBox();
this.labelSubtitleFont = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.groupBoxVideo = new System.Windows.Forms.GroupBox();
this.labelFrameRate = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.comboBoxFrameRate = new Nikse.SubtitleEdit.Controls.NikseComboBox();
this.buttonVideoChooseStandardRes = new System.Windows.Forms.Button();
this.labelResolution = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.numericUpDownWidth = new Nikse.SubtitleEdit.Controls.NikseUpDown();
this.numericUpDownHeight = new Nikse.SubtitleEdit.Controls.NikseUpDown();
this.labelX = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.buttonCancel = new System.Windows.Forms.Button();
this.promptParameterBeforeGenerateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.contextMenuStripGenerate = new System.Windows.Forms.ContextMenuStrip(this.components);
this.progressBar1 = new System.Windows.Forms.ProgressBar();
this.buttonGenerate = new System.Windows.Forms.Button();
this.labelPass = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.labelProgress = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.labelPleaseWait = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.textBoxLog = new Nikse.SubtitleEdit.Controls.NikseTextBox();
this.nikseLabelOutline = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.numericUpDownOutline = new Nikse.SubtitleEdit.Controls.NikseUpDown();
this.labelInfo = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.comboBoxSubtitleFont = new Nikse.SubtitleEdit.Controls.NikseComboBox();
this.labelSubtitleFont = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.labelFrameRate = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.comboBoxFrameRate = new Nikse.SubtitleEdit.Controls.NikseComboBox();
this.labelResolution = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.numericUpDownWidth = new Nikse.SubtitleEdit.Controls.NikseUpDown();
this.numericUpDownHeight = new Nikse.SubtitleEdit.Controls.NikseUpDown();
this.labelX = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.numericUpDownFontSize = new Nikse.SubtitleEdit.Controls.NikseUpDown();
this.labelFontSize = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.contextMenuStripBatch.SuspendLayout();
this.contextMenuStripRes.SuspendLayout();
this.groupBoxSettings.SuspendLayout();
@ -152,92 +150,6 @@
this.clearToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
this.clearToolStripMenuItem.Text = "Clear";
//
// numericUpDownFontSize
//
this.numericUpDownFontSize.BackColor = System.Drawing.SystemColors.Window;
this.numericUpDownFontSize.BackColorDisabled = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
this.numericUpDownFontSize.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(171)))), ((int)(((byte)(173)))), ((int)(((byte)(179)))));
this.numericUpDownFontSize.BorderColorDisabled = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120)))));
this.numericUpDownFontSize.ButtonForeColor = System.Drawing.SystemColors.ControlText;
this.numericUpDownFontSize.ButtonForeColorDown = System.Drawing.Color.Orange;
this.numericUpDownFontSize.ButtonForeColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(120)))), ((int)(((byte)(215)))));
this.numericUpDownFontSize.DecimalPlaces = 0;
this.numericUpDownFontSize.Increment = new decimal(new int[] {
1,
0,
0,
0});
this.numericUpDownFontSize.Location = new System.Drawing.Point(120, 25);
this.numericUpDownFontSize.Maximum = new decimal(new int[] {
1000,
0,
0,
0});
this.numericUpDownFontSize.Minimum = new decimal(new int[] {
3,
0,
0,
0});
this.numericUpDownFontSize.Name = "numericUpDownFontSize";
this.numericUpDownFontSize.Size = new System.Drawing.Size(54, 20);
this.numericUpDownFontSize.TabIndex = 10;
this.numericUpDownFontSize.TabStop = false;
this.numericUpDownFontSize.ThousandsSeparator = false;
this.numericUpDownFontSize.Value = new decimal(new int[] {
50,
0,
0,
0});
//
// labelFontSize
//
this.labelFontSize.AutoSize = true;
this.labelFontSize.Location = new System.Drawing.Point(19, 27);
this.labelFontSize.Name = "labelFontSize";
this.labelFontSize.Size = new System.Drawing.Size(49, 13);
this.labelFontSize.TabIndex = 0;
this.labelFontSize.Text = "Font size";
//
// labelPass
//
this.labelPass.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.labelPass.AutoSize = true;
this.labelPass.Location = new System.Drawing.Point(279, 295);
this.labelPass.Name = "labelPass";
this.labelPass.Size = new System.Drawing.Size(51, 13);
this.labelPass.TabIndex = 149;
this.labelPass.Text = "Pass one";
//
// labelProgress
//
this.labelProgress.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.labelProgress.AutoSize = true;
this.labelProgress.Location = new System.Drawing.Point(12, 325);
this.labelProgress.Name = "labelProgress";
this.labelProgress.Size = new System.Drawing.Size(88, 13);
this.labelProgress.TabIndex = 147;
this.labelProgress.Text = "Remaining time...";
//
// labelPleaseWait
//
this.labelPleaseWait.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.labelPleaseWait.AutoSize = true;
this.labelPleaseWait.Location = new System.Drawing.Point(12, 295);
this.labelPleaseWait.Name = "labelPleaseWait";
this.labelPleaseWait.Size = new System.Drawing.Size(70, 13);
this.labelPleaseWait.TabIndex = 146;
this.labelPleaseWait.Text = "Please wait...";
//
// textBoxLog
//
this.textBoxLog.FocusedColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(120)))), ((int)(((byte)(215)))));
this.textBoxLog.Location = new System.Drawing.Point(32, 7);
this.textBoxLog.Multiline = true;
this.textBoxLog.Name = "textBoxLog";
this.textBoxLog.ReadOnly = true;
this.textBoxLog.Size = new System.Drawing.Size(188, 26);
this.textBoxLog.TabIndex = 148;
//
// bAspectRatio916180270ToolStripMenuItem
//
this.bAspectRatio916180270ToolStripMenuItem.Name = "bAspectRatio916180270ToolStripMenuItem";
@ -362,22 +274,9 @@
this.x2160ToolStripMenuItem.Text = "4K DCI - Aspect Ratio 169 - (4096x2160)";
this.x2160ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(364, 6);
//
// useSourceResolutionToolStripMenuItem
//
this.useSourceResolutionToolStripMenuItem.Name = "useSourceResolutionToolStripMenuItem";
this.useSourceResolutionToolStripMenuItem.Size = new System.Drawing.Size(367, 22);
this.useSourceResolutionToolStripMenuItem.Text = "Use source resolution";
//
// contextMenuStripRes
//
this.contextMenuStripRes.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.useSourceResolutionToolStripMenuItem,
this.toolStripSeparator3,
this.x2160ToolStripMenuItem,
this.uHD3840x2160ToolStripMenuItem,
this.k2048x1080ToolStripMenuItem,
@ -397,7 +296,237 @@
this.aAspectRatio916270480ToolStripMenuItem,
this.bAspectRatio916180270ToolStripMenuItem});
this.contextMenuStripRes.Name = "contextMenuStripRes";
this.contextMenuStripRes.Size = new System.Drawing.Size(368, 412);
this.contextMenuStripRes.Size = new System.Drawing.Size(368, 406);
//
// checkBoxFontBold
//
this.checkBoxFontBold.AutoSize = true;
this.checkBoxFontBold.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.checkBoxFontBold.Location = new System.Drawing.Point(187, 31);
this.checkBoxFontBold.Name = "checkBoxFontBold";
this.checkBoxFontBold.Size = new System.Drawing.Size(51, 17);
this.checkBoxFontBold.TabIndex = 20;
this.checkBoxFontBold.Text = "Bold";
this.checkBoxFontBold.UseVisualStyleBackColor = true;
//
// panelForeColor
//
this.panelForeColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panelForeColor.Location = new System.Drawing.Point(369, 28);
this.panelForeColor.Name = "panelForeColor";
this.panelForeColor.Size = new System.Drawing.Size(21, 21);
this.panelForeColor.TabIndex = 6;
this.panelForeColor.Click += new System.EventHandler(this.panelForeColor_Click);
//
// panelOutlineColor
//
this.panelOutlineColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panelOutlineColor.Location = new System.Drawing.Point(369, 56);
this.panelOutlineColor.Name = "panelOutlineColor";
this.panelOutlineColor.Size = new System.Drawing.Size(21, 20);
this.panelOutlineColor.TabIndex = 4;
this.panelOutlineColor.Click += new System.EventHandler(this.panelOutlineColor_Click);
//
// buttonOutlineColor
//
this.buttonOutlineColor.Location = new System.Drawing.Point(274, 54);
this.buttonOutlineColor.Name = "buttonOutlineColor";
this.buttonOutlineColor.Size = new System.Drawing.Size(89, 23);
this.buttonOutlineColor.TabIndex = 60;
this.buttonOutlineColor.Text = "Color";
this.buttonOutlineColor.UseVisualStyleBackColor = true;
this.buttonOutlineColor.Click += new System.EventHandler(this.buttonOutlineColor_Click);
//
// groupBoxSettings
//
this.groupBoxSettings.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBoxSettings.Controls.Add(this.nikseLabelOutline);
this.groupBoxSettings.Controls.Add(this.numericUpDownOutline);
this.groupBoxSettings.Controls.Add(this.checkBoxFontBold);
this.groupBoxSettings.Controls.Add(this.panelForeColor);
this.groupBoxSettings.Controls.Add(this.buttonForeColor);
this.groupBoxSettings.Controls.Add(this.panelOutlineColor);
this.groupBoxSettings.Controls.Add(this.buttonOutlineColor);
this.groupBoxSettings.Controls.Add(this.checkBoxBox);
this.groupBoxSettings.Controls.Add(this.checkBoxAlignRight);
this.groupBoxSettings.Controls.Add(this.labelInfo);
this.groupBoxSettings.Controls.Add(this.checkBoxRightToLeft);
this.groupBoxSettings.Controls.Add(this.comboBoxSubtitleFont);
this.groupBoxSettings.Controls.Add(this.labelSubtitleFont);
this.groupBoxSettings.Controls.Add(this.groupBoxVideo);
this.groupBoxSettings.Controls.Add(this.numericUpDownFontSize);
this.groupBoxSettings.Controls.Add(this.labelFontSize);
this.groupBoxSettings.Location = new System.Drawing.Point(12, 6);
this.groupBoxSettings.Name = "groupBoxSettings";
this.groupBoxSettings.Size = new System.Drawing.Size(576, 260);
this.groupBoxSettings.TabIndex = 144;
this.groupBoxSettings.TabStop = false;
this.groupBoxSettings.Text = "Settings";
//
// buttonForeColor
//
this.buttonForeColor.Location = new System.Drawing.Point(274, 25);
this.buttonForeColor.Name = "buttonForeColor";
this.buttonForeColor.Size = new System.Drawing.Size(89, 23);
this.buttonForeColor.TabIndex = 30;
this.buttonForeColor.Text = "Color";
this.buttonForeColor.UseVisualStyleBackColor = true;
this.buttonForeColor.Click += new System.EventHandler(this.buttonForeColor_Click);
//
// checkBoxBox
//
this.checkBoxBox.AutoSize = true;
this.checkBoxBox.Location = new System.Drawing.Point(187, 60);
this.checkBoxBox.Name = "checkBoxBox";
this.checkBoxBox.Size = new System.Drawing.Size(44, 17);
this.checkBoxBox.TabIndex = 50;
this.checkBoxBox.Text = "Box";
this.checkBoxBox.UseVisualStyleBackColor = true;
//
// checkBoxAlignRight
//
this.checkBoxAlignRight.AutoSize = true;
this.checkBoxAlignRight.Location = new System.Drawing.Point(218, 114);
this.checkBoxAlignRight.Name = "checkBoxAlignRight";
this.checkBoxAlignRight.Size = new System.Drawing.Size(72, 17);
this.checkBoxAlignRight.TabIndex = 76;
this.checkBoxAlignRight.Text = "Align right";
this.checkBoxAlignRight.UseVisualStyleBackColor = true;
//
// checkBoxRightToLeft
//
this.checkBoxRightToLeft.AutoSize = true;
this.checkBoxRightToLeft.Location = new System.Drawing.Point(120, 114);
this.checkBoxRightToLeft.Name = "checkBoxRightToLeft";
this.checkBoxRightToLeft.Size = new System.Drawing.Size(80, 17);
this.checkBoxRightToLeft.TabIndex = 75;
this.checkBoxRightToLeft.Text = "Right to left";
this.checkBoxRightToLeft.UseVisualStyleBackColor = true;
//
// groupBoxVideo
//
this.groupBoxVideo.Controls.Add(this.labelFrameRate);
this.groupBoxVideo.Controls.Add(this.comboBoxFrameRate);
this.groupBoxVideo.Controls.Add(this.buttonVideoChooseStandardRes);
this.groupBoxVideo.Controls.Add(this.labelResolution);
this.groupBoxVideo.Controls.Add(this.numericUpDownWidth);
this.groupBoxVideo.Controls.Add(this.numericUpDownHeight);
this.groupBoxVideo.Controls.Add(this.labelX);
this.groupBoxVideo.Location = new System.Drawing.Point(6, 141);
this.groupBoxVideo.Name = "groupBoxVideo";
this.groupBoxVideo.Size = new System.Drawing.Size(530, 89);
this.groupBoxVideo.TabIndex = 70;
this.groupBoxVideo.TabStop = false;
this.groupBoxVideo.Text = "Video";
//
// buttonVideoChooseStandardRes
//
this.buttonVideoChooseStandardRes.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.buttonVideoChooseStandardRes.Location = new System.Drawing.Point(257, 17);
this.buttonVideoChooseStandardRes.Name = "buttonVideoChooseStandardRes";
this.buttonVideoChooseStandardRes.Size = new System.Drawing.Size(41, 23);
this.buttonVideoChooseStandardRes.TabIndex = 3;
this.buttonVideoChooseStandardRes.Text = "...";
this.buttonVideoChooseStandardRes.UseVisualStyleBackColor = true;
this.buttonVideoChooseStandardRes.Click += new System.EventHandler(this.buttonVideoChooseStandardRes_Click);
//
// timer1
//
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// buttonCancel
//
this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.buttonCancel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.buttonCancel.Location = new System.Drawing.Point(463, 311);
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(125, 23);
this.buttonCancel.TabIndex = 154;
this.buttonCancel.Text = "C&ancel";
this.buttonCancel.UseVisualStyleBackColor = true;
this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
//
// promptParameterBeforeGenerateToolStripMenuItem
//
this.promptParameterBeforeGenerateToolStripMenuItem.Name = "promptParameterBeforeGenerateToolStripMenuItem";
this.promptParameterBeforeGenerateToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
this.promptParameterBeforeGenerateToolStripMenuItem.Text = "Prompt FFmpeg parameter and generate";
this.promptParameterBeforeGenerateToolStripMenuItem.Click += new System.EventHandler(this.promptParameterBeforeGenerateToolStripMenuItem_Click);
//
// contextMenuStripGenerate
//
this.contextMenuStripGenerate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.promptParameterBeforeGenerateToolStripMenuItem});
this.contextMenuStripGenerate.Name = "contextMenuStripGenerate";
this.contextMenuStripGenerate.Size = new System.Drawing.Size(290, 26);
//
// progressBar1
//
this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.progressBar1.Location = new System.Drawing.Point(12, 311);
this.progressBar1.Name = "progressBar1";
this.progressBar1.Size = new System.Drawing.Size(318, 11);
this.progressBar1.TabIndex = 145;
this.progressBar1.Visible = false;
//
// buttonGenerate
//
this.buttonGenerate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonGenerate.ContextMenuStrip = this.contextMenuStripGenerate;
this.buttonGenerate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.buttonGenerate.Location = new System.Drawing.Point(336, 311);
this.buttonGenerate.Name = "buttonGenerate";
this.buttonGenerate.Size = new System.Drawing.Size(121, 23);
this.buttonGenerate.TabIndex = 153;
this.buttonGenerate.Text = "Generate";
this.buttonGenerate.UseVisualStyleBackColor = true;
this.buttonGenerate.Click += new System.EventHandler(this.buttonGenerate_Click);
//
// labelPass
//
this.labelPass.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.labelPass.AutoSize = true;
this.labelPass.Location = new System.Drawing.Point(279, 295);
this.labelPass.Name = "labelPass";
this.labelPass.Size = new System.Drawing.Size(51, 13);
this.labelPass.TabIndex = 149;
this.labelPass.Text = "Pass one";
//
// labelProgress
//
this.labelProgress.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.labelProgress.AutoSize = true;
this.labelProgress.Location = new System.Drawing.Point(12, 325);
this.labelProgress.Name = "labelProgress";
this.labelProgress.Size = new System.Drawing.Size(88, 13);
this.labelProgress.TabIndex = 147;
this.labelProgress.Text = "Remaining time...";
//
// labelPleaseWait
//
this.labelPleaseWait.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.labelPleaseWait.AutoSize = true;
this.labelPleaseWait.Location = new System.Drawing.Point(12, 295);
this.labelPleaseWait.Name = "labelPleaseWait";
this.labelPleaseWait.Size = new System.Drawing.Size(70, 13);
this.labelPleaseWait.TabIndex = 146;
this.labelPleaseWait.Text = "Please wait...";
//
// textBoxLog
//
this.textBoxLog.FocusedColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(120)))), ((int)(((byte)(215)))));
this.textBoxLog.Location = new System.Drawing.Point(32, 7);
this.textBoxLog.Multiline = true;
this.textBoxLog.Name = "textBoxLog";
this.textBoxLog.ReadOnly = true;
this.textBoxLog.Size = new System.Drawing.Size(188, 26);
this.textBoxLog.TabIndex = 148;
//
// nikseLabelOutline
//
@ -445,99 +574,6 @@
0,
0});
//
// checkBoxFontBold
//
this.checkBoxFontBold.AutoSize = true;
this.checkBoxFontBold.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.checkBoxFontBold.Location = new System.Drawing.Point(187, 31);
this.checkBoxFontBold.Name = "checkBoxFontBold";
this.checkBoxFontBold.Size = new System.Drawing.Size(51, 17);
this.checkBoxFontBold.TabIndex = 20;
this.checkBoxFontBold.Text = "Bold";
this.checkBoxFontBold.UseVisualStyleBackColor = true;
//
// panelForeColor
//
this.panelForeColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panelForeColor.Location = new System.Drawing.Point(369, 28);
this.panelForeColor.Name = "panelForeColor";
this.panelForeColor.Size = new System.Drawing.Size(21, 21);
this.panelForeColor.TabIndex = 6;
//
// panelOutlineColor
//
this.panelOutlineColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panelOutlineColor.Location = new System.Drawing.Point(369, 56);
this.panelOutlineColor.Name = "panelOutlineColor";
this.panelOutlineColor.Size = new System.Drawing.Size(21, 20);
this.panelOutlineColor.TabIndex = 4;
//
// buttonOutlineColor
//
this.buttonOutlineColor.Location = new System.Drawing.Point(274, 54);
this.buttonOutlineColor.Name = "buttonOutlineColor";
this.buttonOutlineColor.Size = new System.Drawing.Size(89, 23);
this.buttonOutlineColor.TabIndex = 60;
this.buttonOutlineColor.Text = "Color";
this.buttonOutlineColor.UseVisualStyleBackColor = true;
//
// groupBoxSettings
//
this.groupBoxSettings.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBoxSettings.Controls.Add(this.nikseLabelOutline);
this.groupBoxSettings.Controls.Add(this.numericUpDownOutline);
this.groupBoxSettings.Controls.Add(this.checkBoxFontBold);
this.groupBoxSettings.Controls.Add(this.panelForeColor);
this.groupBoxSettings.Controls.Add(this.buttonForeColor);
this.groupBoxSettings.Controls.Add(this.panelOutlineColor);
this.groupBoxSettings.Controls.Add(this.buttonOutlineColor);
this.groupBoxSettings.Controls.Add(this.checkBoxBox);
this.groupBoxSettings.Controls.Add(this.checkBoxAlignRight);
this.groupBoxSettings.Controls.Add(this.labelInfo);
this.groupBoxSettings.Controls.Add(this.checkBoxRightToLeft);
this.groupBoxSettings.Controls.Add(this.comboBoxSubtitleFont);
this.groupBoxSettings.Controls.Add(this.labelSubtitleFont);
this.groupBoxSettings.Controls.Add(this.groupBoxVideo);
this.groupBoxSettings.Controls.Add(this.numericUpDownFontSize);
this.groupBoxSettings.Controls.Add(this.labelFontSize);
this.groupBoxSettings.Location = new System.Drawing.Point(12, 6);
this.groupBoxSettings.Name = "groupBoxSettings";
this.groupBoxSettings.Size = new System.Drawing.Size(576, 260);
this.groupBoxSettings.TabIndex = 144;
this.groupBoxSettings.TabStop = false;
this.groupBoxSettings.Text = "Settings";
//
// buttonForeColor
//
this.buttonForeColor.Location = new System.Drawing.Point(274, 25);
this.buttonForeColor.Name = "buttonForeColor";
this.buttonForeColor.Size = new System.Drawing.Size(89, 23);
this.buttonForeColor.TabIndex = 30;
this.buttonForeColor.Text = "Color";
this.buttonForeColor.UseVisualStyleBackColor = true;
//
// checkBoxBox
//
this.checkBoxBox.AutoSize = true;
this.checkBoxBox.Location = new System.Drawing.Point(187, 60);
this.checkBoxBox.Name = "checkBoxBox";
this.checkBoxBox.Size = new System.Drawing.Size(44, 17);
this.checkBoxBox.TabIndex = 50;
this.checkBoxBox.Text = "Box";
this.checkBoxBox.UseVisualStyleBackColor = true;
//
// checkBoxAlignRight
//
this.checkBoxAlignRight.AutoSize = true;
this.checkBoxAlignRight.Location = new System.Drawing.Point(218, 114);
this.checkBoxAlignRight.Name = "checkBoxAlignRight";
this.checkBoxAlignRight.Size = new System.Drawing.Size(72, 17);
this.checkBoxAlignRight.TabIndex = 76;
this.checkBoxAlignRight.Text = "Align right";
this.checkBoxAlignRight.UseVisualStyleBackColor = true;
//
// labelInfo
//
this.labelInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@ -548,16 +584,6 @@
this.labelInfo.TabIndex = 1;
this.labelInfo.Text = "Info";
//
// checkBoxRightToLeft
//
this.checkBoxRightToLeft.AutoSize = true;
this.checkBoxRightToLeft.Location = new System.Drawing.Point(120, 114);
this.checkBoxRightToLeft.Name = "checkBoxRightToLeft";
this.checkBoxRightToLeft.Size = new System.Drawing.Size(80, 17);
this.checkBoxRightToLeft.TabIndex = 75;
this.checkBoxRightToLeft.Text = "Right to left";
this.checkBoxRightToLeft.UseVisualStyleBackColor = true;
//
// comboBoxSubtitleFont
//
this.comboBoxSubtitleFont.BackColor = System.Drawing.SystemColors.Window;
@ -590,22 +616,6 @@
this.labelSubtitleFont.TabIndex = 7;
this.labelSubtitleFont.Text = "Subtitle font";
//
// groupBoxVideo
//
this.groupBoxVideo.Controls.Add(this.labelFrameRate);
this.groupBoxVideo.Controls.Add(this.comboBoxFrameRate);
this.groupBoxVideo.Controls.Add(this.buttonVideoChooseStandardRes);
this.groupBoxVideo.Controls.Add(this.labelResolution);
this.groupBoxVideo.Controls.Add(this.numericUpDownWidth);
this.groupBoxVideo.Controls.Add(this.numericUpDownHeight);
this.groupBoxVideo.Controls.Add(this.labelX);
this.groupBoxVideo.Location = new System.Drawing.Point(6, 141);
this.groupBoxVideo.Name = "groupBoxVideo";
this.groupBoxVideo.Size = new System.Drawing.Size(530, 89);
this.groupBoxVideo.TabIndex = 70;
this.groupBoxVideo.TabStop = false;
this.groupBoxVideo.Text = "Video";
//
// labelFrameRate
//
this.labelFrameRate.AutoSize = true;
@ -639,18 +649,6 @@
this.comboBoxFrameRate.TabStop = false;
this.comboBoxFrameRate.UsePopupWindow = false;
//
// buttonVideoChooseStandardRes
//
this.buttonVideoChooseStandardRes.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.buttonVideoChooseStandardRes.Location = new System.Drawing.Point(257, 17);
this.buttonVideoChooseStandardRes.Name = "buttonVideoChooseStandardRes";
this.buttonVideoChooseStandardRes.Size = new System.Drawing.Size(41, 23);
this.buttonVideoChooseStandardRes.TabIndex = 3;
this.buttonVideoChooseStandardRes.Text = "...";
this.buttonVideoChooseStandardRes.UseVisualStyleBackColor = true;
this.buttonVideoChooseStandardRes.Click += new System.EventHandler(this.buttonVideoChooseStandardRes_Click);
//
// labelResolution
//
this.labelResolution.AutoSize = true;
@ -743,60 +741,51 @@
this.labelX.TabIndex = 31;
this.labelX.Text = "x";
//
// timer1
// numericUpDownFontSize
//
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
this.numericUpDownFontSize.BackColor = System.Drawing.SystemColors.Window;
this.numericUpDownFontSize.BackColorDisabled = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
this.numericUpDownFontSize.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(171)))), ((int)(((byte)(173)))), ((int)(((byte)(179)))));
this.numericUpDownFontSize.BorderColorDisabled = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120)))));
this.numericUpDownFontSize.ButtonForeColor = System.Drawing.SystemColors.ControlText;
this.numericUpDownFontSize.ButtonForeColorDown = System.Drawing.Color.Orange;
this.numericUpDownFontSize.ButtonForeColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(120)))), ((int)(((byte)(215)))));
this.numericUpDownFontSize.DecimalPlaces = 0;
this.numericUpDownFontSize.Increment = new decimal(new int[] {
1,
0,
0,
0});
this.numericUpDownFontSize.Location = new System.Drawing.Point(120, 25);
this.numericUpDownFontSize.Maximum = new decimal(new int[] {
1000,
0,
0,
0});
this.numericUpDownFontSize.Minimum = new decimal(new int[] {
3,
0,
0,
0});
this.numericUpDownFontSize.Name = "numericUpDownFontSize";
this.numericUpDownFontSize.Size = new System.Drawing.Size(54, 20);
this.numericUpDownFontSize.TabIndex = 10;
this.numericUpDownFontSize.TabStop = false;
this.numericUpDownFontSize.ThousandsSeparator = false;
this.numericUpDownFontSize.Value = new decimal(new int[] {
50,
0,
0,
0});
//
// buttonCancel
// labelFontSize
//
this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.buttonCancel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.buttonCancel.Location = new System.Drawing.Point(463, 311);
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(125, 23);
this.buttonCancel.TabIndex = 154;
this.buttonCancel.Text = "C&ancel";
this.buttonCancel.UseVisualStyleBackColor = true;
this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
//
// promptParameterBeforeGenerateToolStripMenuItem
//
this.promptParameterBeforeGenerateToolStripMenuItem.Name = "promptParameterBeforeGenerateToolStripMenuItem";
this.promptParameterBeforeGenerateToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
this.promptParameterBeforeGenerateToolStripMenuItem.Text = "Prompt FFmpeg parameter and generate";
this.promptParameterBeforeGenerateToolStripMenuItem.Click += new System.EventHandler(this.promptParameterBeforeGenerateToolStripMenuItem_Click);
//
// contextMenuStripGenerate
//
this.contextMenuStripGenerate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.promptParameterBeforeGenerateToolStripMenuItem});
this.contextMenuStripGenerate.Name = "contextMenuStripGenerate";
this.contextMenuStripGenerate.Size = new System.Drawing.Size(290, 26);
//
// progressBar1
//
this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.progressBar1.Location = new System.Drawing.Point(12, 311);
this.progressBar1.Name = "progressBar1";
this.progressBar1.Size = new System.Drawing.Size(318, 11);
this.progressBar1.TabIndex = 145;
this.progressBar1.Visible = false;
//
// buttonGenerate
//
this.buttonGenerate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonGenerate.ContextMenuStrip = this.contextMenuStripGenerate;
this.buttonGenerate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.buttonGenerate.Location = new System.Drawing.Point(336, 311);
this.buttonGenerate.Name = "buttonGenerate";
this.buttonGenerate.Size = new System.Drawing.Size(121, 23);
this.buttonGenerate.TabIndex = 153;
this.buttonGenerate.Text = "Generate";
this.buttonGenerate.UseVisualStyleBackColor = true;
this.buttonGenerate.Click += new System.EventHandler(this.buttonGenerate_Click);
this.labelFontSize.AutoSize = true;
this.labelFontSize.Location = new System.Drawing.Point(19, 27);
this.labelFontSize.Name = "labelFontSize";
this.labelFontSize.Size = new System.Drawing.Size(49, 13);
this.labelFontSize.TabIndex = 0;
this.labelFontSize.Text = "Font size";
//
// GenerateTransparentVideoWithSubtitles
//
@ -818,6 +807,7 @@
this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "GenerateTransparentVideoWithSubtitles";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.GenerateTransparentVideoWithSubtitles_FormClosing);
this.contextMenuStripBatch.ResumeLayout(false);
this.contextMenuStripRes.ResumeLayout(false);
this.groupBoxSettings.ResumeLayout(false);
@ -864,8 +854,6 @@
private System.Windows.Forms.ToolStripMenuItem k2048x1080ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem uHD3840x2160ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem x2160ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
private System.Windows.Forms.ToolStripMenuItem useSourceResolutionToolStripMenuItem;
private System.Windows.Forms.ContextMenuStrip contextMenuStripRes;
private Controls.NikseLabel nikseLabelOutline;
private Controls.NikseUpDown numericUpDownOutline;

View File

@ -28,7 +28,6 @@ namespace Nikse.SubtitleEdit.Forms
public string VideoFileName { get; private set; }
public long MillisecondsEncoding { get; private set; }
public GenerateTransparentVideoWithSubtitles(Subtitle subtitle, SubtitleFormat format, VideoInfo videoInfo)
{
UiUtil.PreInitialize(this);
@ -46,7 +45,7 @@ namespace Nikse.SubtitleEdit.Forms
new AdvancedSubStationAlpha().LoadSubtitle(_assaSubtitle, raw.SplitToLines(), null);
}
Text = LanguageSettings.Current.GenerateVideoWithBurnedInSubs.Title;
Text = LanguageSettings.Current.Main.Menu.Video.GenerateTransparentVideoWithSubs.Trim('.');
buttonGenerate.Text = LanguageSettings.Current.Watermark.Generate;
labelPleaseWait.Text = LanguageSettings.Current.General.PleaseWait;
labelResolution.Text = LanguageSettings.Current.SubStationAlphaProperties.Resolution;
@ -74,7 +73,7 @@ namespace Nikse.SubtitleEdit.Forms
groupBoxVideo.Text = LanguageSettings.Current.Main.Menu.Video.Title;
promptParameterBeforeGenerateToolStripMenuItem.Text = LanguageSettings.Current.GenerateBlankVideo.GenerateWithFfmpegParametersPrompt;
checkBoxBox.Checked = Configuration.Settings.Tools.GenVideoNonAssaBox;
checkBoxBox.Checked = Configuration.Settings.Tools.GenTransparentVideoNonAssaBox;
checkBoxAlignRight.Checked = Configuration.Settings.Tools.GenVideoNonAssaAlignRight;
checkBoxRightToLeft.Checked = Configuration.Settings.Tools.GenVideoNonAssaAlignRight;
@ -160,6 +159,9 @@ namespace Nikse.SubtitleEdit.Forms
comboBoxFrameRate.SelectedIndex = 2;
FontEnableOrDisable(_isAssa);
panelOutlineColor.BackColor = Configuration.Settings.Tools.GenVideoNonAssaBoxColor;
panelForeColor.BackColor = Configuration.Settings.Tools.GenVideoNonAssaTextColor;
}
private void FontEnableOrDisable(bool assa)
@ -181,14 +183,7 @@ namespace Nikse.SubtitleEdit.Forms
panelOutlineColor.Enabled = enabled;
panelForeColor.Enabled = enabled;
if (assa)
{
labelInfo.Text = LanguageSettings.Current.GenerateVideoWithBurnedInSubs.InfoAssaOn;
}
else
{
labelInfo.Text = string.Empty;
}
labelInfo.Text = assa ? LanguageSettings.Current.GenerateVideoWithBurnedInSubs.InfoAssaOn : string.Empty;
}
private void FixRightToLeft(Subtitle subtitle)
@ -258,7 +253,6 @@ namespace Nikse.SubtitleEdit.Forms
var oldFontSizeEnabled = numericUpDownFontSize.Enabled;
numericUpDownFontSize.Enabled = false;
Stopwatch stopWatch;
using (var saveDialog = new SaveFileDialog
{
FileName = SuggestNewVideoFileName(),
@ -277,7 +271,7 @@ namespace Nikse.SubtitleEdit.Forms
VideoFileName = saveDialog.FileName;
}
stopWatch = Stopwatch.StartNew();
var stopWatch = Stopwatch.StartNew();
if (!ConvertVideo(oldFontSizeEnabled, _assaSubtitle))
{
buttonGenerate.Enabled = true;
@ -292,19 +286,6 @@ namespace Nikse.SubtitleEdit.Forms
if (!_abort && _log.ToString().Length > 10)
{
var title = "Error occurred during encoding";
if (_log.ToString().Contains("Cannot load nvcuda.dll"))
{
title = "Error: Cannot load nvcuda.dll";
}
else if (_log.ToString().Contains("amfrt64.dll"))
{
title = "Error: Cannot load amfrt64.dll";
}
else if (_log.ToString().Contains("The minimum required Nvidia driver for nvenc is"))
{
title = "Nvidia driver needs updating";
}
MessageBox.Show($"Encoding with ffmpeg failed: {Environment.NewLine}{_log}", title, MessageBoxButtons.OK, MessageBoxIcon.Error);
}
@ -612,5 +593,50 @@ namespace Nikse.SubtitleEdit.Forms
var coordinates = buttonVideoChooseStandardRes.PointToClient(Cursor.Position);
contextMenuStripRes.Show(buttonVideoChooseStandardRes, coordinates);
}
private void buttonForeColor_Click(object sender, EventArgs e)
{
using (var colorChooser = new ColorChooser { Color = panelForeColor.BackColor })
{
if (colorChooser.ShowDialog() == DialogResult.OK)
{
panelForeColor.BackColor = colorChooser.Color;
}
}
}
private void buttonOutlineColor_Click(object sender, EventArgs e)
{
using (var colorChooser = new ColorChooser { Color = panelOutlineColor.BackColor })
{
if (colorChooser.ShowDialog() == DialogResult.OK)
{
panelOutlineColor.BackColor = colorChooser.Color;
}
}
}
private void panelForeColor_Click(object sender, EventArgs e)
{
buttonForeColor_Click(null, null);
}
private void panelOutlineColor_Click(object sender, EventArgs e)
{
buttonOutlineColor_Click(null, null);
}
private void GenerateTransparentVideoWithSubtitles_FormClosing(object sender, FormClosingEventArgs e)
{
Configuration.Settings.Tools.GenVideoFontName = comboBoxSubtitleFont.Text;
Configuration.Settings.Tools.GenVideoFontBold = checkBoxFontBold.Checked;
Configuration.Settings.Tools.GenVideoOutline = (int)numericUpDownOutline.Value;
Configuration.Settings.Tools.GenVideoFontSize = (int)numericUpDownFontSize.Value;
Configuration.Settings.Tools.GenTransparentVideoNonAssaBox = checkBoxBox.Checked;
Configuration.Settings.Tools.GenVideoNonAssaAlignRight = checkBoxAlignRight.Checked;
Configuration.Settings.Tools.GenVideoNonAssaFixRtlUnicode = checkBoxRightToLeft.Checked;
Configuration.Settings.Tools.GenVideoNonAssaBoxColor = panelOutlineColor.BackColor;
Configuration.Settings.Tools.GenVideoNonAssaTextColor = panelForeColor.BackColor;
}
}
}

View File

@ -41,9 +41,9 @@ namespace Nikse.SubtitleEdit.Forms
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main));
Nikse.SubtitleEdit.Core.Common.TimeCode timeCode7 = new Nikse.SubtitleEdit.Core.Common.TimeCode();
Nikse.SubtitleEdit.Core.Common.TimeCode timeCode8 = new Nikse.SubtitleEdit.Core.Common.TimeCode();
Nikse.SubtitleEdit.Core.Common.TimeCode timeCode9 = new Nikse.SubtitleEdit.Core.Common.TimeCode();
Nikse.SubtitleEdit.Core.Common.TimeCode timeCode1 = new Nikse.SubtitleEdit.Core.Common.TimeCode();
Nikse.SubtitleEdit.Core.Common.TimeCode timeCode2 = new Nikse.SubtitleEdit.Core.Common.TimeCode();
Nikse.SubtitleEdit.Core.Common.TimeCode timeCode3 = new Nikse.SubtitleEdit.Core.Common.TimeCode();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.labelStatus = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripSelected = new System.Windows.Forms.ToolStripStatusLabel();
@ -245,6 +245,7 @@ namespace Nikse.SubtitleEdit.Forms
this.generateBlankVideoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.generateVideoWithSoftcodedSubtitlesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.generateVideoWithHardcodedSubtitleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.generaeTransparentVideoWithSubtitleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.audioToTextWhisperTolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.videoaudioToTextToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.textToSpeechAndAddToVideoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -586,7 +587,6 @@ namespace Nikse.SubtitleEdit.Forms
this.timerOriginalTextUndo = new System.Windows.Forms.Timer(this.components);
this.contextMenuStripShowVideoControls = new System.Windows.Forms.ContextMenuStrip(this.components);
this.toolStripMenuItemShowVideoControls = new System.Windows.Forms.ToolStripMenuItem();
this.generaeTransparentVideoWithSubtitleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.statusStrip1.SuspendLayout();
this.toolStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
@ -2420,6 +2420,13 @@ namespace Nikse.SubtitleEdit.Forms
this.generateVideoWithHardcodedSubtitleToolStripMenuItem.Text = "Generate video with hardcoded subtitle...";
this.generateVideoWithHardcodedSubtitleToolStripMenuItem.Click += new System.EventHandler(this.GenerateVideoWithHardcodedSubtitleToolStripMenuItemClick);
//
// generaeTransparentVideoWithSubtitleToolStripMenuItem
//
this.generaeTransparentVideoWithSubtitleToolStripMenuItem.Name = "generaeTransparentVideoWithSubtitleToolStripMenuItem";
this.generaeTransparentVideoWithSubtitleToolStripMenuItem.Size = new System.Drawing.Size(295, 22);
this.generaeTransparentVideoWithSubtitleToolStripMenuItem.Text = "Generae transparent video with subtitle";
this.generaeTransparentVideoWithSubtitleToolStripMenuItem.Click += new System.EventHandler(this.generaeTransparentVideoWithSubtitleToolStripMenuItem_Click);
//
// audioToTextWhisperTolStripMenuItem
//
this.audioToTextWhisperTolStripMenuItem.Name = "audioToTextWhisperTolStripMenuItem";
@ -3916,14 +3923,14 @@ namespace Nikse.SubtitleEdit.Forms
this.timeUpDownVideoPosition.Size = new System.Drawing.Size(113, 23);
this.timeUpDownVideoPosition.TabIndex = 12;
this.timeUpDownVideoPosition.TabStop = false;
timeCode7.Hours = 0;
timeCode7.Milliseconds = 0;
timeCode7.Minutes = 0;
timeCode7.Seconds = 0;
timeCode7.TimeSpan = System.TimeSpan.Parse("00:00:00");
timeCode7.TotalMilliseconds = 0D;
timeCode7.TotalSeconds = 0D;
this.timeUpDownVideoPosition.TimeCode = timeCode7;
timeCode1.Hours = 0;
timeCode1.Milliseconds = 0;
timeCode1.Minutes = 0;
timeCode1.Seconds = 0;
timeCode1.TimeSpan = System.TimeSpan.Parse("00:00:00");
timeCode1.TotalMilliseconds = 0D;
timeCode1.TotalSeconds = 0D;
this.timeUpDownVideoPosition.TimeCode = timeCode1;
this.timeUpDownVideoPosition.UseVideoOffset = false;
//
// buttonGotoSub
@ -4196,14 +4203,14 @@ namespace Nikse.SubtitleEdit.Forms
this.timeUpDownVideoPositionAdjust.Size = new System.Drawing.Size(113, 23);
this.timeUpDownVideoPositionAdjust.TabIndex = 13;
this.timeUpDownVideoPositionAdjust.TabStop = false;
timeCode8.Hours = 0;
timeCode8.Milliseconds = 0;
timeCode8.Minutes = 0;
timeCode8.Seconds = 0;
timeCode8.TimeSpan = System.TimeSpan.Parse("00:00:00");
timeCode8.TotalMilliseconds = 0D;
timeCode8.TotalSeconds = 0D;
this.timeUpDownVideoPositionAdjust.TimeCode = timeCode8;
timeCode2.Hours = 0;
timeCode2.Milliseconds = 0;
timeCode2.Minutes = 0;
timeCode2.Seconds = 0;
timeCode2.TimeSpan = System.TimeSpan.Parse("00:00:00");
timeCode2.TotalMilliseconds = 0D;
timeCode2.TotalSeconds = 0D;
this.timeUpDownVideoPositionAdjust.TimeCode = timeCode2;
this.timeUpDownVideoPositionAdjust.UseVideoOffset = false;
//
// buttonAdjustSetEndTime
@ -5560,14 +5567,14 @@ namespace Nikse.SubtitleEdit.Forms
this.timeUpDownStartTime.Size = new System.Drawing.Size(113, 23);
this.timeUpDownStartTime.TabIndex = 0;
this.timeUpDownStartTime.TabStop = false;
timeCode9.Hours = 0;
timeCode9.Milliseconds = 0;
timeCode9.Minutes = 0;
timeCode9.Seconds = 0;
timeCode9.TimeSpan = System.TimeSpan.Parse("00:00:00");
timeCode9.TotalMilliseconds = 0D;
timeCode9.TotalSeconds = 0D;
this.timeUpDownStartTime.TimeCode = timeCode9;
timeCode3.Hours = 0;
timeCode3.Milliseconds = 0;
timeCode3.Minutes = 0;
timeCode3.Seconds = 0;
timeCode3.TimeSpan = System.TimeSpan.Parse("00:00:00");
timeCode3.TotalMilliseconds = 0D;
timeCode3.TotalSeconds = 0D;
this.timeUpDownStartTime.TimeCode = timeCode3;
this.timeUpDownStartTime.UseVideoOffset = false;
//
// numericUpDownDuration
@ -5921,13 +5928,6 @@ namespace Nikse.SubtitleEdit.Forms
this.toolStripMenuItemShowVideoControls.Text = "Show video controls";
this.toolStripMenuItemShowVideoControls.Click += new System.EventHandler(this.ToolStripMenuItemShowVideoControlsClick);
//
// generaeTransparentVideoWithSubtitleToolStripMenuItem
//
this.generaeTransparentVideoWithSubtitleToolStripMenuItem.Name = "generaeTransparentVideoWithSubtitleToolStripMenuItem";
this.generaeTransparentVideoWithSubtitleToolStripMenuItem.Size = new System.Drawing.Size(295, 22);
this.generaeTransparentVideoWithSubtitleToolStripMenuItem.Text = "Generae transparent video with subtitle";
this.generaeTransparentVideoWithSubtitleToolStripMenuItem.Click += new System.EventHandler(this.generaeTransparentVideoWithSubtitleToolStripMenuItem_Click);
//
// Main
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

View File

@ -1841,6 +1841,7 @@ namespace Nikse.SubtitleEdit.Forms
generateBlankVideoToolStripMenuItem.Text = _language.Menu.Video.GenerateBlankVideo;
generateVideoWithHardcodedSubtitleToolStripMenuItem.Text = _language.Menu.Video.GenerateVideoWithBurnedInSub;
generateVideoWithSoftcodedSubtitlesToolStripMenuItem.Text = _language.Menu.Video.GenerateVideoWithEmbeddedSubs;
generaeTransparentVideoWithSubtitleToolStripMenuItem.Text = _language.Menu.Video.GenerateTransparentVideoWithSubs;
videoaudioToTextToolStripMenuItem.Text = string.Format(_language.Menu.Video.VideoAudioToTextX, "Vosk/Kaldi");
audioToTextWhisperTolStripMenuItem.Text = string.Format(_language.Menu.Video.VideoAudioToTextX, "Whisper");
textToSpeechAndAddToVideoToolStripMenuItem.Text = _language.Menu.Video.TextToSpeechAndAddToVideo;

View File

@ -690,9 +690,6 @@
<metadata name="toolStripWaveControls.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>652, 56</value>
</metadata>
<metadata name="toolStripWaveControls.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>652, 56</value>
</metadata>
<data name="toolStripButtonWaveformZoomOut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@ -775,12 +772,12 @@
<metadata name="imageListBookmarks.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>981, 56</value>
</metadata>
<metadata name="contextMenuStripTextBoxSourceView.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>193, 17</value>
</metadata>
<metadata name="contextMenuStripTextBoxListView.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>668, 17</value>
</metadata>
<metadata name="contextMenuStripTextBoxSourceView.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>193, 17</value>
</metadata>
<metadata name="contextMenuStripEmpty.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 95</value>
</metadata>

View File

@ -2034,6 +2034,7 @@ namespace Nikse.SubtitleEdit.Logic
GenerateBlankVideo = "Generate blank video...",
GenerateVideoWithEmbeddedSubs = "Generate video with added/removed embedded subtitles...",
GenerateVideoWithBurnedInSub = "Generate video with burned-in subtitle...",
GenerateTransparentVideoWithSubs = "Generate transparent video with subtitles...",
VideoAudioToTextX = "Audio to text ({0})...",
ImportChaptersFromVideo = "Import chapters from video",
GenerateImportShotChanges = "Generate/import shot changes...",

View File

@ -1845,6 +1845,7 @@
public string GenerateBlankVideo { get; set; }
public string GenerateVideoWithBurnedInSub { get; set; }
public string GenerateVideoWithEmbeddedSubs { get; set; }
public string GenerateTransparentVideoWithSubs { get; set; }
public string VideoAudioToTextX { get; set; }
public string ImportChaptersFromVideo { get; set; }
public string GenerateImportShotChanges { get; set; }