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

Merge pull request #4401 from OmrSi/move-up-down-original

Browse Source 
Make "Move word up-down in current" work with original
This commit is contained in:
Nikolaj Olsson 2020-10-02 13:44:06 +02:00 committed by GitHub
commit baa38e2f65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/Forms/Main.cs
View File

@ -14719,14 +14719,28 @@ namespace Nikse.SubtitleEdit.Forms
}
e.SuppressKeyPress = true;
}
else if ((textBoxListViewText.Focused || (SubtitleListview1.Focused && SubtitleListview1.SelectedItems.Count == 1) || (audioVisualizer.Focused && SubtitleListview1.SelectedItems.Count == 1)) && _shortcuts.MainTextBoxMoveLastWordDownCurrent == e.KeyData)
else if (e.KeyData == _shortcuts.MainTextBoxMoveLastWordDownCurrent)
{
MoveWordUpDownInCurrent(true);
if (textBoxListViewTextAlternate.Focused)
{
MoveWordUpDownInCurrent(true, textBoxListViewTextAlternate);
}
else
{
MoveWordUpDownInCurrent(true, textBoxListViewText);
}
e.SuppressKeyPress = true;
}
else if ((textBoxListViewText.Focused || (SubtitleListview1.Focused && SubtitleListview1.SelectedItems.Count == 1) || (audioVisualizer.Focused && SubtitleListview1.SelectedItems.Count == 1)) && _shortcuts.MainTextBoxMoveFirstWordUpCurrent == e.KeyData)
else if (e.KeyData == _shortcuts.MainTextBoxMoveFirstWordUpCurrent)
{
MoveWordUpDownInCurrent(false);
if (textBoxListViewTextAlternate.Focused)
{
MoveWordUpDownInCurrent(false, textBoxListViewTextAlternate);
}
else
{
MoveWordUpDownInCurrent(false, textBoxListViewText);
}
e.SuppressKeyPress = true;
}
else if (_shortcuts.MainAutoCalcCurrentDuration == e.KeyData)
@ -15783,7 +15797,7 @@ namespace Nikse.SubtitleEdit.Forms
new BookmarkPersistence(_subtitle, _fileName).Save();
}
private void MoveWordUpDownInCurrent(bool down)
private void MoveWordUpDownInCurrent(bool down, TextBox tb)
{
int firstIndex = FirstSelectedIndex;
if (firstIndex < 0)
@ -15792,6 +15806,11 @@ namespace Nikse.SubtitleEdit.Forms
}
var p = _subtitle.GetParagraphOrDefault(firstIndex);
if (tb == textBoxListViewTextAlternate)
{
p = Utilities.GetOriginalParagraph(firstIndex, p, _subtitleAlternate.Paragraphs);
}
if (p == null)
{
return;
@ -15835,8 +15854,15 @@ namespace Nikse.SubtitleEdit.Forms
MakeHistoryForUndo(_language.BeforeLineUpdatedInListView);
var textCaretPos = textBoxListViewText.SelectionStart;
p.Text = newText;
SubtitleListview1.SetText(firstIndex, p.Text);
textBoxListViewText.Text = p.Text;
if (tb == textBoxListViewTextAlternate)
{
SubtitleListview1.SetAlternateText(firstIndex, p.Text);
}
else
{
SubtitleListview1.SetText(firstIndex, p.Text);
}
tb.Text = p.Text;
// keep cursor position
KeepCursorMoveWordUpdown(down, newText, oldText, textCaretPos);