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

Add move all shot changes shortcuts - thx acetilo :)

Browse Source 
Work on  #8795
This commit is contained in:
Nikolaj Olsson 2024-09-09 18:17:51 +02:00
parent 89cdf24b60
commit d97cefd57b
9 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LanguageBaseEnglish.xml
View File

@ -2692,6 +2692,8 @@ can edit in same subtitle file (collaboration)</Information>
<WaveformGoToPreviousShotChange>Go to previous shot change</WaveformGoToPreviousShotChange> <WaveformGoToPreviousShotChange>Go to previous shot change</WaveformGoToPreviousShotChange>
<WaveformGoToNextShotChange>Go to next shot change</WaveformGoToNextShotChange> <WaveformGoToNextShotChange>Go to next shot change</WaveformGoToNextShotChange>
<WaveformToggleShotChange>Toggle shot change</WaveformToggleShotChange> <WaveformToggleShotChange>Toggle shot change</WaveformToggleShotChange>
<WaveformAllShotChangesOneFrameForward>Move all shot changes one frame forward</WaveformAllShotChangesOneFrameForward>
<WaveformAllShotChangesOneFrameBack>Move all shot changes one frame back</WaveformAllShotChangesOneFrameBack>
<WaveformRemoveOrExportShotChanges>Remove/export shot changes</WaveformRemoveOrExportShotChanges> <WaveformRemoveOrExportShotChanges>Remove/export shot changes</WaveformRemoveOrExportShotChanges>
<WaveformGuessStart>Auto adjust start via volume/shot change</WaveformGuessStart> <WaveformGuessStart>Auto adjust start via volume/shot change</WaveformGuessStart>
<GoBack1Frame>One frame back</GoBack1Frame> <GoBack1Frame>One frame back</GoBack1Frame>

14
src/libse/Settings/Settings.cs
View File

@ -8466,6 +8466,18 @@ namespace Nikse.SubtitleEdit.Core.Settings
shortcuts.WaveformToggleShotChange = subNode.InnerText; shortcuts.WaveformToggleShotChange = subNode.InnerText;
} }
subNode = node.SelectSingleNode("WaveformAllShotChangesOneFrameForward");
if (subNode != null)
{
shortcuts.WaveformAllShotChangesOneFrameForward = subNode.InnerText;
}
subNode = node.SelectSingleNode("WaveformAllShotChangesOneFrameBack");
if (subNode != null)
{
shortcuts.WaveformAllShotChangesOneFrameBack = subNode.InnerText;
}
subNode = node.SelectSingleNode("WaveformListShotChanges"); subNode = node.SelectSingleNode("WaveformListShotChanges");
if (subNode != null) if (subNode != null)
{ {
@ -10222,6 +10234,8 @@ namespace Nikse.SubtitleEdit.Core.Settings
textWriter.WriteElementString("WaveformGoToPreviousShotChange", shortcuts.WaveformGoToPreviousShotChange); textWriter.WriteElementString("WaveformGoToPreviousShotChange", shortcuts.WaveformGoToPreviousShotChange);
textWriter.WriteElementString("WaveformGoToNextShotChange", shortcuts.WaveformGoToNextShotChange); textWriter.WriteElementString("WaveformGoToNextShotChange", shortcuts.WaveformGoToNextShotChange);
textWriter.WriteElementString("WaveformToggleShotChange", shortcuts.WaveformToggleShotChange); textWriter.WriteElementString("WaveformToggleShotChange", shortcuts.WaveformToggleShotChange);
textWriter.WriteElementString("WaveformAllShotChangesOneFrameForward", shortcuts.WaveformAllShotChangesOneFrameForward);
textWriter.WriteElementString("WaveformAllShotChangesOneFrameBack", shortcuts.WaveformAllShotChangesOneFrameBack);
textWriter.WriteElementString("WaveformListShotChanges", shortcuts.WaveformListShotChanges); textWriter.WriteElementString("WaveformListShotChanges", shortcuts.WaveformListShotChanges);
textWriter.WriteElementString("WaveformGuessStart", shortcuts.WaveformGuessStart); textWriter.WriteElementString("WaveformGuessStart", shortcuts.WaveformGuessStart);
textWriter.WriteElementString("Waveform100MsLeft", shortcuts.Waveform100MsLeft); textWriter.WriteElementString("Waveform100MsLeft", shortcuts.Waveform100MsLeft);

2
src/libse/Settings/Shortcuts.cs
View File

@ -390,6 +390,8 @@ namespace Nikse.SubtitleEdit.Core.Settings
public string WaveformGoToPreviousShotChange { get; set; } public string WaveformGoToPreviousShotChange { get; set; }
public string WaveformGoToNextShotChange { get; set; } public string WaveformGoToNextShotChange { get; set; }
public string WaveformToggleShotChange { get; set; } public string WaveformToggleShotChange { get; set; }
public string WaveformAllShotChangesOneFrameForward { get; set; }
public string WaveformAllShotChangesOneFrameBack { get; set; }
public string WaveformListShotChanges { get; set; } public string WaveformListShotChanges { get; set; }
public string WaveformGuessStart { get; set; } public string WaveformGuessStart { get; set; }
public string Waveform100MsLeft { get; set; } public string Waveform100MsLeft { get; set; }

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

@ -18568,6 +18568,28 @@ namespace Nikse.SubtitleEdit.Forms
e.SuppressKeyPress = true; e.SuppressKeyPress = true;
} }
else if (audioVisualizer.ShotChanges != null && mediaPlayer.IsPaused && e.KeyData == _shortcuts.WaveformAllShotChangesOneFrameForward)
{
var frameMs = (double)Math.Round(1000.0 / CurrentFrameRate);
for (var i = 0; i < audioVisualizer.ShotChanges.Count; i++)
{
audioVisualizer.ShotChanges[i] += (frameMs / 1000.0);
}
ShotChangeHelper.SaveShotChanges(_videoFileName, audioVisualizer.ShotChanges);
e.SuppressKeyPress = true;
}
else if (audioVisualizer.ShotChanges != null && mediaPlayer.IsPaused && e.KeyData == _shortcuts.WaveformAllShotChangesOneFrameBack)
{
var frameMs = (double)Math.Round(1000.0 / CurrentFrameRate);
for (var i = 0; i < audioVisualizer.ShotChanges.Count; i++)
{
audioVisualizer.ShotChanges[i] -= (frameMs / 1000.0);
}
ShotChangeHelper.SaveShotChanges(_videoFileName, audioVisualizer.ShotChanges);
e.SuppressKeyPress = true;
}
else if (audioVisualizer.ShotChanges != null && mediaPlayer.IsPaused && e.KeyData == _shortcuts.WaveformGuessStart) else if (audioVisualizer.ShotChanges != null && mediaPlayer.IsPaused && e.KeyData == _shortcuts.WaveformGuessStart)
{ {
AutoGuessStartTime(_subtitleListViewIndex); AutoGuessStartTime(_subtitleListViewIndex);

2
src/ui/Forms/Options/Settings.cs
View File

@ -1927,6 +1927,8 @@ namespace Nikse.SubtitleEdit.Forms.Options
AddNode(audioVisualizerNode, LanguageSettings.Current.Main.VideoControls.InsertNewSubtitleAtVideoPosition, nameof(Configuration.Settings.Shortcuts.MainWaveformInsertAtCurrentPosition)); AddNode(audioVisualizerNode, LanguageSettings.Current.Main.VideoControls.InsertNewSubtitleAtVideoPosition, nameof(Configuration.Settings.Shortcuts.MainWaveformInsertAtCurrentPosition));
AddNode(audioVisualizerNode, language.WaveformGoToPreviousShotChange, nameof(Configuration.Settings.Shortcuts.WaveformGoToPreviousShotChange)); AddNode(audioVisualizerNode, language.WaveformGoToPreviousShotChange, nameof(Configuration.Settings.Shortcuts.WaveformGoToPreviousShotChange));
AddNode(audioVisualizerNode, language.WaveformGoToNextShotChange, nameof(Configuration.Settings.Shortcuts.WaveformGoToNextShotChange)); AddNode(audioVisualizerNode, language.WaveformGoToNextShotChange, nameof(Configuration.Settings.Shortcuts.WaveformGoToNextShotChange));
AddNode(audioVisualizerNode, language.WaveformAllShotChangesOneFrameBack, nameof(Configuration.Settings.Shortcuts.WaveformAllShotChangesOneFrameBack));
AddNode(audioVisualizerNode, language.WaveformAllShotChangesOneFrameForward, nameof(Configuration.Settings.Shortcuts.WaveformAllShotChangesOneFrameForward));
AddNode(audioVisualizerNode, language.WaveformToggleShotChange, nameof(Configuration.Settings.Shortcuts.WaveformToggleShotChange)); AddNode(audioVisualizerNode, language.WaveformToggleShotChange, nameof(Configuration.Settings.Shortcuts.WaveformToggleShotChange));
AddNode(audioVisualizerNode, language.WaveformRemoveOrExportShotChanges, nameof(Configuration.Settings.Shortcuts.WaveformListShotChanges), true); AddNode(audioVisualizerNode, language.WaveformRemoveOrExportShotChanges, nameof(Configuration.Settings.Shortcuts.WaveformListShotChanges), true);
AddNode(audioVisualizerNode, language.WaveformGuessStart, nameof(Configuration.Settings.Shortcuts.WaveformGuessStart)); AddNode(audioVisualizerNode, language.WaveformGuessStart, nameof(Configuration.Settings.Shortcuts.WaveformGuessStart));

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

@ -3062,6 +3062,8 @@ can edit in same subtitle file (collaboration)",
WaveformGoToPreviousShotChange = "Go to previous shot change", WaveformGoToPreviousShotChange = "Go to previous shot change",
WaveformGoToNextShotChange = "Go to next shot change", WaveformGoToNextShotChange = "Go to next shot change",
WaveformToggleShotChange = "Toggle shot change", WaveformToggleShotChange = "Toggle shot change",
WaveformAllShotChangesOneFrameForward = "Move all shot changes one frame forward",
WaveformAllShotChangesOneFrameBack = "Move all shot changes one frame back",
WaveformRemoveOrExportShotChanges = "Remove/export shot changes", WaveformRemoveOrExportShotChanges = "Remove/export shot changes",
WaveformGuessStart = "Auto adjust start via volume/shot change", WaveformGuessStart = "Auto adjust start via volume/shot change",
GoBack1Frame = "One frame back", GoBack1Frame = "One frame back",

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

@ -7372,6 +7372,12 @@ namespace Nikse.SubtitleEdit.Logic
case "Settings/WaveformToggleShotChange": case "Settings/WaveformToggleShotChange":
language.Settings.WaveformToggleShotChange = reader.Value; language.Settings.WaveformToggleShotChange = reader.Value;
break; break;
case "Settings/WaveformAllShotChangesOneFrameForward":
language.Settings.WaveformAllShotChangesOneFrameForward = reader.Value;
break;
case "Settings/WaveformAllShotChangesOneFrameBack":
language.Settings.WaveformAllShotChangesOneFrameBack = reader.Value;
break;
case "Settings/WaveformRemoveOrExportShotChanges": case "Settings/WaveformRemoveOrExportShotChanges":
language.Settings.WaveformRemoveOrExportShotChanges = reader.Value; language.Settings.WaveformRemoveOrExportShotChanges = reader.Value;
break; break;

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

@ -2870,6 +2870,8 @@
public string WaveformGoToPreviousShotChange { get; set; } public string WaveformGoToPreviousShotChange { get; set; }
public string WaveformGoToNextShotChange { get; set; } public string WaveformGoToNextShotChange { get; set; }
public string WaveformToggleShotChange { get; set; } public string WaveformToggleShotChange { get; set; }
public string WaveformAllShotChangesOneFrameForward { get; set; }
public string WaveformAllShotChangesOneFrameBack { get; set; }
public string WaveformRemoveOrExportShotChanges { get; set; } public string WaveformRemoveOrExportShotChanges { get; set; }
public string WaveformGuessStart { get; set; } public string WaveformGuessStart { get; set; }
public string GoBack1Frame { get; set; } public string GoBack1Frame { get; set; }

4
src/ui/Logic/MainShortcuts.cs
View File

@ -270,6 +270,8 @@ namespace Nikse.SubtitleEdit.Logic
public Keys WaveformGoToPreviousShotChange { get; set; } public Keys WaveformGoToPreviousShotChange { get; set; }
public Keys WaveformGoToNextShotChange { get; set; } public Keys WaveformGoToNextShotChange { get; set; }
public Keys WaveformToggleShotChange { get; set; } public Keys WaveformToggleShotChange { get; set; }
public Keys WaveformAllShotChangesOneFrameForward { get; set; }
public Keys WaveformAllShotChangesOneFrameBack { get; set; }
public Keys WaveformListShotChanges { get; set; } public Keys WaveformListShotChanges { get; set; }
public Keys WaveformGuessStart { get; set; } public Keys WaveformGuessStart { get; set; }
public Keys WaveformAudioToTextVosk { get; set; } public Keys WaveformAudioToTextVosk { get; set; }
@ -549,6 +551,8 @@ namespace Nikse.SubtitleEdit.Logic
WaveformSetParagraphAsNewSelection = UiUtil.GetKeys(Configuration.Settings.Shortcuts.WaveformSetParagraphAsSelection); WaveformSetParagraphAsNewSelection = UiUtil.GetKeys(Configuration.Settings.Shortcuts.WaveformSetParagraphAsSelection);
WaveformGoToPreviousShotChange = UiUtil.GetKeys(Configuration.Settings.Shortcuts.WaveformGoToPreviousShotChange); WaveformGoToPreviousShotChange = UiUtil.GetKeys(Configuration.Settings.Shortcuts.WaveformGoToPreviousShotChange);
WaveformGoToNextShotChange = UiUtil.GetKeys(Configuration.Settings.Shortcuts.WaveformGoToNextShotChange); WaveformGoToNextShotChange = UiUtil.GetKeys(Configuration.Settings.Shortcuts.WaveformGoToNextShotChange);
WaveformAllShotChangesOneFrameForward = UiUtil.GetKeys(Configuration.Settings.Shortcuts.WaveformAllShotChangesOneFrameForward);
WaveformAllShotChangesOneFrameBack = UiUtil.GetKeys(Configuration.Settings.Shortcuts.WaveformAllShotChangesOneFrameBack);
WaveformToggleShotChange = UiUtil.GetKeys(Configuration.Settings.Shortcuts.WaveformToggleShotChange); WaveformToggleShotChange = UiUtil.GetKeys(Configuration.Settings.Shortcuts.WaveformToggleShotChange);
WaveformListShotChanges = UiUtil.GetKeys(Configuration.Settings.Shortcuts.WaveformListShotChanges); WaveformListShotChanges = UiUtil.GetKeys(Configuration.Settings.Shortcuts.WaveformListShotChanges);
WaveformGuessStart = UiUtil.GetKeys(Configuration.Settings.Shortcuts.WaveformGuessStart); WaveformGuessStart = UiUtil.GetKeys(Configuration.Settings.Shortcuts.WaveformGuessStart);