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

Fix vlc drag'n'drop video

Browse Source
This commit is contained in:
Nikolaj Olsson 2018-02-25 09:24:09 +01:00
parent 67ce735018
commit c5609bf0d6
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Forms/Main.cs
View File

@ -246,6 +246,7 @@ namespace Nikse.SubtitleEdit.Forms
private static object _syncUndo = new object(); private static object _syncUndo = new object();
private string[] _dragAndDropFiles; private string[] _dragAndDropFiles;
private readonly Timer _dragAndDropTimer = new Timer(); // to prevent locking windows explorer private readonly Timer _dragAndDropTimer = new Timer(); // to prevent locking windows explorer
private readonly Timer _dragAndDropVideoTimer = new Timer(); // to prevent locking windows explorer
private long _labelNextTicks = -1; private long _labelNextTicks = -1;
public bool IsMenuOpen { get; private set; } public bool IsMenuOpen { get; private set; }
@ -16248,6 +16249,9 @@ namespace Nikse.SubtitleEdit.Forms
_dragAndDropTimer.Interval = 50; _dragAndDropTimer.Interval = 50;
_dragAndDropTimer.Tick += DoSubtitleListview1Drop; _dragAndDropTimer.Tick += DoSubtitleListview1Drop;
_dragAndDropVideoTimer.Interval = 50;
_dragAndDropVideoTimer.Tick += DropVideoTick;
if (_exitWhenLoaded) if (_exitWhenLoaded)
Application.Exit(); Application.Exit();
@ -16923,6 +16927,12 @@ namespace Nikse.SubtitleEdit.Forms
} }
} }
private void DropVideoTick(object sender, EventArgs e)
{
_dragAndDropVideoTimer.Stop();
OpenVideo(_videoFileName);
}
private void mediaPlayer_DragDrop(object sender, DragEventArgs e) private void mediaPlayer_DragDrop(object sender, DragEventArgs e)
{ {
var files = (string[])e.Data.GetData(DataFormats.FileDrop); var files = (string[])e.Data.GetData(DataFormats.FileDrop);
@ -16938,7 +16948,8 @@ namespace Nikse.SubtitleEdit.Forms
saveFileDialog1.InitialDirectory = dirName; saveFileDialog1.InitialDirectory = dirName;
openFileDialog1.InitialDirectory = dirName; openFileDialog1.InitialDirectory = dirName;
} }
OpenVideo(fileName); _videoFileName = fileName;
_dragAndDropVideoTimer.Start();
} }
else else
{ {