Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-22 11:12:36 +01:00
Code Issues Projects Releases Wiki Activity

Minor ui fixes

Browse Source
This commit is contained in:
Nikolaj Olsson 2024-04-22 15:52:10 +02:00
parent b9261d902f
commit 40d40a4037
3 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/ui/Forms/GenerateVideoWithHardSubs.Designer.cs generated
View File

@ -134,6 +134,7 @@ namespace Nikse.SubtitleEdit.Forms
this.labelProgress = new Nikse.SubtitleEdit.Controls.NikseLabel(); this.labelProgress = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.labelPleaseWait = new Nikse.SubtitleEdit.Controls.NikseLabel(); this.labelPleaseWait = new Nikse.SubtitleEdit.Controls.NikseLabel();
this.textBoxLog = new Nikse.SubtitleEdit.Controls.NikseTextBox(); this.textBoxLog = new Nikse.SubtitleEdit.Controls.NikseTextBox();
this.toolStripMenuItemYouTubeShort = new System.Windows.Forms.ToolStripMenuItem();
this.contextMenuStripGenerate.SuspendLayout(); this.contextMenuStripGenerate.SuspendLayout();
this.groupBoxSettings.SuspendLayout(); this.groupBoxSettings.SuspendLayout();
this.groupBoxCut.SuspendLayout(); this.groupBoxCut.SuspendLayout();
@ -1443,6 +1444,7 @@ namespace Nikse.SubtitleEdit.Forms
this.k2048x1080ToolStripMenuItem, this.k2048x1080ToolStripMenuItem,
this.dCI2KScope2048x858ToolStripMenuItem, this.dCI2KScope2048x858ToolStripMenuItem,
this.dCI2KFlat1998x1080ToolStripMenuItem, this.dCI2KFlat1998x1080ToolStripMenuItem,
this.toolStripMenuItemYouTubeShort,
this.p1920x1080ToolStripMenuItem, this.p1920x1080ToolStripMenuItem,
this.x1080ToolStripMenuItem, this.x1080ToolStripMenuItem,
this.p1280x720ToolStripMenuItem, this.p1280x720ToolStripMenuItem,
@ -1453,111 +1455,111 @@ namespace Nikse.SubtitleEdit.Forms
this.x352ToolStripMenuItem, this.x352ToolStripMenuItem,
this.x272ToolStripMenuItem}); this.x272ToolStripMenuItem});
this.contextMenuStripRes.Name = "contextMenuStripRes"; this.contextMenuStripRes.Name = "contextMenuStripRes";
this.contextMenuStripRes.Size = new System.Drawing.Size(204, 334); this.contextMenuStripRes.Size = new System.Drawing.Size(221, 378);
this.contextMenuStripRes.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStripRes_Opening); this.contextMenuStripRes.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStripRes_Opening);
// //
// useSourceResolutionToolStripMenuItem // useSourceResolutionToolStripMenuItem
// //
this.useSourceResolutionToolStripMenuItem.Name = "useSourceResolutionToolStripMenuItem"; this.useSourceResolutionToolStripMenuItem.Name = "useSourceResolutionToolStripMenuItem";
this.useSourceResolutionToolStripMenuItem.Size = new System.Drawing.Size(203, 22); this.useSourceResolutionToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.useSourceResolutionToolStripMenuItem.Text = "Use source resoluton"; this.useSourceResolutionToolStripMenuItem.Text = "Use source resoluton";
this.useSourceResolutionToolStripMenuItem.Click += new System.EventHandler(this.useSourceResolutionToolStripMenuItem_Click); this.useSourceResolutionToolStripMenuItem.Click += new System.EventHandler(this.useSourceResolutionToolStripMenuItem_Click);
// //
// x2160ToolStripMenuItem // x2160ToolStripMenuItem
// //
this.x2160ToolStripMenuItem.Name = "x2160ToolStripMenuItem"; this.x2160ToolStripMenuItem.Name = "x2160ToolStripMenuItem";
this.x2160ToolStripMenuItem.Size = new System.Drawing.Size(203, 22); this.x2160ToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.x2160ToolStripMenuItem.Text = "4K (4096x2160)"; this.x2160ToolStripMenuItem.Text = "4K (4096x2160)";
this.x2160ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick); this.x2160ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick);
// //
// uHD3840x2160ToolStripMenuItem // uHD3840x2160ToolStripMenuItem
// //
this.uHD3840x2160ToolStripMenuItem.Name = "uHD3840x2160ToolStripMenuItem"; this.uHD3840x2160ToolStripMenuItem.Name = "uHD3840x2160ToolStripMenuItem";
this.uHD3840x2160ToolStripMenuItem.Size = new System.Drawing.Size(203, 22); this.uHD3840x2160ToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.uHD3840x2160ToolStripMenuItem.Text = "UHD (3840x2160)"; this.uHD3840x2160ToolStripMenuItem.Text = "UHD (3840x2160)";
this.uHD3840x2160ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick); this.uHD3840x2160ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick);
// //
// k2048x1080ToolStripMenuItem // k2048x1080ToolStripMenuItem
// //
this.k2048x1080ToolStripMenuItem.Name = "k2048x1080ToolStripMenuItem"; this.k2048x1080ToolStripMenuItem.Name = "k2048x1080ToolStripMenuItem";
this.k2048x1080ToolStripMenuItem.Size = new System.Drawing.Size(203, 22); this.k2048x1080ToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.k2048x1080ToolStripMenuItem.Text = "2K (2048x1080)"; this.k2048x1080ToolStripMenuItem.Text = "2K (2048x1080)";
this.k2048x1080ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick); this.k2048x1080ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick);
// //
// dCI2KScope2048x858ToolStripMenuItem // dCI2KScope2048x858ToolStripMenuItem
// //
this.dCI2KScope2048x858ToolStripMenuItem.Name = "dCI2KScope2048x858ToolStripMenuItem"; this.dCI2KScope2048x858ToolStripMenuItem.Name = "dCI2KScope2048x858ToolStripMenuItem";
this.dCI2KScope2048x858ToolStripMenuItem.Size = new System.Drawing.Size(203, 22); this.dCI2KScope2048x858ToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.dCI2KScope2048x858ToolStripMenuItem.Text = "DCI 2K Scope (2048x858)"; this.dCI2KScope2048x858ToolStripMenuItem.Text = "DCI 2K Scope (2048x858)";
this.dCI2KScope2048x858ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick); this.dCI2KScope2048x858ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick);
// //
// dCI2KFlat1998x1080ToolStripMenuItem // dCI2KFlat1998x1080ToolStripMenuItem
// //
this.dCI2KFlat1998x1080ToolStripMenuItem.Name = "dCI2KFlat1998x1080ToolStripMenuItem"; this.dCI2KFlat1998x1080ToolStripMenuItem.Name = "dCI2KFlat1998x1080ToolStripMenuItem";
this.dCI2KFlat1998x1080ToolStripMenuItem.Size = new System.Drawing.Size(203, 22); this.dCI2KFlat1998x1080ToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.dCI2KFlat1998x1080ToolStripMenuItem.Text = "DCI 2K Flat (1998x1080)"; this.dCI2KFlat1998x1080ToolStripMenuItem.Text = "DCI 2K Flat (1998x1080)";
this.dCI2KFlat1998x1080ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick); this.dCI2KFlat1998x1080ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick);
// //
// p1920x1080ToolStripMenuItem // p1920x1080ToolStripMenuItem
// //
this.p1920x1080ToolStripMenuItem.Name = "p1920x1080ToolStripMenuItem"; this.p1920x1080ToolStripMenuItem.Name = "p1920x1080ToolStripMenuItem";
this.p1920x1080ToolStripMenuItem.Size = new System.Drawing.Size(203, 22); this.p1920x1080ToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.p1920x1080ToolStripMenuItem.Text = "1080p (1920x1080)"; this.p1920x1080ToolStripMenuItem.Text = "1080p (1920x1080)";
this.p1920x1080ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick); this.p1920x1080ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick);
// //
// x1080ToolStripMenuItem // x1080ToolStripMenuItem
// //
this.x1080ToolStripMenuItem.Name = "x1080ToolStripMenuItem"; this.x1080ToolStripMenuItem.Name = "x1080ToolStripMenuItem";
this.x1080ToolStripMenuItem.Size = new System.Drawing.Size(203, 22); this.x1080ToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.x1080ToolStripMenuItem.Text = "1440x1080"; this.x1080ToolStripMenuItem.Text = "1440x1080";
this.x1080ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick); this.x1080ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick);
// //
// p1280x720ToolStripMenuItem // p1280x720ToolStripMenuItem
// //
this.p1280x720ToolStripMenuItem.Name = "p1280x720ToolStripMenuItem"; this.p1280x720ToolStripMenuItem.Name = "p1280x720ToolStripMenuItem";
this.p1280x720ToolStripMenuItem.Size = new System.Drawing.Size(203, 22); this.p1280x720ToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.p1280x720ToolStripMenuItem.Text = "720p (1280x720)"; this.p1280x720ToolStripMenuItem.Text = "720p (1280x720)";
this.p1280x720ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick); this.p1280x720ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick);
// //
// x720ToolStripMenuItem // x720ToolStripMenuItem
// //
this.x720ToolStripMenuItem.Name = "x720ToolStripMenuItem"; this.x720ToolStripMenuItem.Name = "x720ToolStripMenuItem";
this.x720ToolStripMenuItem.Size = new System.Drawing.Size(203, 22); this.x720ToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.x720ToolStripMenuItem.Text = "960x720"; this.x720ToolStripMenuItem.Text = "960x720";
this.x720ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick); this.x720ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick);
// //
// p848x480ToolStripMenuItem // p848x480ToolStripMenuItem
// //
this.p848x480ToolStripMenuItem.Name = "p848x480ToolStripMenuItem"; this.p848x480ToolStripMenuItem.Name = "p848x480ToolStripMenuItem";
this.p848x480ToolStripMenuItem.Size = new System.Drawing.Size(203, 22); this.p848x480ToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.p848x480ToolStripMenuItem.Text = "480p (848x480)"; this.p848x480ToolStripMenuItem.Text = "480p (848x480)";
this.p848x480ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick); this.p848x480ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick);
// //
// pAL720x576ToolStripMenuItem // pAL720x576ToolStripMenuItem
// //
this.pAL720x576ToolStripMenuItem.Name = "pAL720x576ToolStripMenuItem"; this.pAL720x576ToolStripMenuItem.Name = "pAL720x576ToolStripMenuItem";
this.pAL720x576ToolStripMenuItem.Size = new System.Drawing.Size(203, 22); this.pAL720x576ToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.pAL720x576ToolStripMenuItem.Text = "PAL (720x576)"; this.pAL720x576ToolStripMenuItem.Text = "PAL (720x576)";
this.pAL720x576ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick); this.pAL720x576ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick);
// //
// nTSC720x480ToolStripMenuItem // nTSC720x480ToolStripMenuItem
// //
this.nTSC720x480ToolStripMenuItem.Name = "nTSC720x480ToolStripMenuItem"; this.nTSC720x480ToolStripMenuItem.Name = "nTSC720x480ToolStripMenuItem";
this.nTSC720x480ToolStripMenuItem.Size = new System.Drawing.Size(203, 22); this.nTSC720x480ToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.nTSC720x480ToolStripMenuItem.Text = "NTSC (720x480)"; this.nTSC720x480ToolStripMenuItem.Text = "NTSC (720x480)";
this.nTSC720x480ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick); this.nTSC720x480ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick);
// //
// x352ToolStripMenuItem // x352ToolStripMenuItem
// //
this.x352ToolStripMenuItem.Name = "x352ToolStripMenuItem"; this.x352ToolStripMenuItem.Name = "x352ToolStripMenuItem";
this.x352ToolStripMenuItem.Size = new System.Drawing.Size(203, 22); this.x352ToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.x352ToolStripMenuItem.Text = "640x352"; this.x352ToolStripMenuItem.Text = "640x352";
this.x352ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick); this.x352ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick);
// //
// x272ToolStripMenuItem // x272ToolStripMenuItem
// //
this.x272ToolStripMenuItem.Name = "x272ToolStripMenuItem"; this.x272ToolStripMenuItem.Name = "x272ToolStripMenuItem";
this.x272ToolStripMenuItem.Size = new System.Drawing.Size(203, 22); this.x272ToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
this.x272ToolStripMenuItem.Text = "640x272"; this.x272ToolStripMenuItem.Text = "640x272";
this.x272ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick); this.x272ToolStripMenuItem.Click += new System.EventHandler(this.ResolutionPickClick);
// //
@ -1623,6 +1625,12 @@ namespace Nikse.SubtitleEdit.Forms
this.textBoxLog.Size = new System.Drawing.Size(188, 26); this.textBoxLog.Size = new System.Drawing.Size(188, 26);
this.textBoxLog.TabIndex = 31; this.textBoxLog.TabIndex = 31;
// //
// toolStripMenuItemYouTubeShort
//
this.toolStripMenuItemYouTubeShort.Name = "toolStripMenuItemYouTubeShort";
this.toolStripMenuItemYouTubeShort.Size = new System.Drawing.Size(220, 22);
this.toolStripMenuItemYouTubeShort.Text = "YouTube shorts (1080x1920)";
//
// GenerateVideoWithHardSubs // GenerateVideoWithHardSubs
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -1773,5 +1781,6 @@ namespace Nikse.SubtitleEdit.Forms
private System.Windows.Forms.ColumnHeader columnHeaderResolution; private System.Windows.Forms.ColumnHeader columnHeaderResolution;
private System.Windows.Forms.ToolStripMenuItem useSourceResolutionToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem useSourceResolutionToolStripMenuItem;
private System.Windows.Forms.Button buttonOutputFileSettings; private System.Windows.Forms.Button buttonOutputFileSettings;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemYouTubeShort;
} }
} }

2
src/ui/Forms/GenerateVideoWithHardSubs.cs
View File

@ -2061,6 +2061,8 @@ namespace Nikse.SubtitleEdit.Forms
ResolutionPickClick(item, null); ResolutionPickClick(item, null);
} }
labelProgress.Text = string.Empty;
} }
private void addFilesToolStripMenuItem_Click(object sender, EventArgs e) private void addFilesToolStripMenuItem_Click(object sender, EventArgs e)

14
src/ui/Forms/Tts/TextToSpeech.cs
View File

@ -1207,7 +1207,8 @@ namespace Nikse.SubtitleEdit.Forms.Tts
nikseComboBoxVoice.Text = voice; nikseComboBoxVoice.Text = voice;
var sub = new Subtitle(); var sub = new Subtitle();
sub.Paragraphs.Add(p); sub.Paragraphs.Add(p);
var waveFileNameOnly = Guid.NewGuid() + ".wav";
var waveFileNameOnly = Guid.NewGuid() + GetEngineAudioExtension();
var ok = await GenerateParagraphAudio(sub, false, waveFileNameOnly); var ok = await GenerateParagraphAudio(sub, false, waveFileNameOnly);
if (!ok) if (!ok)
{ {
@ -1219,6 +1220,17 @@ namespace Nikse.SubtitleEdit.Forms.Tts
return fileNameAndSpeedFactors.First(); return fileNameAndSpeedFactors.First();
} }
private string GetEngineAudioExtension()
{
var engine = _engines.First(p => p.Index == nikseComboBoxEngine.SelectedIndex);
if (engine.Id == TextToSpeechEngineId.ElevenLabs)
{
return ".mp3";
}
return ".wav";
}
private async void buttonTestVoice_Click(object sender, EventArgs e) private async void buttonTestVoice_Click(object sender, EventArgs e)
{ {
try try