mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Fixed new adjust selected lines 100 ms forward/back shortcut
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@863 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
parent
5759116ddc
commit
899b1430fe
@ -111,8 +111,8 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
Keys _mainAdjustSetStartAutoDurationAndGoToNext = Keys.None;
|
||||
Keys _mainAdjustSetStart = Keys.None;
|
||||
Keys _mainAdjustSetEnd = Keys.None;
|
||||
Keys _mainAdjustCurrent100MsForward = Keys.None;
|
||||
Keys _mainAdjustCurrent100MsBack = Keys.None;
|
||||
Keys _mainAdjustSelected100MsForward = Keys.None;
|
||||
Keys _mainAdjustSelected100MsBack = Keys.None;
|
||||
Keys _mainInsertAfter = Keys.None;
|
||||
Keys _mainInsertBefore = Keys.None;
|
||||
Keys _mainGoToNext = Keys.None;
|
||||
@ -7337,17 +7337,14 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
SetCurrentStartAutoDurationAndGotoNext(FirstSelectedIndex);
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (_mainAdjustCurrent100MsForward == e.KeyData)
|
||||
else if (_mainAdjustSelected100MsForward == e.KeyData)
|
||||
{
|
||||
TimeCode tc = new TimeCode(TimeSpan.FromMilliseconds(timeUpDownStartTime.TimeCode.TotalMilliseconds + 100));
|
||||
timeUpDownStartTime.MaskedTextBox.Text = tc.ToString();
|
||||
ShowEarlierOrLater(100, true);
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (_mainAdjustCurrent100MsBack == e.KeyData)
|
||||
else if (_mainAdjustSelected100MsBack == e.KeyData)
|
||||
{
|
||||
TimeCode tc = new TimeCode(TimeSpan.FromMilliseconds(timeUpDownStartTime.TimeCode.TotalMilliseconds - 100));
|
||||
if (tc.TotalMilliseconds > 0)
|
||||
timeUpDownStartTime.MaskedTextBox.Text = tc.ToString();
|
||||
ShowEarlierOrLater(-100, true);
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
}
|
||||
@ -9601,8 +9598,8 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
_mainAdjustSetStartAutoDurationAndGoToNext = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainAdjustSetStartAutoDurationAndGoToNext);
|
||||
_mainAdjustSetStart = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainAdjustSetStart);
|
||||
_mainAdjustSetEnd = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainAdjustSetEnd);
|
||||
_mainAdjustCurrent100MsForward = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainAdjustCurrent100MsForward);
|
||||
_mainAdjustCurrent100MsBack = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainAdjustCurrent100MsBack);
|
||||
_mainAdjustSelected100MsForward = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainAdjustSelected100MsForward);
|
||||
_mainAdjustSelected100MsBack = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainAdjustSelected100MsBack);
|
||||
_mainInsertAfter = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainInsertAfter);
|
||||
_mainInsertBefore = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainInsertBefore);
|
||||
_mainGoToNext = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainGoToNext);
|
||||
|
@ -494,10 +494,10 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
adjustNode.Nodes.Add(Configuration.Settings.Language.Settings.AdjustSetStartAutoDurationAndGoToNext + GetShortcutText(Configuration.Settings.Shortcuts.MainAdjustSetStartAutoDurationAndGoToNext));
|
||||
adjustNode.Nodes.Add(Configuration.Settings.Language.Main.VideoControls.SetStartTime + GetShortcutText(Configuration.Settings.Shortcuts.MainAdjustSetStart));
|
||||
adjustNode.Nodes.Add(Configuration.Settings.Language.Main.VideoControls.SetEndTime + GetShortcutText(Configuration.Settings.Shortcuts.MainAdjustSetEnd));
|
||||
if (!string.IsNullOrEmpty(Configuration.Settings.Language.Settings.AdjustCurrent100MsForward)) // TODO: Remove in SE 3.3
|
||||
adjustNode.Nodes.Add(Configuration.Settings.Language.Settings.AdjustCurrent100MsForward + GetShortcutText(Configuration.Settings.Shortcuts.MainAdjustCurrent100MsForward));
|
||||
if (!string.IsNullOrEmpty(Configuration.Settings.Language.Settings.AdjustCurrent100MsBack)) // TODO: Remove in SE 3.3
|
||||
adjustNode.Nodes.Add(Configuration.Settings.Language.Settings.AdjustCurrent100MsBack + GetShortcutText(Configuration.Settings.Shortcuts.MainAdjustCurrent100MsBack));
|
||||
if (!string.IsNullOrEmpty(Configuration.Settings.Language.Settings.AdjustSelected100MsForward)) // TODO: Remove in SE 3.3
|
||||
adjustNode.Nodes.Add(Configuration.Settings.Language.Settings.AdjustSelected100MsForward + GetShortcutText(Configuration.Settings.Shortcuts.MainAdjustSelected100MsForward));
|
||||
if (!string.IsNullOrEmpty(Configuration.Settings.Language.Settings.AdjustSelected100MsBack)) // TODO: Remove in SE 3.3
|
||||
adjustNode.Nodes.Add(Configuration.Settings.Language.Settings.AdjustSelected100MsBack + GetShortcutText(Configuration.Settings.Shortcuts.MainAdjustSelected100MsBack));
|
||||
treeViewShortcuts.Nodes.Add(adjustNode);
|
||||
|
||||
TreeNode audioVisualizerNode = new TreeNode(Configuration.Settings.Language.Settings.WaveformAndSpectrogram);
|
||||
@ -988,10 +988,10 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
Configuration.Settings.Shortcuts.MainAdjustSetStart = GetShortcut(node.Text);
|
||||
else if (text == Configuration.Settings.Language.Main.VideoControls.SetEndTime.Replace("&", string.Empty))
|
||||
Configuration.Settings.Shortcuts.MainAdjustSetEnd = GetShortcut(node.Text);
|
||||
else if (Configuration.Settings.Language.Settings.AdjustCurrent100MsForward != null && text == Configuration.Settings.Language.Settings.AdjustCurrent100MsForward.Replace("&", string.Empty))
|
||||
Configuration.Settings.Shortcuts.MainAdjustCurrent100MsForward = GetShortcut(node.Text);
|
||||
else if (Configuration.Settings.Language.Settings.AdjustCurrent100MsBack != null && text == Configuration.Settings.Language.Settings.AdjustCurrent100MsBack.Replace("&", string.Empty))
|
||||
Configuration.Settings.Shortcuts.MainAdjustCurrent100MsBack = GetShortcut(node.Text);
|
||||
else if (Configuration.Settings.Language.Settings.AdjustSelected100MsForward != null && text == Configuration.Settings.Language.Settings.AdjustSelected100MsForward.Replace("&", string.Empty))
|
||||
Configuration.Settings.Shortcuts.MainAdjustSelected100MsForward = GetShortcut(node.Text);
|
||||
else if (Configuration.Settings.Language.Settings.AdjustSelected100MsBack != null && text == Configuration.Settings.Language.Settings.AdjustSelected100MsBack.Replace("&", string.Empty))
|
||||
Configuration.Settings.Shortcuts.MainAdjustSelected100MsBack = GetShortcut(node.Text);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1271,8 +1271,8 @@ can edit in same subtitle file (collaboration)",
|
||||
ToggleDockUndockOfVideoControls = "Toggle dock/undock of video controls",
|
||||
AdjustViaEndAutoStartAndGoToNext = "Adjust via end position and go to next",
|
||||
AdjustSetStartAutoDurationAndGoToNext = "Set start, auto duration and go to next",
|
||||
AdjustCurrent100MsForward = "Move current line 100 ms forward",
|
||||
AdjustCurrent100MsBack = "Move current line 100 ms back",
|
||||
AdjustSelected100MsForward = "Move selected lines 100 ms forward",
|
||||
AdjustSelected100MsBack = "Move selected lines 100 ms back",
|
||||
GoToNext = "Go to next line",
|
||||
GoToPrevious = "Go to prevoius line",
|
||||
ToggleDialogueDashes = "Toogle dialogue dashes",
|
||||
|
@ -1200,8 +1200,8 @@
|
||||
public string ToggleDockUndockOfVideoControls { get; set; }
|
||||
public string AdjustViaEndAutoStartAndGoToNext { get; set; }
|
||||
public string AdjustSetStartAutoDurationAndGoToNext { get; set; }
|
||||
public string AdjustCurrent100MsForward { get; set; }
|
||||
public string AdjustCurrent100MsBack { get; set; }
|
||||
public string AdjustSelected100MsForward { get; set; }
|
||||
public string AdjustSelected100MsBack { get; set; }
|
||||
public string GoToNext { get; set; }
|
||||
public string GoToPrevious { get; set; }
|
||||
public string ToggleDialogueDashes { get; set; }
|
||||
|
@ -468,8 +468,8 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
public string MainAdjustSetStartAutoDurationAndGoToNext { get; set; }
|
||||
public string MainAdjustSetStart { get; set; }
|
||||
public string MainAdjustSetEnd { get; set; }
|
||||
public string MainAdjustCurrent100MsForward { get; set; }
|
||||
public string MainAdjustCurrent100MsBack { get; set; }
|
||||
public string MainAdjustSelected100MsForward { get; set; }
|
||||
public string MainAdjustSelected100MsBack { get; set; }
|
||||
public string MainInsertAfter { get; set; }
|
||||
public string MainInsertBefore { get; set; }
|
||||
public string MainGoToNext { get; set; }
|
||||
@ -510,8 +510,8 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
MainAdjustSetStartAutoDurationAndGoToNext = string.Empty;
|
||||
MainAdjustSetStart = string.Empty;
|
||||
MainAdjustSetEnd = string.Empty;
|
||||
MainAdjustCurrent100MsForward = string.Empty;
|
||||
MainAdjustCurrent100MsBack = string.Empty;
|
||||
MainAdjustSelected100MsForward = string.Empty;
|
||||
MainAdjustSelected100MsBack = string.Empty;
|
||||
MainInsertAfter = "Alt+Ins";
|
||||
MainInsertBefore = "Control+Shift+Ins";
|
||||
WaveformVerticalZoom = string.Empty;
|
||||
@ -1295,12 +1295,12 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
subNode = node.SelectSingleNode("MainAdjustSetEnd");
|
||||
if (subNode != null)
|
||||
settings.Shortcuts.MainAdjustSetEnd = subNode.InnerText;
|
||||
subNode = node.SelectSingleNode("MainAdjustCurrent100MsForward");
|
||||
subNode = node.SelectSingleNode("MainAdjustSelected100MsForward");
|
||||
if (subNode != null)
|
||||
settings.Shortcuts.MainAdjustCurrent100MsForward = subNode.InnerText;
|
||||
subNode = node.SelectSingleNode("MainAdjustCurrent100MsBack");
|
||||
settings.Shortcuts.MainAdjustSelected100MsForward = subNode.InnerText;
|
||||
subNode = node.SelectSingleNode("MainAdjustSelected100MsBack");
|
||||
if (subNode != null)
|
||||
settings.Shortcuts.MainAdjustCurrent100MsBack = subNode.InnerText;
|
||||
settings.Shortcuts.MainAdjustSelected100MsBack = subNode.InnerText;
|
||||
subNode = node.SelectSingleNode("MainInsertAfter");
|
||||
if (subNode != null)
|
||||
settings.Shortcuts.MainInsertAfter = subNode.InnerText;
|
||||
@ -1617,8 +1617,8 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
textWriter.WriteElementString("MainAdjustSetStartAutoDurationAndGoToNext", settings.Shortcuts.MainAdjustSetStartAutoDurationAndGoToNext);
|
||||
textWriter.WriteElementString("MainAdjustSetStart", settings.Shortcuts.MainAdjustSetStart);
|
||||
textWriter.WriteElementString("MainAdjustSetEnd", settings.Shortcuts.MainAdjustSetEnd);
|
||||
textWriter.WriteElementString("MainAdjustCurrent100MsForward", settings.Shortcuts.MainAdjustCurrent100MsForward);
|
||||
textWriter.WriteElementString("MainAdjustCurrent100MsBack", settings.Shortcuts.MainAdjustCurrent100MsBack);
|
||||
textWriter.WriteElementString("MainAdjustSelected100MsForward", settings.Shortcuts.MainAdjustSelected100MsForward);
|
||||
textWriter.WriteElementString("MainAdjustSelected100MsBack", settings.Shortcuts.MainAdjustSelected100MsBack);
|
||||
textWriter.WriteElementString("MainInsertAfter", settings.Shortcuts.MainInsertAfter);
|
||||
textWriter.WriteElementString("MainInsertBefore", settings.Shortcuts.MainInsertBefore);
|
||||
textWriter.WriteElementString("MainGoToNext", settings.Shortcuts.MainGoToNext);
|
||||
|
Loading…
Reference in New Issue
Block a user