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

Merge pull request #4896 from OmrSi/add-return-to-line-start-after-repeat

Browse Source 
Add return to line start after repeat
This commit is contained in:
Nikolaj Olsson 2021-03-17 18:52:56 +01:00 committed by GitHub
commit 5d28c2460d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libse/Common/Settings.cs
View File

@ -1095,6 +1095,7 @@ $HorzAlign = Center
public int AutoRepeatCount { get; set; }
public bool AutoContinueOn { get; set; }
public int AutoContinueDelay { get; set; }
public bool ReturnToStartAfterRepeat { get; set; }
public bool SyncListViewWithVideoWhilePlaying { get; set; }
public int AutoBackupSeconds { get; set; }
public int AutoBackupDeleteAfterMonths { get; set; }
@ -1257,6 +1258,7 @@ $HorzAlign = Center
AutoRepeatCount = 2;
AutoContinueOn = false;
AutoContinueDelay = 2;
ReturnToStartAfterRepeat = false;
SyncListViewWithVideoWhilePlaying = false;
AutoBackupSeconds = 60 * 5;
AutoBackupDeleteAfterMonths = 3;
@ -3172,16 +3174,22 @@ $HorzAlign = Center
settings.General.SyncListViewWithVideoWhilePlaying = Convert.ToBoolean(subNode.InnerText, CultureInfo.InvariantCulture);
}
subNode = node.SelectSingleNode("AutoContinueOn");
if (subNode != null)
{
settings.General.AutoContinueOn = Convert.ToBoolean(subNode.InnerText, CultureInfo.InvariantCulture);
}
subNode = node.SelectSingleNode("AutoContinueDelay");
if (subNode != null)
{
settings.General.AutoContinueDelay = Convert.ToInt32(subNode.InnerText, CultureInfo.InvariantCulture);
}
subNode = node.SelectSingleNode("AutoContinueOn");
subNode = node.SelectSingleNode("ReturnToStartAfterRepeat");
if (subNode != null)
{
settings.General.AutoContinueOn = Convert.ToBoolean(subNode.InnerText, CultureInfo.InvariantCulture);
settings.General.ReturnToStartAfterRepeat = Convert.ToBoolean(subNode.InnerText, CultureInfo.InvariantCulture);
}
subNode = node.SelectSingleNode("AutoBackupSeconds");
@ -8108,6 +8116,7 @@ $HorzAlign = Center
textWriter.WriteElementString("AutoRepeatCount", settings.General.AutoRepeatCount.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("AutoContinueOn", settings.General.AutoContinueOn.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("AutoContinueDelay", settings.General.AutoContinueDelay.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("ReturnToStartAfterRepeat", settings.General.ReturnToStartAfterRepeat.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("SyncListViewWithVideoWhilePlaying", settings.General.SyncListViewWithVideoWhilePlaying.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("AutoBackupSeconds", settings.General.AutoBackupSeconds.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("AutoBackupDeleteAfterMonths", settings.General.AutoBackupDeleteAfterMonths.ToString(CultureInfo.InvariantCulture));

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

@ -14621,12 +14621,7 @@ namespace Nikse.SubtitleEdit.Forms
}
else if (_shortcuts.MainGeneralGoToStartOfCurrentSubtitle == e.KeyData)
{
if (SubtitleListview1.SelectedItems.Count == 1 && mediaPlayer.VideoPlayer != null)
{
mediaPlayer.CurrentPosition = _subtitle.Paragraphs[SubtitleListview1.SelectedItems[0].Index].StartTime.TotalSeconds;
e.SuppressKeyPress = true;
}
GotoSubPositionAndPause();
e.SuppressKeyPress = true;
}
else if (_shortcuts.MainGeneralGoToEndOfCurrentSubtitle == e.KeyData)
@ -15186,10 +15181,7 @@ namespace Nikse.SubtitleEdit.Forms
}
else if (_shortcuts.MainVideoGoToStartCurrent == e.KeyData)
{
if (mediaPlayer.VideoPlayer != null)
{
GotoSubPositionAndPause();
}
GotoSubPositionAndPause();
e.SuppressKeyPress = true;
}
else if (_shortcuts.MainVideo3000MsLeft == e.KeyData)
@ -20567,6 +20559,11 @@ namespace Nikse.SubtitleEdit.Forms
private void GotoSubPositionAndPause(double adjustSeconds)
{
if (mediaPlayer.VideoPlayer is null)
{
return;
}
if (SubtitleListview1.SelectedItems.Count > 0)
{
int index = SubtitleListview1.SelectedItems[0].Index;
@ -20948,6 +20945,10 @@ namespace Nikse.SubtitleEdit.Forms
timerAutoContinue.Start();
}
}
else if (Configuration.Settings.General.ReturnToStartAfterRepeat)
{
GotoSubPositionAndPause();
}
}
}
}