diff --git a/Changelog.txt b/Changelog.txt
index 3764680c6..d864e5c72 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -8,6 +8,7 @@
* Add Arabic translation - thx Yahya
* Add new json subtitle format - thx Lucretia
* Add auto-translate via Papago
+ * Add new shortcut "Set end and start of next after gap" - thx rRobis
* IMPROVED:
* Update Polish translation - thx admas
* Update Finnish translation - thx Teijo S
diff --git a/LanguageBaseEnglish.xml b/LanguageBaseEnglish.xml
index b0211bb73..b5bbba54c 100644
--- a/LanguageBaseEnglish.xml
+++ b/LanguageBaseEnglish.xml
@@ -2556,6 +2556,7 @@ can edit in same subtitle file (collaboration)
Adjust via end position
Adjust via end position and go to next
Set end minus gap, go to next and start next here
+ Set end and start of next after gap
Set start and go to next
Set end and go to next
Set end and pause
diff --git a/src/libse/Common/Settings.cs b/src/libse/Common/Settings.cs
index 385d23612..978f14a3c 100644
--- a/src/libse/Common/Settings.cs
+++ b/src/libse/Common/Settings.cs
@@ -2632,7 +2632,7 @@ $HorzAlign = Center
public string MainAdjustViaEndAutoStart { get; set; }
public string MainAdjustViaEndAutoStartAndGoToNext { get; set; }
public string MainAdjustSetEndMinusGapAndStartNextHere { get; set; }
- public string MainAdjustSetEndAndStartOfNextPlusGap { get; set; }
+ public string MainSetEndAndStartNextAfterGap { get; set; }
public string MainAdjustSetStartAutoDurationAndGoToNext { get; set; }
public string MainAdjustSetEndNextStartAndGoToNext { get; set; }
public string MainAdjustStartDownEndUpAndGoToNext { get; set; }
@@ -10687,10 +10687,10 @@ $HorzAlign = Center
shortcuts.MainAdjustSetEndMinusGapAndStartNextHere = subNode.InnerText;
}
- subNode = node.SelectSingleNode("MainAdjustSetEndAndStartOfNextPlusGap");
+ subNode = node.SelectSingleNode("MainSetEndAndStartNextAfterGap");
if (subNode != null)
{
- shortcuts.MainAdjustSetEndAndStartOfNextPlusGap = subNode.InnerText;
+ shortcuts.MainSetEndAndStartNextAfterGap = subNode.InnerText;
}
subNode = node.SelectSingleNode("MainAdjustSetStartAutoDurationAndGoToNext");
@@ -12708,7 +12708,7 @@ $HorzAlign = Center
textWriter.WriteElementString("MainAdjustViaEndAutoStart", shortcuts.MainAdjustViaEndAutoStart);
textWriter.WriteElementString("MainAdjustViaEndAutoStartAndGoToNext", shortcuts.MainAdjustViaEndAutoStartAndGoToNext);
textWriter.WriteElementString("MainAdjustSetEndMinusGapAndStartNextHere", shortcuts.MainAdjustSetEndMinusGapAndStartNextHere);
- textWriter.WriteElementString("MainAdjustSetEndAndStartOfNextPlusGap", shortcuts.MainAdjustSetEndAndStartOfNextPlusGap);
+ textWriter.WriteElementString("MainSetEndAndStartNextAfterGap", shortcuts.MainSetEndAndStartNextAfterGap);
textWriter.WriteElementString("MainAdjustSetStartAutoDurationAndGoToNext", shortcuts.MainAdjustSetStartAutoDurationAndGoToNext);
textWriter.WriteElementString("MainAdjustSetEndNextStartAndGoToNext", shortcuts.MainAdjustSetEndNextStartAndGoToNext);
textWriter.WriteElementString("MainAdjustStartDownEndUpAndGoToNext", shortcuts.MainAdjustStartDownEndUpAndGoToNext);
diff --git a/src/ui/Forms/ExportPngXml.cs b/src/ui/Forms/ExportPngXml.cs
index af3c275b5..727441194 100644
--- a/src/ui/Forms/ExportPngXml.cs
+++ b/src/ui/Forms/ExportPngXml.cs
@@ -2486,12 +2486,12 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
if (float.TryParse(comboBoxBorderWidth.SelectedItem.ToString().Replace(',', '.'), NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var f))
{
- return f;
+ return f * 1.25f;
}
if (float.TryParse(Utilities.RemoveNonNumbers(comboBoxBorderWidth.SelectedItem.ToString()).Replace(',', '.'), NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out f))
{
- return f;
+ return f * 1.25f;
}
return 0;
diff --git a/src/ui/Forms/Options/Settings.cs b/src/ui/Forms/Options/Settings.cs
index 0285eb882..4bb0e8eaa 100644
--- a/src/ui/Forms/Options/Settings.cs
+++ b/src/ui/Forms/Options/Settings.cs
@@ -1844,7 +1844,7 @@ namespace Nikse.SubtitleEdit.Forms.Options
AddNode(createAndAdjustNode, language.AdjustSetEndAndOffsetTheRestAndGoToNext, nameof(Configuration.Settings.Shortcuts.MainAdjustSetEndAndOffsetTheRestAndGoToNext));
AddNode(createAndAdjustNode, language.AdjustSetEndNextStartAndGoToNext, nameof(Configuration.Settings.Shortcuts.MainAdjustSetEndNextStartAndGoToNext));
AddNode(createAndAdjustNode, language.AdjustSetEndMinusGapAndStartNextHere, nameof(Configuration.Settings.Shortcuts.MainAdjustSetEndMinusGapAndStartNextHere));
- AddNode(createAndAdjustNode, "Set end and start of next after gap", nameof(Configuration.Settings.Shortcuts.MainAdjustSetEndAndStartOfNextPlusGap));
+ AddNode(createAndAdjustNode, language.AdjustSetEndAndStartNextAfterGap, nameof(Configuration.Settings.Shortcuts.MainSetEndAndStartNextAfterGap));
AddNode(createAndAdjustNode, language.AdjustViaEndAutoStart, nameof(Configuration.Settings.Shortcuts.MainAdjustViaEndAutoStart));
AddNode(createAndAdjustNode, language.AdjustViaEndAutoStartAndGoToNext, nameof(Configuration.Settings.Shortcuts.MainAdjustViaEndAutoStartAndGoToNext));
AddNode(createAndAdjustNode, language.AdjustSelected100MsBack, nameof(Configuration.Settings.Shortcuts.MainAdjustSelected100MsBack));
diff --git a/src/ui/Logic/Language.cs b/src/ui/Logic/Language.cs
index 39a437e05..6f91e72f0 100644
--- a/src/ui/Logic/Language.cs
+++ b/src/ui/Logic/Language.cs
@@ -2914,6 +2914,7 @@ can edit in same subtitle file (collaboration)",
AdjustViaEndAutoStart = "Adjust via end position",
AdjustViaEndAutoStartAndGoToNext = "Adjust via end position and go to next",
AdjustSetEndMinusGapAndStartNextHere = "Set end minus gap, go to next and start next here",
+ AdjustSetEndAndStartNextAfterGap = "Set end and start of next after gap",
AdjustSetStartTimeAndGoToNext = "Set start and go to next",
AdjustSetEndTimeAndGoToNext = "Set end and go to next",
AdjustSetEndTimeAndPause = "Set end and pause",
diff --git a/src/ui/Logic/LanguageDeserializer.cs b/src/ui/Logic/LanguageDeserializer.cs
index 427b0274d..0d170fa5e 100644
--- a/src/ui/Logic/LanguageDeserializer.cs
+++ b/src/ui/Logic/LanguageDeserializer.cs
@@ -6955,6 +6955,9 @@ namespace Nikse.SubtitleEdit.Logic
case "Settings/AdjustSetEndMinusGapAndStartNextHere":
language.Settings.AdjustSetEndMinusGapAndStartNextHere = reader.Value;
break;
+ case "Settings/AdjustSetEndAndStartNextAfterGap":
+ language.Settings.AdjustSetEndAndStartNextAfterGap = reader.Value;
+ break;
case "Settings/AdjustSetStartTimeAndGoToNext":
language.Settings.AdjustSetStartTimeAndGoToNext = reader.Value;
break;
diff --git a/src/ui/Logic/LanguageStructure.cs b/src/ui/Logic/LanguageStructure.cs
index c40af3ac2..5a36115b6 100644
--- a/src/ui/Logic/LanguageStructure.cs
+++ b/src/ui/Logic/LanguageStructure.cs
@@ -2731,6 +2731,7 @@
public string AdjustViaEndAutoStart { get; set; }
public string AdjustViaEndAutoStartAndGoToNext { get; set; }
public string AdjustSetEndMinusGapAndStartNextHere { get; set; }
+ public string AdjustSetEndAndStartNextAfterGap { get; set; }
public string AdjustSetStartTimeAndGoToNext { get; set; }
public string AdjustSetEndTimeAndGoToNext { get; set; }
public string AdjustSetEndTimeAndPause { get; set; }
diff --git a/src/ui/Logic/MainShortcuts.cs b/src/ui/Logic/MainShortcuts.cs
index 32370e4c7..53677a880 100644
--- a/src/ui/Logic/MainShortcuts.cs
+++ b/src/ui/Logic/MainShortcuts.cs
@@ -470,7 +470,7 @@ namespace Nikse.SubtitleEdit.Logic
MainAdjustInsertViaEndAutoStart = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainAdjustViaEndAutoStart);
MainAdjustInsertViaEndAutoStartAndGoToNext = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainAdjustViaEndAutoStartAndGoToNext);
MainAdjustSetEndMinusGapAndStartNextHere = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainAdjustSetEndMinusGapAndStartNextHere);
- MainAdjustSetEndAndStartOfNextPlusGap = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainAdjustSetEndAndStartOfNextPlusGap);
+ MainAdjustSetEndAndStartOfNextPlusGap = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainSetEndAndStartNextAfterGap);
MainAdjustSetStartAutoDurationAndGoToNext = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainAdjustSetStartAutoDurationAndGoToNext);
MainAdjustSetEndNextStartAndGoToNext = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainAdjustSetEndNextStartAndGoToNext);
MainAdjustStartDownEndUpAndGoToNext = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainAdjustStartDownEndUpAndGoToNext);