mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Handle "e.Handle = true;" better - thx OmrSi :)
This commit is contained in:
parent
e23634e29f
commit
fbb5467e4e
@ -2024,20 +2024,17 @@ namespace Nikse.SubtitleEdit.Controls
|
||||
{
|
||||
ZoomIn();
|
||||
e.SuppressKeyPress = true;
|
||||
e.Handled = true;
|
||||
}
|
||||
else if (e.Modifiers == Keys.None && e.KeyCode == Keys.Subtract)
|
||||
{
|
||||
ZoomOut();
|
||||
e.SuppressKeyPress = true;
|
||||
e.Handled = true;
|
||||
}
|
||||
else if (e.Modifiers == Keys.Control && e.KeyCode == Keys.D0)
|
||||
{
|
||||
ZoomFactor = 1.0;
|
||||
OnZoomedChanged?.Invoke(this, null);
|
||||
e.SuppressKeyPress = true;
|
||||
e.Handled = true;
|
||||
}
|
||||
else if (e.Modifiers == Keys.None && e.KeyCode == Keys.Z)
|
||||
{
|
||||
@ -2047,7 +2044,6 @@ namespace Nikse.SubtitleEdit.Controls
|
||||
OnPositionSelected?.Invoke(this, new ParagraphEventArgs(_startPositionSeconds, null));
|
||||
Invalidate();
|
||||
e.SuppressKeyPress = true;
|
||||
e.Handled = true;
|
||||
}
|
||||
}
|
||||
else if (e.Modifiers == Keys.None && e.KeyCode == Keys.X)
|
||||
@ -2058,7 +2054,6 @@ namespace Nikse.SubtitleEdit.Controls
|
||||
OnPositionSelected?.Invoke(this, new ParagraphEventArgs(_startPositionSeconds, null));
|
||||
Invalidate();
|
||||
e.SuppressKeyPress = true;
|
||||
e.Handled = true;
|
||||
}
|
||||
}
|
||||
else if (e.Modifiers == Keys.Alt && e.KeyCode == Keys.C)
|
||||
@ -2066,7 +2061,6 @@ namespace Nikse.SubtitleEdit.Controls
|
||||
Locked = !Locked;
|
||||
Invalidate();
|
||||
e.SuppressKeyPress = true;
|
||||
e.Handled = true;
|
||||
}
|
||||
else if (e.KeyData == InsertAtVideoPositionShortcut)
|
||||
{
|
||||
@ -2074,7 +2068,6 @@ namespace Nikse.SubtitleEdit.Controls
|
||||
{
|
||||
InsertAtVideoPosition.Invoke(this, null);
|
||||
e.SuppressKeyPress = true;
|
||||
e.Handled = true;
|
||||
}
|
||||
}
|
||||
else if (e.KeyCode == Keys.V && e.Modifiers == Keys.Control) //Ctrl+v = Paste from clipboard
|
||||
@ -2083,7 +2076,6 @@ namespace Nikse.SubtitleEdit.Controls
|
||||
{
|
||||
PasteAtVideoPosition.Invoke(this, null);
|
||||
e.SuppressKeyPress = true;
|
||||
e.Handled = true;
|
||||
}
|
||||
}
|
||||
else if (e.KeyData == Move100MsLeft)
|
||||
@ -2092,7 +2084,6 @@ namespace Nikse.SubtitleEdit.Controls
|
||||
OnPositionSelected?.Invoke(this, new ParagraphEventArgs(pos, null));
|
||||
Invalidate();
|
||||
e.SuppressKeyPress = true;
|
||||
e.Handled = true;
|
||||
}
|
||||
else if (e.KeyData == Move100MsRight)
|
||||
{
|
||||
@ -2100,7 +2091,6 @@ namespace Nikse.SubtitleEdit.Controls
|
||||
OnPositionSelected?.Invoke(this, new ParagraphEventArgs(pos, null));
|
||||
Invalidate();
|
||||
e.SuppressKeyPress = true;
|
||||
e.Handled = true;
|
||||
}
|
||||
else if (e.KeyData == MoveOneSecondLeft)
|
||||
{
|
||||
@ -2108,7 +2098,6 @@ namespace Nikse.SubtitleEdit.Controls
|
||||
OnPositionSelected?.Invoke(this, new ParagraphEventArgs(pos, null));
|
||||
Invalidate();
|
||||
e.SuppressKeyPress = true;
|
||||
e.Handled = true;
|
||||
}
|
||||
else if (e.KeyData == MoveOneSecondRight)
|
||||
{
|
||||
@ -2116,7 +2105,6 @@ namespace Nikse.SubtitleEdit.Controls
|
||||
OnPositionSelected?.Invoke(this, new ParagraphEventArgs(pos, null));
|
||||
Invalidate();
|
||||
e.SuppressKeyPress = true;
|
||||
e.Handled = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -540,14 +540,14 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
{
|
||||
_index = 0;
|
||||
ShowCurrent();
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
return;
|
||||
}
|
||||
if (e.Modifiers == Keys.Control && e.KeyCode == Keys.End)
|
||||
{
|
||||
_index = _subtitle.Paragraphs.Count - 1;
|
||||
ShowCurrent();
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
return;
|
||||
}
|
||||
|
||||
@ -564,7 +564,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
_index++;
|
||||
}
|
||||
ShowCurrent();
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (_mainGeneralGoToPrevSubtitle == e.KeyData || (e.KeyCode == Keys.Up && e.Modifiers == Keys.Alt))
|
||||
{
|
||||
@ -573,7 +573,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
_index--;
|
||||
}
|
||||
ShowCurrent();
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (e.Modifiers == Keys.None && e.KeyCode == Keys.PageDown)
|
||||
{
|
||||
@ -586,7 +586,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
_index = _subtitle.Paragraphs.Count - 1;
|
||||
}
|
||||
ShowCurrent();
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (e.Modifiers == Keys.None && e.KeyCode == Keys.PageUp)
|
||||
{
|
||||
@ -599,7 +599,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
_index = 0;
|
||||
}
|
||||
ShowCurrent();
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
return;
|
||||
}
|
||||
@ -616,7 +616,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
_showIndex = -2;
|
||||
_fullscreen = false;
|
||||
ShowCurrent();
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (e.KeyCode == Keys.Pause)
|
||||
{
|
||||
@ -641,7 +641,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
timer1.Start();
|
||||
}
|
||||
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (e.KeyCode == Keys.Up && e.Modifiers == Keys.Alt)
|
||||
{
|
||||
@ -670,7 +670,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
_index = _subtitle.Paragraphs.Count - 1;
|
||||
}
|
||||
ShowCurrent();
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (e.Modifiers == Keys.None && e.KeyCode == Keys.PageUp)
|
||||
{
|
||||
@ -683,7 +683,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
_index = 0;
|
||||
}
|
||||
ShowCurrent();
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (e.Modifiers == Keys.None && e.KeyCode == Keys.Add)
|
||||
{
|
||||
|
@ -1,6 +1,7 @@
|
||||
using Nikse.SubtitleEdit.Controls;
|
||||
using Nikse.SubtitleEdit.Core;
|
||||
using Nikse.SubtitleEdit.Core.SubtitleFormats;
|
||||
using Nikse.SubtitleEdit.Core.Translate;
|
||||
using Nikse.SubtitleEdit.Logic;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
@ -9,7 +10,6 @@ using System.Linq;
|
||||
using System.Net;
|
||||
using System.Text;
|
||||
using System.Windows.Forms;
|
||||
using Nikse.SubtitleEdit.Core.Translate;
|
||||
|
||||
namespace Nikse.SubtitleEdit.Forms
|
||||
{
|
||||
@ -482,7 +482,6 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
else if (e.KeyCode == Keys.Escape && labelPleaseWait.Visible)
|
||||
{
|
||||
_breakTranslation = true;
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (e.KeyCode == UiUtil.HelpKeys)
|
||||
|
@ -13765,7 +13765,6 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
{
|
||||
// if it's less than one second since Win key was pressed we ignore key (not perfect...)
|
||||
e.SuppressKeyPress = true;
|
||||
e.Handled = true;
|
||||
return;
|
||||
}
|
||||
|
||||
@ -13963,13 +13962,11 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
|
||||
e.SuppressKeyPress = true;
|
||||
e.Handled = true;
|
||||
}
|
||||
else if (_shortcuts.MainGeneralGoToNextSubtitle == e.KeyData)
|
||||
{
|
||||
MoveNextPrevious(0);
|
||||
e.SuppressKeyPress = true;
|
||||
e.Handled = true;
|
||||
}
|
||||
else if (_shortcuts.MainGeneralGoToNextSubtitleCursorAtEnd == e.KeyData)
|
||||
{
|
||||
@ -13977,7 +13974,6 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
textBoxListViewText.SelectionStart = textBoxListViewText.Text.Length;
|
||||
textBoxListViewText.SelectionLength = 0;
|
||||
e.SuppressKeyPress = true;
|
||||
e.Handled = true;
|
||||
}
|
||||
else if (_shortcuts.MainGeneralGoToPrevSubtitle == e.KeyData)
|
||||
{
|
||||
@ -13991,7 +13987,6 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
|
||||
e.SuppressKeyPress = true;
|
||||
e.Handled = true;
|
||||
}
|
||||
else if (_shortcuts.MainGeneralGoToStartOfCurrentSubtitle == e.KeyData)
|
||||
{
|
||||
@ -14092,49 +14087,41 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
else if (_shortcuts.MainUnbreakNoSpace == e.KeyData)
|
||||
{
|
||||
Unbreak(true);
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (_shortcuts.MainGeneralToggleBookmarks == e.KeyData)
|
||||
{
|
||||
ToggleBookmarks(false);
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (_shortcuts.MainGeneralClearBookmarks == e.KeyData)
|
||||
{
|
||||
ClearBookmarks();
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (_shortcuts.MainGeneralGoToBookmark == e.KeyData)
|
||||
{
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
GoToBookmark();
|
||||
}
|
||||
else if (_shortcuts.MainGeneralGoToPreviousBookmark == e.KeyData)
|
||||
{
|
||||
GoToPrevoiusBookmark();
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (_shortcuts.MainGeneralGoToNextBookmark == e.KeyData)
|
||||
{
|
||||
GoToNextBookmark();
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (_shortcuts.MainGeneralChooseProfile == e.KeyData)
|
||||
{
|
||||
ChooseProfile();
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (_shortcuts.MainGeneralDuplicateLine == e.KeyData && SubtitleListview1.SelectedItems.Count == 1)
|
||||
{
|
||||
DuplicateLine();
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (_shortcuts.MainGeneralFileSaveAll == e.KeyData)
|
||||
@ -14293,7 +14280,6 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
|
||||
_endSeconds = -1;
|
||||
e.SuppressKeyPress = true;
|
||||
e.Handled = true;
|
||||
System.Threading.SynchronizationContext.Current.Post(TimeSpan.FromMilliseconds(1), () => mediaPlayer.TogglePlayPause());
|
||||
}
|
||||
}
|
||||
@ -14304,7 +14290,6 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
_endSeconds = -1;
|
||||
mediaPlayer.Pause();
|
||||
e.SuppressKeyPress = true;
|
||||
e.Handled = true;
|
||||
}
|
||||
}
|
||||
else if (_shortcuts.MainVideoPlayFromJustBefore == e.KeyData)
|
||||
@ -14337,7 +14322,6 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
_endSeconds = -1;
|
||||
mediaPlayer.TogglePlayPause();
|
||||
e.SuppressKeyPress = true;
|
||||
e.Handled = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -8170,7 +8170,6 @@ namespace Nikse.SubtitleEdit.Forms.Ocr
|
||||
subtitleListView1.SelectedIndexChanged -= SubtitleListView1SelectedIndexChanged;
|
||||
subtitleListView1.SelectAll();
|
||||
subtitleListView1.SelectedIndexChanged += SubtitleListView1SelectedIndexChanged;
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
|
||||
@ -8179,7 +8178,6 @@ namespace Nikse.SubtitleEdit.Forms.Ocr
|
||||
subtitleListView1.SelectedIndexChanged -= SubtitleListView1SelectedIndexChanged;
|
||||
subtitleListView1.SelectFirstSelectedItemOnly();
|
||||
subtitleListView1.SelectedIndexChanged += SubtitleListView1SelectedIndexChanged;
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (e.KeyCode == Keys.I && e.Modifiers == (Keys.Control | Keys.Shift)) //InverseSelection
|
||||
@ -8187,13 +8185,11 @@ namespace Nikse.SubtitleEdit.Forms.Ocr
|
||||
subtitleListView1.SelectedIndexChanged -= SubtitleListView1SelectedIndexChanged;
|
||||
subtitleListView1.InverseSelection();
|
||||
subtitleListView1.SelectedIndexChanged += SubtitleListView1SelectedIndexChanged;
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (e.Modifiers == Keys.None && e.KeyCode == Keys.Delete)
|
||||
{
|
||||
DeleteToolStripMenuItemClick(sender, e);
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
subtitleListView1.Focus();
|
||||
}
|
||||
|
@ -93,12 +93,12 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
else if (e.KeyCode == Keys.Up && e.Modifiers == Keys.Alt && IsFullscreen)
|
||||
{
|
||||
_mainForm.GotoPrevSubPosFromvideoPos();
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (e.Modifiers == Keys.Alt && e.KeyCode == Keys.Down && IsFullscreen)
|
||||
{
|
||||
_mainForm.GotoNextSubPosFromVideoPos();
|
||||
e.Handled = true;
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (_redockKeys == e.KeyData)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user