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

"Select current subtitle while playing" now works again - thx uknown :)

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1863 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2013-06-09 13:24:34 +00:00
parent f2951cdc03
commit 6f1dcc194c
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Forms/Main.cs
View File

@ -11359,7 +11359,24 @@ namespace Nikse.SubtitleEdit.Forms
{
ShowSubtitleTimer.Stop();
if (mediaPlayer != null)
ShowSubtitle();
{
int index = ShowSubtitle();
if (index != -1 && checkBoxSyncListViewWithVideoWhilePlaying.Checked)
{
if ((DateTime.Now.Ticks - _lastTextKeyDownTicks) > 10000 * 700) // only if last typed char was entered > 700 milliseconds
{
if (_endSeconds <= 0 || !checkBoxAutoRepeatOn.Checked)
{
if (!timerAutoDuration.Enabled && !mediaPlayer.IsPaused)
{
SubtitleListview1.BeginUpdate();
SubtitleListview1.SelectIndexAndEnsureVisible(index, true);
SubtitleListview1.EndUpdate();
}
}
}
}
}
ShowSubtitleTimer.Start();
}
@ -12168,21 +12185,6 @@ namespace Nikse.SubtitleEdit.Forms
timeUpDownVideoPosition.TimeCode = new TimeCode(TimeSpan.FromMilliseconds(mediaPlayer.CurrentPosition * 1000.0));
timeUpDownVideoPositionAdjust.TimeCode = new TimeCode(TimeSpan.FromMilliseconds(mediaPlayer.CurrentPosition * 1000.0));
mediaPlayer.RefreshProgressBar();
if (index != -1 && checkBoxSyncListViewWithVideoWhilePlaying.Checked)
{
if ((DateTime.Now.Ticks - _lastTextKeyDownTicks) > 10000 * 700) // only if last typed char was entered > 700 milliseconds
{
if (_endSeconds <= 0 || !checkBoxAutoRepeatOn.Checked)
{
if (!timerAutoDuration.Enabled && !mediaPlayer.IsPaused)
{
SubtitleListview1.BeginUpdate();
SubtitleListview1.SelectIndexAndEnsureVisible(index, true);
SubtitleListview1.EndUpdate();
}
}
}
}
trackBarWaveFormPosition.ValueChanged -= trackBarWaveFormPosition_ValueChanged;
int value = (int)mediaPlayer.CurrentPosition;

18
src/Forms/Main.resx
View File

@ -570,7 +570,7 @@
<value>607, 17</value>
</metadata>
<metadata name="fontDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>493, 56</value>
<value>380, 55</value>
</metadata>
<metadata name="toolStripWaveControls.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>208, 56</value>
@ -653,16 +653,16 @@
<value>485, 56</value>
</metadata>
<metadata name="timerAutoDuration.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>721, 56</value>
<value>633, 58</value>
</metadata>
<metadata name="timerAutoContinue.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1058, 56</value>
<value>974, 65</value>
</metadata>
<metadata name="timerStillTyping.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1214, 56</value>
<value>1137, 69</value>
</metadata>
<metadata name="timerWaveForm.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1351, 56</value>
<value>1264, 68</value>
</metadata>
<metadata name="contextMenuStripWaveForm.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1130, 17</value>
@ -671,17 +671,17 @@
<value>231, 17</value>
</metadata>
<metadata name="contextMenuStripEmpty.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>875, 56</value>
<value>782, 62</value>
</metadata>
<metadata name="imageListPlayRate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>980, 17</value>
</metadata>
<data name="imageListPlayRate.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
CAAAAk1TRnQBSQFMAgEBAgEAAXgBHwF4AR8BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAAYgBHwGIAR8BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@ -729,7 +729,7 @@
<value>150, 95</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>115</value>
<value>232</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>