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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Nikolaj Olsson 2022-08-06 06:51:04 +02:00 committed by GitHub
commit 42b6edd0ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.txt
View File

@ -15,7 +15,7 @@
* Add shortcuts for go to next/prev and focus waveform - thx cyzs233
* Export audio for selected lines - thx nissansz
* Audio-to-text for selected lines - thx Mishasama
* Add "Calc cps only wihout space/punction - thx Michele
* Add "Calc cps only wihout space/punction" - thx Michele
* Add "{gap}" to custom text export - thx Shaun
* IMPROVED:
* Update Polish translation - thx admas

2
LanguageMaster.xml
View File

@ -1739,7 +1739,9 @@ If you have edited this file with Subtitle Edit you might be able to find a back
<NoSupportHereDivx>DivX files are not supported here.</NoSupportHereDivx>
<NoChapters>No chapters found in the video.</NoChapters>
<VideoFromUrlRequirements>Opening video from url requires mpv and youtube-dl.
Download and continue?</VideoFromUrlRequirements>
<Url>Url</Url>
<Errors>Errors</Errors>
<ShowVideoControls>Show video controls</ShowVideoControls>
<HideVideoControls>Hide video controls</HideVideoControls>

1
src/ui/Forms/AudioToText.cs
View File

@ -53,6 +53,7 @@ namespace Nikse.SubtitleEdit.Forms
buttonCancel.Text = LanguageSettings.Current.General.Cancel;
buttonBatchMode.Text = LanguageSettings.Current.AudioToText.BatchMode;
groupBoxInputFiles.Text = LanguageSettings.Current.BatchConvert.Input;
linkLabelVoskWebSite.Text = LanguageSettings.Current.AudioToText.VoskWebsite;
buttonAddFile.Text = LanguageSettings.Current.DvdSubRip.Add;
buttonRemoveFile.Text = LanguageSettings.Current.DvdSubRip.Remove;

4
src/ui/Forms/Main.cs
View File

@ -31516,7 +31516,7 @@ namespace Nikse.SubtitleEdit.Forms
Input = selectedText,
IsOriginalActive = GetFocusedTextBox() == textBoxListViewTextOriginal,
};
_measurementConverter.InsertClicked += measurementConverter_InsertClicked;
_measurementConverter.OnInsertClicked += measurementConverter_InsertClicked;
_measurementConverter.Show(this);
}
@ -32401,7 +32401,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
using (var form = new TextPrompt(LanguageSettings.Current.Main.OpenVideoFile, "Url", string.Empty, 500))
using (var form = new TextPrompt(LanguageSettings.Current.Main.OpenVideoFile, _language.Url, string.Empty, 500))
{
if (form.ShowDialog(this) == DialogResult.OK)
{

8
src/ui/Forms/MeasurementConverter.Designer.cs generated
View File

@ -132,9 +132,9 @@
//
this.buttonInsert.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonInsert.DialogResult = System.Windows.Forms.DialogResult.Yes;
this.buttonInsert.Location = new System.Drawing.Point(254, 155);
this.buttonInsert.Location = new System.Drawing.Point(287, 175);
this.buttonInsert.Name = "buttonInsert";
this.buttonInsert.Size = new System.Drawing.Size(75, 23);
this.buttonInsert.Size = new System.Drawing.Size(102, 23);
this.buttonInsert.TabIndex = 9;
this.buttonInsert.Text = "&Insert";
this.buttonInsert.UseVisualStyleBackColor = true;
@ -144,7 +144,7 @@
//
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(332, 155);
this.buttonOK.Location = new System.Drawing.Point(392, 175);
this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(75, 23);
this.buttonOK.TabIndex = 10;
@ -156,7 +156,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(419, 190);
this.ClientSize = new System.Drawing.Size(479, 210);
this.Controls.Add(this.listBoxCategory);
this.Controls.Add(this.labelConvertFrom);
this.Controls.Add(this.comboBoxFrom);

6
src/ui/Forms/MeasurementConverter.cs
View File

@ -16,7 +16,7 @@ namespace Nikse.SubtitleEdit.Forms
public bool IsOriginalActive { get; set; }
}
public event EventHandler<InsertEventArgs> InsertClicked;
public event EventHandler<InsertEventArgs> OnInsertClicked;
public string Input { get; set; }
public bool IsOriginalActive { get; set; }
@ -247,7 +247,7 @@ namespace Nikse.SubtitleEdit.Forms
private void buttonInsert_Click(object sender, EventArgs e)
{
InsertClicked?.Invoke(this, new InsertEventArgs { Result = Output, IsOriginalActive = IsOriginalActive });
OnInsertClicked?.Invoke(this, new InsertEventArgs { Result = Output, IsOriginalActive = IsOriginalActive });
if (checkBoxCloseOnInsert.Checked)
{
@ -4800,7 +4800,7 @@ namespace Nikse.SubtitleEdit.Forms
return;
}
if (e.KeyChar == '.' && !((sender as TextBox).Text.IndexOf('.') > -1) || e.KeyChar == ',' || e.KeyChar == '-' && !((sender as TextBox).Text.IndexOf('-') > -1))
if (e.KeyChar == '.' && !(((TextBox)sender)?.Text.IndexOf('.') > -1) || e.KeyChar == ',' || e.KeyChar == '-' && !(((TextBox)sender)?.Text.IndexOf('-') > -1))
{
return;
}

1
src/ui/Logic/Language.cs
View File

@ -1639,6 +1639,7 @@ namespace Nikse.SubtitleEdit.Logic
NoSupportHereDivx = "DivX files are not supported here.",
NoChapters = "No chapters found in the video.",
VideoFromUrlRequirements = "Opening video from url requires mpv and youtube-dl - download and continue?",
Url = "Url",
Errors = "Errors",
ShowVideoControls = "Show video controls",
HideVideoControls = "Hide video controls",

3
src/ui/Logic/LanguageDeserializer.cs
View File

@ -3784,6 +3784,9 @@ namespace Nikse.SubtitleEdit.Logic
case "Main/VideoFromUrlRequirements":
language.Main.VideoFromUrlRequirements = reader.Value;
break;
case "Main/Url":
language.Main.Url = reader.Value;
break;
case "Main/Errors":
language.Main.Errors = reader.Value;
break;

1
src/ui/Logic/LanguageStructure.cs
View File

@ -1491,6 +1491,7 @@
public string NoSupportHereDivx { get; set; }
public string NoChapters { get; set; }
public string VideoFromUrlRequirements { get; set; }
public string Url { get; set; }
public string Errors { get; set; }
public string ShowVideoControls { get; set; }
public string HideVideoControls { get; set; }