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

Add new shortcut "Select next subtitle (from video position, keep video pos)" - thx OmrSi :)

Browse Source
This commit is contained in:
Nikolaj Olsson 2020-03-18 08:45:01 +01:00
parent ee2d34db8f
commit 4b57f16583
8 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
LanguageMaster.xml
View File

@ -2040,6 +2040,7 @@ can edit in same subtitle file (collaboration)</Information>
<PlayCurrent>Play current subtitle</PlayCurrent>
<WaveformGoToPrevSubtitle>Go to previous subtitle (from video position)</WaveformGoToPrevSubtitle>
<WaveformGoToNextSubtitle>Go to next subtitle (from video position)</WaveformGoToNextSubtitle>
<WaveformSelectNextSubtitle>Select next subtitle (from video position, keep video pos)</WaveformSelectNextSubtitle>
<TogglePlayPause>Toggle play/pause</TogglePlayPause>
<Pause>Pause</Pause>
<Fullscreen>Fullscreen</Fullscreen>

1
libse/Language.cs
View File

@ -2314,6 +2314,7 @@ can edit in same subtitle file (collaboration)",
WaveformFocusListView = "Focus list view",
WaveformGoToPrevSubtitle = "Go to previous subtitle (from video position)",
WaveformGoToNextSubtitle = "Go to next subtitle (from video position)",
WaveformSelectNextSubtitle = "Select next subtitle (from video position, keep video pos)",
WaveformGoToPreviousSceneChange = "Go to previous scene change",
WaveformGoToNextSceneChange = "Go to next scene change",
WaveformToggleSceneChange = "Toggle scene change",

3
libse/LanguageDeserializer.cs
View File

@ -5542,6 +5542,9 @@ namespace Nikse.SubtitleEdit.Core
case "Settings/WaveformGoToNextSubtitle":
language.Settings.WaveformGoToNextSubtitle = reader.Value;
break;
case "Settings/WaveformSelectNextSubtitle":
language.Settings.WaveformSelectNextSubtitle = reader.Value;
break;
case "Settings/TogglePlayPause":
language.Settings.TogglePlayPause = reader.Value;
break;

2
libse/LanguageStructure.cs
View File

@ -2206,7 +2206,7 @@
public string WaveformGoToPrevSubtitle { get; set; }
public string WaveformGoToNextSubtitle { get; set; }
public string WaveformSelectNextSubtitle { get; set; }
public string TogglePlayPause { get; set; }
public string Pause { get; set; }
public string Fullscreen { get; set; }

8
libse/Settings.cs
View File

@ -1465,6 +1465,7 @@ $HorzAlign = Center
public string MainVideoPlayCurrent { get; set; }
public string MainVideoGoToPrevSubtitle { get; set; }
public string MainVideoGoToNextSubtitle { get; set; }
public string MainVideoSelectNextSubtitle { get; set; }
public string MainVideoFullscreen { get; set; }
public string MainVideoSlower { get; set; }
public string MainVideoFaster { get; set; }
@ -5540,6 +5541,12 @@ $HorzAlign = Center
settings.Shortcuts.MainVideoGoToNextSubtitle = subNode.InnerText;
}
subNode = node.SelectSingleNode("MainVideoSelectNextSubtitle");
if (subNode != null)
{
settings.Shortcuts.MainVideoSelectNextSubtitle = subNode.InnerText;
}
subNode = node.SelectSingleNode("MainVideoFullscreen");
if (subNode != null)
{
@ -7058,6 +7065,7 @@ $HorzAlign = Center
textWriter.WriteElementString("MainVideoPlayCurrent", settings.Shortcuts.MainVideoPlayCurrent);
textWriter.WriteElementString("MainVideoGoToPrevSubtitle", settings.Shortcuts.MainVideoGoToPrevSubtitle);
textWriter.WriteElementString("MainVideoGoToNextSubtitle", settings.Shortcuts.MainVideoGoToNextSubtitle);
textWriter.WriteElementString("MainVideoSelectNextSubtitle", settings.Shortcuts.MainVideoSelectNextSubtitle);
textWriter.WriteElementString("MainVideoFullscreen", settings.Shortcuts.MainVideoFullscreen);
textWriter.WriteElementString("MainVideoSlower", settings.Shortcuts.MainVideoSlower);
textWriter.WriteElementString("MainVideoFaster", settings.Shortcuts.MainVideoFaster);

16
src/Forms/Main.cs
View File

@ -14188,6 +14188,22 @@ namespace Nikse.SubtitleEdit.Forms
e.SuppressKeyPress = true;
}
else if (e.KeyData == _shortcuts.VideoSelectNextSubtitle)
{
var cp = mediaPlayer.CurrentPosition * TimeCode.BaseUnit;
foreach (var p in _subtitle.Paragraphs)
{
if (p.StartTime.TotalMilliseconds > cp)
{
SubtitleListview1.SelectNone();
SubtitleListview1.Items[_subtitle.Paragraphs.IndexOf(p)].Selected = true;
SubtitleListview1.Items[_subtitle.Paragraphs.IndexOf(p)].Focused = true;
break;
}
}
e.SuppressKeyPress = true;
}
else if (audioVisualizer.SceneChanges != null && e.KeyData == _shortcuts.WaveformGoToPreviousSceneChange)
{
var cp = mediaPlayer.CurrentPosition - 0.01;

1
src/Forms/Settings.cs
View File

@ -1120,6 +1120,7 @@ namespace Nikse.SubtitleEdit.Forms
AddNode(videoNode, language.PlayCurrent, nameof(Configuration.Settings.Shortcuts.MainVideoPlayCurrent));
AddNode(videoNode, language.WaveformGoToPrevSubtitle, nameof(Configuration.Settings.Shortcuts.MainVideoGoToPrevSubtitle));
AddNode(videoNode, language.WaveformGoToNextSubtitle, nameof(Configuration.Settings.Shortcuts.MainVideoGoToNextSubtitle));
AddNode(videoNode, language.WaveformSelectNextSubtitle, nameof(Configuration.Settings.Shortcuts.MainVideoSelectNextSubtitle));
AddNode(videoNode, language.Fullscreen, nameof(Configuration.Settings.Shortcuts.MainVideoFullscreen));
AddNode(videoNode, language.PlayRateSlower, nameof(Configuration.Settings.Shortcuts.MainVideoSlower));
AddNode(videoNode, language.PlayRateFaster, nameof(Configuration.Settings.Shortcuts.MainVideoFaster));

2
src/Logic/MainShortcuts.cs
View File

@ -47,6 +47,7 @@ namespace Nikse.SubtitleEdit.Logic
public Keys MainVideoPlayCurrent { get; set; }
public Keys VideoGoToPrevSubtitle { get; set; }
public Keys VideoGoToNextSubtitle { get; set; }
public Keys VideoSelectNextSubtitle { get; set; }
public Keys VideoPlayFirstSelected { get; set; }
public Keys MainVideoFullscreen { get; set; }
public Keys MainVideoSlower { get; set; }
@ -186,6 +187,7 @@ namespace Nikse.SubtitleEdit.Logic
MainVideoPlayCurrent = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainVideoPlayCurrent);
VideoGoToPrevSubtitle = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainVideoGoToPrevSubtitle);
VideoGoToNextSubtitle = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainVideoGoToNextSubtitle);
VideoSelectNextSubtitle = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainVideoSelectNextSubtitle);
VideoPlayFirstSelected = UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralPlayFirstSelected);
MainGoToPreviousSubtitleAndFocusVideo = UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralGoToPreviousSubtitleAndFocusVideo);
MainGoToNextSubtitleAndFocusVideo = UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralGoToNextSubtitleAndFocusVideo);