mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-28 23:12:34 +01:00
Work on #6725
This commit is contained in:
parent
d5ad685f71
commit
c4249fc558
22
src/ui/Forms/GenerateVideoWithSoftSubs.Designer.cs
generated
22
src/ui/Forms/GenerateVideoWithSoftSubs.Designer.cs
generated
@ -42,7 +42,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
this.ButtonMoveSubDown = new System.Windows.Forms.Button();
|
||||
this.ButtonMoveSubUp = new System.Windows.Forms.Button();
|
||||
this.buttonAddSubtitles = new System.Windows.Forms.Button();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.labelSubtitles = new System.Windows.Forms.Label();
|
||||
this.listViewSubtitles = new System.Windows.Forms.ListView();
|
||||
this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
@ -135,7 +135,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
this.groupBoxSettings.Controls.Add(this.ButtonMoveSubDown);
|
||||
this.groupBoxSettings.Controls.Add(this.ButtonMoveSubUp);
|
||||
this.groupBoxSettings.Controls.Add(this.buttonAddSubtitles);
|
||||
this.groupBoxSettings.Controls.Add(this.label1);
|
||||
this.groupBoxSettings.Controls.Add(this.labelSubtitles);
|
||||
this.groupBoxSettings.Controls.Add(this.listViewSubtitles);
|
||||
this.groupBoxSettings.Controls.Add(this.buttonOpenVideoFile);
|
||||
this.groupBoxSettings.Controls.Add(this.textBoxInputFileName);
|
||||
@ -234,14 +234,14 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
this.buttonAddSubtitles.UseVisualStyleBackColor = true;
|
||||
this.buttonAddSubtitles.Click += new System.EventHandler(this.buttonAddSubtitles_Click);
|
||||
//
|
||||
// label1
|
||||
// labelSubtitles
|
||||
//
|
||||
this.label1.AutoSize = true;
|
||||
this.label1.Location = new System.Drawing.Point(19, 82);
|
||||
this.label1.Name = "label1";
|
||||
this.label1.Size = new System.Drawing.Size(47, 13);
|
||||
this.label1.TabIndex = 26;
|
||||
this.label1.Text = "Subtitles";
|
||||
this.labelSubtitles.AutoSize = true;
|
||||
this.labelSubtitles.Location = new System.Drawing.Point(19, 82);
|
||||
this.labelSubtitles.Name = "labelSubtitles";
|
||||
this.labelSubtitles.Size = new System.Drawing.Size(47, 13);
|
||||
this.labelSubtitles.TabIndex = 26;
|
||||
this.labelSubtitles.Text = "Subtitles";
|
||||
//
|
||||
// listViewSubtitles
|
||||
//
|
||||
@ -517,7 +517,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
this.defaultSaveInMatroskamkvToolStripMenuItem,
|
||||
this.defaultSaveInMp4ToolStripMenuItem});
|
||||
this.contextMenuStripForm.Name = "contextMenuStripForm";
|
||||
this.contextMenuStripForm.Size = new System.Drawing.Size(238, 92);
|
||||
this.contextMenuStripForm.Size = new System.Drawing.Size(238, 70);
|
||||
//
|
||||
// closeWindowAfterGenerateToolStripMenuItem
|
||||
//
|
||||
@ -596,7 +596,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
private System.Windows.Forms.ToolStripMenuItem nTSC720x480ToolStripMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem x352ToolStripMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem x272ToolStripMenuItem;
|
||||
private System.Windows.Forms.Label label1;
|
||||
private System.Windows.Forms.Label labelSubtitles;
|
||||
private System.Windows.Forms.ListView listViewSubtitles;
|
||||
private System.Windows.Forms.ColumnHeader columnHeader1;
|
||||
private System.Windows.Forms.ColumnHeader columnHeader2;
|
||||
|
@ -40,7 +40,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
|
||||
Text = LanguageSettings.Current.GenerateVideoWithEmbeddedSubs.Title;
|
||||
labelInputVideoFile.Text = LanguageSettings.Current.GenerateVideoWithEmbeddedSubs.InputVideoFile;
|
||||
|
||||
labelSubtitles.Text = string.Empty;
|
||||
buttonAddSubtitles.Text = LanguageSettings.Current.DvdSubRip.Add;
|
||||
ButtonRemoveSubtitles.Text = LanguageSettings.Current.SubStationAlphaStyles.Remove;
|
||||
buttonClear.Text = LanguageSettings.Current.SubStationAlphaStyles.RemoveAll;
|
||||
@ -147,7 +147,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
var item = new ListViewItem
|
||||
{
|
||||
Tag = sub.Tag,
|
||||
Text = sub.Name,
|
||||
Text = sub.SubtitleFormat != null ? sub.SubtitleFormat.Name : sub.Name,
|
||||
};
|
||||
item.SubItems.Add(GetDisplayLanguage(sub.Language));
|
||||
item.SubItems.Add(sub.IsDefault.ToString(CultureInfo.InvariantCulture));
|
||||
@ -156,6 +156,8 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
listViewSubtitles.Items.Add(item);
|
||||
|
||||
_softSubs.Add(sub);
|
||||
|
||||
labelSubtitles.Text = string.Format(LanguageSettings.Current.GenerateVideoWithEmbeddedSubs.InputVideoFile, listViewSubtitles.Items.Count);
|
||||
}
|
||||
|
||||
private static string GetDisplayLanguage(string language)
|
||||
@ -545,12 +547,15 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
listViewSubtitles.Items[newIndex].Selected = true;
|
||||
}
|
||||
}
|
||||
|
||||
labelSubtitles.Text = string.Format(LanguageSettings.Current.GenerateVideoWithEmbeddedSubs.InputVideoFile, listViewSubtitles.Items.Count);
|
||||
}
|
||||
|
||||
private void buttonClear_Click(object sender, EventArgs e)
|
||||
{
|
||||
listViewSubtitles.Items.Clear();
|
||||
_softSubs.Clear();
|
||||
labelSubtitles.Text = string.Format(LanguageSettings.Current.GenerateVideoWithEmbeddedSubs.InputVideoFile, listViewSubtitles.Items.Count);
|
||||
}
|
||||
|
||||
private void MoveUp(ListView listView)
|
||||
|
@ -21676,6 +21676,11 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
closeVideoToolStripMenuItem.Enabled = true;
|
||||
toolStripMenuItemOpenKeepVideo.Enabled = true;
|
||||
|
||||
if (_videoInfo == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (_videoInfo.VideoCodec != null)
|
||||
{
|
||||
labelVideoInfo.Text = Path.GetFileName(fileName) + " " + _videoInfo.Width + "x" + _videoInfo.Height + " " + _videoInfo.VideoCodec.Trim();
|
||||
|
@ -1115,6 +1115,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
{
|
||||
Title = "Generate video with embedded subtitles",
|
||||
InputVideoFile = "Input video file",
|
||||
SubtitlesX = "Subtitles ({0})",
|
||||
ToggleForced = "Toggle forced",
|
||||
ToggleDefault = "Toggle default",
|
||||
SetLanguage = "Set language...",
|
||||
|
@ -974,6 +974,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
{
|
||||
public string Title { get; set; }
|
||||
public string InputVideoFile { get; set; }
|
||||
public string SubtitlesX { get; set; }
|
||||
public string SetLanguage { get; set; }
|
||||
public string ToggleForced { get; set; }
|
||||
public string ToggleDefault { get; set; }
|
||||
|
Loading…
Reference in New Issue
Block a user