From 63743de0af28296984d9b61e5a91a9331e900105 Mon Sep 17 00:00:00 2001 From: OmrSi Date: Fri, 2 Sep 2022 01:33:08 +0300 Subject: [PATCH] Add `Allow overlap` to `Change speed` --- LanguageMaster.xml | 1 + src/libse/Common/Settings.cs | 8 ++++++++ src/ui/Forms/ChangeSpeedInPercent.Designer.cs | 17 ++++++++++++++-- src/ui/Forms/ChangeSpeedInPercent.cs | 20 +++++++++++++------ src/ui/Logic/Language.cs | 1 + src/ui/Logic/LanguageDeserializer.cs | 3 +++ src/ui/Logic/LanguageStructure.cs | 1 + 7 files changed, 43 insertions(+), 8 deletions(-) diff --git a/LanguageMaster.xml b/LanguageMaster.xml index 7c8c1fb71..9b41598c6 100644 --- a/LanguageMaster.xml +++ b/LanguageMaster.xml @@ -398,6 +398,7 @@ Note: Do check free disk space. Custom To drop frame From drop frame + Allow overlap Check for updates diff --git a/src/libse/Common/Settings.cs b/src/libse/Common/Settings.cs index 3de83ccf4..b395bac2f 100644 --- a/src/libse/Common/Settings.cs +++ b/src/libse/Common/Settings.cs @@ -330,6 +330,7 @@ namespace Nikse.SubtitleEdit.Core.Common public int AdjustDurationPercent { get; set; } public string AdjustDurationLast { get; set; } public bool AdjustDurationExtendOnly { get; set; } + public bool ChangeSpeedAllowOverlap { get; set; } public bool AutoBreakCommaBreakEarly { get; set; } public bool AutoBreakDashEarly { get; set; } public bool AutoBreakLineEndingEarly { get; set; } @@ -5617,6 +5618,12 @@ $HorzAlign = Center settings.Tools.AdjustDurationExtendOnly = Convert.ToBoolean(subNode.InnerText, CultureInfo.InvariantCulture); } + subNode = node.SelectSingleNode("ChangeSpeedAllowOverlap"); + if (subNode != null) + { + settings.Tools.ChangeSpeedAllowOverlap = Convert.ToBoolean(subNode.InnerText, CultureInfo.InvariantCulture); + } + subNode = node.SelectSingleNode("AutoBreakCommaBreakEarly"); if (subNode != null) { @@ -10133,6 +10140,7 @@ $HorzAlign = Center textWriter.WriteElementString("AdjustDurationPercent", settings.Tools.AdjustDurationPercent.ToString(CultureInfo.InvariantCulture)); textWriter.WriteElementString("AdjustDurationLast", settings.Tools.AdjustDurationLast); textWriter.WriteElementString("AdjustDurationExtendOnly", settings.Tools.AdjustDurationExtendOnly.ToString(CultureInfo.InvariantCulture)); + textWriter.WriteElementString("ChangeSpeedAllowOverlap", settings.Tools.ChangeSpeedAllowOverlap.ToString(CultureInfo.InvariantCulture)); textWriter.WriteElementString("AutoBreakCommaBreakEarly", settings.Tools.AutoBreakCommaBreakEarly.ToString(CultureInfo.InvariantCulture)); textWriter.WriteElementString("AutoBreakDashEarly", settings.Tools.AutoBreakDashEarly.ToString(CultureInfo.InvariantCulture)); textWriter.WriteElementString("AutoBreakLineEndingEarly", settings.Tools.AutoBreakLineEndingEarly.ToString(CultureInfo.InvariantCulture)); diff --git a/src/ui/Forms/ChangeSpeedInPercent.Designer.cs b/src/ui/Forms/ChangeSpeedInPercent.Designer.cs index a8ad4fbf6..b1b998f5e 100644 --- a/src/ui/Forms/ChangeSpeedInPercent.Designer.cs +++ b/src/ui/Forms/ChangeSpeedInPercent.Designer.cs @@ -30,6 +30,7 @@ { this.buttonCancel = new System.Windows.Forms.Button(); this.buttonOK = new System.Windows.Forms.Button(); + this.checkBoxAllowOverlap = new System.Windows.Forms.CheckBox(); this.numericUpDownPercent = new System.Windows.Forms.NumericUpDown(); this.labelPercent = new System.Windows.Forms.Label(); this.radioButtonSelectedLinesOnly = new System.Windows.Forms.RadioButton(); @@ -50,7 +51,7 @@ this.buttonCancel.Location = new System.Drawing.Point(295, 158); this.buttonCancel.Name = "buttonCancel"; this.buttonCancel.Size = new System.Drawing.Size(75, 23); - this.buttonCancel.TabIndex = 4; + this.buttonCancel.TabIndex = 5; this.buttonCancel.Text = "C&ancel"; this.buttonCancel.UseVisualStyleBackColor = true; this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); @@ -62,11 +63,21 @@ this.buttonOK.Location = new System.Drawing.Point(214, 158); this.buttonOK.Name = "buttonOK"; this.buttonOK.Size = new System.Drawing.Size(75, 23); - this.buttonOK.TabIndex = 3; + this.buttonOK.TabIndex = 4; this.buttonOK.Text = "&OK"; this.buttonOK.UseVisualStyleBackColor = true; this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click); // + // checkBoxAllowOverlap + // + this.checkBoxAllowOverlap.AutoSize = true; + this.checkBoxAllowOverlap.Location = new System.Drawing.Point(24, 160); + this.checkBoxAllowOverlap.Name = "checkBoxAllowOverlap"; + this.checkBoxAllowOverlap.Size = new System.Drawing.Size(109, 21); + this.checkBoxAllowOverlap.TabIndex = 3; + this.checkBoxAllowOverlap.Text = "Allow overlap"; + this.checkBoxAllowOverlap.UseVisualStyleBackColor = true; + // // numericUpDownPercent // this.numericUpDownPercent.DecimalPlaces = 5; @@ -180,6 +191,7 @@ this.Controls.Add(this.groupBoxInfo); this.Controls.Add(this.radioButtonSelectedLinesOnly); this.Controls.Add(this.radioButtonAllLines); + this.Controls.Add(this.checkBoxAllowOverlap); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonOK); this.KeyPreview = true; @@ -203,6 +215,7 @@ private System.Windows.Forms.Button buttonCancel; private System.Windows.Forms.Button buttonOK; + private System.Windows.Forms.CheckBox checkBoxAllowOverlap; private System.Windows.Forms.NumericUpDown numericUpDownPercent; private System.Windows.Forms.Label labelPercent; private System.Windows.Forms.RadioButton radioButtonSelectedLinesOnly; diff --git a/src/ui/Forms/ChangeSpeedInPercent.cs b/src/ui/Forms/ChangeSpeedInPercent.cs index 0fc200c8f..d5975e493 100644 --- a/src/ui/Forms/ChangeSpeedInPercent.cs +++ b/src/ui/Forms/ChangeSpeedInPercent.cs @@ -24,6 +24,7 @@ namespace Nikse.SubtitleEdit.Forms radioButtonSpeedCustom.Text = LanguageSettings.Current.ChangeSpeedInPercent.Custom; radioButtonSpeedFromDropFrame.Text = LanguageSettings.Current.ChangeSpeedInPercent.FromDropFrame; radioButtonToDropFrame.Text = LanguageSettings.Current.ChangeSpeedInPercent.ToDropFrame; + checkBoxAllowOverlap.Text = LanguageSettings.Current.ChangeSpeedInPercent.AllowOverlap; buttonOK.Text = LanguageSettings.Current.General.Ok; buttonCancel.Text = LanguageSettings.Current.General.Cancel; @@ -44,6 +45,8 @@ namespace Nikse.SubtitleEdit.Forms { radioButtonAllLines.Checked = true; } + + checkBoxAllowOverlap.Checked = Configuration.Settings.Tools.ChangeSpeedAllowOverlap; } private void ChangeSpeedInPercent_KeyDown(object sender, KeyEventArgs e) @@ -66,18 +69,22 @@ namespace Nikse.SubtitleEdit.Forms AdjustParagraph(p); } - for (int i = 0; i < subtitle.Paragraphs.Count; i++) + if (!checkBoxAllowOverlap.Checked) { - Paragraph p = subtitle.Paragraphs[i]; - Paragraph next = subtitle.GetParagraphOrDefault(i + 1); - if (next != null) + for (int i = 0; i < subtitle.Paragraphs.Count; i++) { - if (p.EndTime.TotalMilliseconds >= next.StartTime.TotalMilliseconds) + Paragraph p = subtitle.Paragraphs[i]; + Paragraph next = subtitle.GetParagraphOrDefault(i + 1); + if (next != null) { - p.EndTime.TotalMilliseconds = next.StartTime.TotalMilliseconds - 1; + if (p.EndTime.TotalMilliseconds >= next.StartTime.TotalMilliseconds) + { + p.EndTime.TotalMilliseconds = next.StartTime.TotalMilliseconds - 1; + } } } } + return subtitle; } @@ -92,6 +99,7 @@ namespace Nikse.SubtitleEdit.Forms Percentage = numericUpDownPercent.Value; AdjustFactor = Convert.ToDouble(numericUpDownPercent.Value) / 100.0; AdjustAllLines = radioButtonAllLines.Checked; + Configuration.Settings.Tools.ChangeSpeedAllowOverlap = checkBoxAllowOverlap.Checked; DialogResult = DialogResult.OK; } diff --git a/src/ui/Logic/Language.cs b/src/ui/Logic/Language.cs index 0db014a8e..282c34e35 100644 --- a/src/ui/Logic/Language.cs +++ b/src/ui/Logic/Language.cs @@ -572,6 +572,7 @@ namespace Nikse.SubtitleEdit.Logic Custom = "Custom", ToDropFrame = "To drop frame", FromDropFrame = "From drop frame", + AllowOverlap = "Allow overlap" }; CheckForUpdates = new LanguageStructure.CheckForUpdates diff --git a/src/ui/Logic/LanguageDeserializer.cs b/src/ui/Logic/LanguageDeserializer.cs index ec0a29e85..15e6f7b3e 100644 --- a/src/ui/Logic/LanguageDeserializer.cs +++ b/src/ui/Logic/LanguageDeserializer.cs @@ -1060,6 +1060,9 @@ namespace Nikse.SubtitleEdit.Logic case "ChangeSpeedInPercent/FromDropFrame": language.ChangeSpeedInPercent.FromDropFrame = reader.Value; break; + case "ChangeSpeedInPercent/AllowOverlap": + language.ChangeSpeedInPercent.AllowOverlap = reader.Value; + break; case "CheckForUpdates/Title": language.CheckForUpdates.Title = reader.Value; break; diff --git a/src/ui/Logic/LanguageStructure.cs b/src/ui/Logic/LanguageStructure.cs index 53ebeff4d..c5dd8b99c 100644 --- a/src/ui/Logic/LanguageStructure.cs +++ b/src/ui/Logic/LanguageStructure.cs @@ -431,6 +431,7 @@ public string Custom { get; set; } public string ToDropFrame { get; set; } public string FromDropFrame { get; set; } + public string AllowOverlap { get; set; } } public class CheckForUpdates