Minor refectoring

git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1032 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2012-03-11 08:23:07 +00:00
parent a4481ede92
commit 0d775ccfc4
7 changed files with 304 additions and 280 deletions

View File

@ -9,18 +9,18 @@ namespace Nikse.SubtitleEdit.Controls
public sealed class VideoPlayerContainer : Panel
{
class RichTextBoxViewOnly : System.Windows.Forms.RichTextBox
class RichTextBoxViewOnly : RichTextBox
{
public RichTextBoxViewOnly()
{
base.ReadOnly = true;
base.BorderStyle = BorderStyle.None;
base.TabStop = false;
base.SetStyle(ControlStyles.Selectable, false);
base.SetStyle(ControlStyles.UserMouse, true);
base.MouseEnter += delegate(object sender, EventArgs e) { this.Cursor = Cursors.Default; };
base.ScrollBars = RichTextBoxScrollBars.None;
base.Margin = new System.Windows.Forms.Padding(0);
ReadOnly = true;
BorderStyle = BorderStyle.None;
TabStop = false;
SetStyle(ControlStyles.Selectable, false);
SetStyle(ControlStyles.UserMouse, true);
MouseEnter += delegate { Cursor = Cursors.Default; };
ScrollBars = RichTextBoxScrollBars.None;
Margin = new Padding(0);
}
protected override void WndProc(ref Message m)
@ -41,7 +41,12 @@ namespace Nikse.SubtitleEdit.Controls
public VideoPlayer VideoPlayer
{
get { return _videoPlayer; }
set { _videoPlayer = value; }
set
{
_videoPlayer = value;
if (_videoPlayer != null)
SetPlayerName(_videoPlayer.PlayerName);
}
}
public int VideoWidth { get; set; }
@ -79,6 +84,7 @@ namespace Nikse.SubtitleEdit.Controls
private PictureBox _pictureBoxVolumeBarBackground = new PictureBox();
private PictureBox _pictureBoxVolumeBar = new PictureBox();
private Label _labelTimeCode = new Label();
private Label _labelVideoPlayerName = new Label();
public RightToLeft TextRightToLeft
{
@ -116,7 +122,7 @@ namespace Nikse.SubtitleEdit.Controls
public VideoPlayerContainer()
{
FontSizeFactor = 1.0F;
BorderStyle = System.Windows.Forms.BorderStyle.None;
BorderStyle = BorderStyle.None;
_resources = new System.ComponentModel.ComponentResourceManager(typeof(VideoPlayerContainer));
BackColor = _backgroundColor;
Controls.Add(MakePlayerPanel());
@ -146,7 +152,7 @@ namespace Nikse.SubtitleEdit.Controls
_pictureBoxProgressBar.Width = 0;
PanelPlayer.MouseDown += PanelPlayer_MouseDown;
PanelPlayer.MouseDown += PanelPlayerMouseDown;
}
public void EnableMouseWheelStep()
@ -154,14 +160,25 @@ namespace Nikse.SubtitleEdit.Controls
AddMouseWheelEvent(this);
}
public void SetPlayerName(string s)
{
_labelVideoPlayerName.Text = s;
_labelVideoPlayerName.Left = Width - _labelVideoPlayerName.Width - 3;
}
public void ResetTimeLabel()
{
_labelTimeCode.Text = string.Empty;
}
private void AddMouseWheelEvent(Control control)
{
control.MouseWheel += Control_MouseWheel;
control.MouseWheel += ControlMouseWheel;
foreach (Control ctrl in control.Controls)
AddMouseWheelEvent(ctrl);
}
void Control_MouseWheel(object sender, MouseEventArgs e)
private void ControlMouseWheel(object sender, MouseEventArgs e)
{
int delta = e.Delta;
double newPosition = CurrentPosition - (delta / 256.0);
@ -174,39 +191,38 @@ namespace Nikse.SubtitleEdit.Controls
private Control MakeSubtitlesPanel()
{
_panelSubtitle = new Panel { BackColor = _backgroundColor, Left = 0, Top = 0 };
_panelSubtitle.Height = SubtitlesHeight + 1;
_panelSubtitle = new Panel {BackColor = _backgroundColor, Left = 0, Top = 0, Height = SubtitlesHeight + 1};
_subtitleTextBox = new RichTextBoxViewOnly();
_panelSubtitle.Controls.Add(_subtitleTextBox);
_subtitleTextBox.BackColor = _backgroundColor;
_subtitleTextBox.ForeColor = Color.White;
_subtitleTextBox.Dock = DockStyle.Fill;
SetSubtitleFont();
_subtitleTextBox.MouseClick += SubtitleTextBox_MouseClick;
_subtitleTextBox.MouseClick += SubtitleTextBoxMouseClick;
return _panelSubtitle;
}
public void SetSubtitleFont()
{
var gs = Nikse.SubtitleEdit.Logic.Configuration.Settings.General;
var gs = Logic.Configuration.Settings.General;
if (string.IsNullOrEmpty(gs.SubtitleFontName))
gs.SubtitleFontName = "Tahoma";
_subtitleTextBox.Font = new Font(gs.SubtitleFontName, gs.VideoPlayerPreviewFontSize * FontSizeFactor, FontStyle.Bold);
}
void SubtitleTextBox_MouseClick(object sender, MouseEventArgs e)
private void SubtitleTextBoxMouseClick(object sender, MouseEventArgs e)
{
TogglePlayPause();
}
private static string RemoveSubStationAlphaFormatting(string s)
{
int indexOfBegin = s.IndexOf("{");
while (indexOfBegin >= 0 && s.IndexOf("}") > indexOfBegin)
int indexOfBegin = s.IndexOf("{", StringComparison.Ordinal);
while (indexOfBegin >= 0 && s.IndexOf("}", StringComparison.Ordinal) > indexOfBegin)
{
int indexOfEnd = s.IndexOf("}");
int indexOfEnd = s.IndexOf("}", StringComparison.Ordinal);
s = s.Remove(indexOfBegin, (indexOfEnd - indexOfBegin) + 1);
indexOfBegin = s.IndexOf("{");
indexOfBegin = s.IndexOf("{", StringComparison.Ordinal);
}
return s;
}
@ -234,13 +250,13 @@ namespace Nikse.SubtitleEdit.Controls
text = Logic.Utilities.RemoveHtmlFontTag(text);
// display italic
StringBuilder sb = new StringBuilder();
var sb = new StringBuilder();
int i = 0;
bool isItalic = false;
int italicBegin = 0;
_subtitleTextBox.Text = string.Empty;
int letterCount = 0;
System.Collections.Generic.Dictionary<int, int> italicLookups = new System.Collections.Generic.Dictionary<int, int>();
var italicLookups = new System.Collections.Generic.Dictionary<int, int>();
while (i < text.Length)
{
if (text.Substring(i).ToLower().StartsWith("<i>"))
@ -276,10 +292,8 @@ namespace Nikse.SubtitleEdit.Controls
_subtitleTextBox.DeselectAll();
foreach (var entry in italicLookups)
{
System.Drawing.Font currentFont = _subtitleTextBox.SelectionFont;
System.Drawing.FontStyle newFontStyle = FontStyle.Italic;
// if (Nikse.SubtitleEdit.Logic.Configuration.Settings.General.SubtitleFontBold)
newFontStyle = FontStyle.Italic | FontStyle.Bold;
Font currentFont = _subtitleTextBox.SelectionFont;
FontStyle newFontStyle = FontStyle.Italic | FontStyle.Bold;
_subtitleTextBox.SelectionStart = entry.Key;
_subtitleTextBox.SelectionLength = entry.Value;
_subtitleTextBox.SelectionFont = new Font(currentFont.FontFamily, currentFont.Size, newFontStyle);
@ -288,7 +302,7 @@ namespace Nikse.SubtitleEdit.Controls
}
}
void PanelPlayer_MouseDown(object sender, MouseEventArgs e)
private void PanelPlayerMouseDown(object sender, MouseEventArgs e)
{
TogglePlayPause();
}
@ -501,66 +515,79 @@ namespace Nikse.SubtitleEdit.Controls
_panelcontrols.Controls.Add(_pictureBoxVolumeBar);
_pictureBoxVolumeBar.BringToFront();
_pictureBoxReverse = new PictureBox();
_pictureBoxReverse.Image = ((Image)(_resources.GetObject("pictureBoxReverse.Image")));
_pictureBoxReverse.Location = new Point(28, 3);
_pictureBoxReverse.Name = "_pictureBoxReverse";
_pictureBoxReverse.Size = new Size(16, 8);
_pictureBoxReverse.SizeMode = PictureBoxSizeMode.AutoSize;
_pictureBoxReverse.TabStop = false;
_pictureBoxReverse = new PictureBox
{
Image = ((Image) (_resources.GetObject("pictureBoxReverse.Image"))),
Location = new Point(28, 3),
Name = "_pictureBoxReverse",
Size = new Size(16, 8),
SizeMode = PictureBoxSizeMode.AutoSize,
TabStop = false
};
_panelcontrols.Controls.Add(_pictureBoxReverse);
_pictureBoxReverse.MouseEnter += PictureBoxReverseMouseEnter;
_pictureBoxReverseOver = new PictureBox();
_pictureBoxReverseOver.Image = ((Image)(_resources.GetObject("pictureBoxReverseMouseOver.Image")));
_pictureBoxReverseOver.Location = _pictureBoxReverse.Location;
_pictureBoxReverseOver.Name = "_pictureBoxReverseOver";
_pictureBoxReverseOver.Size = _pictureBoxReverse.Size;
_pictureBoxReverseOver.SizeMode = PictureBoxSizeMode.AutoSize;
_pictureBoxReverseOver.TabStop = false;
_pictureBoxReverseOver = new PictureBox
{
Image =
((Image) (_resources.GetObject("pictureBoxReverseMouseOver.Image"))),
Location = _pictureBoxReverse.Location,
Name = "_pictureBoxReverseOver",
Size = _pictureBoxReverse.Size,
SizeMode = PictureBoxSizeMode.AutoSize,
TabStop = false
};
_panelcontrols.Controls.Add(_pictureBoxReverseOver);
_pictureBoxReverseOver.MouseLeave += PictureBoxReverseOverMouseLeave;
_pictureBoxReverseOver.MouseDown += PictureBoxReverseOverMouseDown;
_pictureBoxReverseOver.MouseUp += PictureBoxReverseOverMouseUp;
_pictureBoxReverseDown = new PictureBox();
_pictureBoxReverseDown.Image = ((Image)(_resources.GetObject("pictureBoxReverseMouseDown.Image")));
_pictureBoxReverseDown.Location = _pictureBoxReverse.Location;
_pictureBoxReverseDown.Name = "_pictureBoxReverseOver";
_pictureBoxReverseDown.Size = _pictureBoxReverse.Size;
_pictureBoxReverseDown.SizeMode = PictureBoxSizeMode.AutoSize;
_pictureBoxReverseDown.TabStop = false;
_pictureBoxReverseDown = new PictureBox
{
Image = ((Image) (_resources.GetObject("pictureBoxReverseMouseDown.Image"))),
Location = _pictureBoxReverse.Location,
Name = "_pictureBoxReverseOver",
Size = _pictureBoxReverse.Size,
SizeMode = PictureBoxSizeMode.AutoSize,
TabStop = false
};
_panelcontrols.Controls.Add(_pictureBoxReverseDown);
_pictureBoxFastForward = new PictureBox();
_pictureBoxFastForward.Image = ((Image)(_resources.GetObject("pictureBoxFastForward.Image")));
_pictureBoxFastForward.Location = new Point(571, 1);
_pictureBoxFastForward.Name = "_pictureBoxFastForward";
_pictureBoxFastForward.Size = new Size(17, 13);
_pictureBoxFastForward.SizeMode = PictureBoxSizeMode.AutoSize;
_pictureBoxFastForward.TabStop = false;
_pictureBoxFastForward = new PictureBox
{
Image = ((Image) (_resources.GetObject("pictureBoxFastForward.Image"))),
Location = new Point(571, 1),
Name = "_pictureBoxFastForward",
Size = new Size(17, 13),
SizeMode = PictureBoxSizeMode.AutoSize,
TabStop = false
};
_panelcontrols.Controls.Add(_pictureBoxFastForward);
_pictureBoxFastForward.MouseEnter += PictureBoxFastForwardMouseEnter;
_pictureBoxFastForwardOver = new PictureBox();
_pictureBoxFastForwardOver.Image = ((Image)(_resources.GetObject("pictureBoxFastForwardMouseOver.Image")));
_pictureBoxFastForwardOver.Location = _pictureBoxFastForward.Location;
_pictureBoxFastForwardOver.Name = "_pictureBoxFastForwardOver";
_pictureBoxFastForwardOver.Size = _pictureBoxFastForward.Size;
_pictureBoxFastForwardOver.SizeMode = PictureBoxSizeMode.AutoSize;
_pictureBoxFastForwardOver.TabStop = false;
_pictureBoxFastForwardOver = new PictureBox
{
Image = ((Image)(_resources.GetObject("pictureBoxFastForwardMouseOver.Image"))),
Location = _pictureBoxFastForward.Location,
Name = "_pictureBoxFastForwardOver",
Size = _pictureBoxFastForward.Size,
SizeMode = PictureBoxSizeMode.AutoSize,
TabStop = false
};
_panelcontrols.Controls.Add(_pictureBoxFastForwardOver);
_pictureBoxFastForwardOver.MouseLeave += PictureBoxFastForwardOverMouseLeave;
_pictureBoxFastForwardOver.MouseDown += PictureBoxFastForwardOverMouseDown;
_pictureBoxFastForwardOver.MouseUp += PictureBoxFastForwardOverMouseUp;
_pictureBoxFastForwardDown = new PictureBox();
_pictureBoxFastForwardDown.Image = ((Image)(_resources.GetObject("pictureBoxFastForwardMouseDown.Image")));
_pictureBoxFastForwardDown.Location = _pictureBoxFastForward.Location;
_pictureBoxFastForwardDown.Name = "_pictureBoxFastForwardDown";
_pictureBoxFastForwardDown.Size = _pictureBoxFastForward.Size;
_pictureBoxFastForwardDown.SizeMode = PictureBoxSizeMode.AutoSize;
_pictureBoxFastForwardDown.TabStop = false;
_pictureBoxFastForwardDown = new PictureBox
{
Image = ((Image)(_resources.GetObject("pictureBoxFastForwardMouseDown.Image"))),
Location = _pictureBoxFastForward.Location,
Name = "_pictureBoxFastForwardDown",
Size = _pictureBoxFastForward.Size,
SizeMode = PictureBoxSizeMode.AutoSize,
TabStop = false
};
_panelcontrols.Controls.Add(_pictureBoxFastForwardDown);
_labelTimeCode.Location = new Point(280, 28);
@ -569,6 +596,14 @@ namespace Nikse.SubtitleEdit.Controls
_labelTimeCode.AutoSize = true;
_panelcontrols.Controls.Add(_labelTimeCode);
_labelVideoPlayerName.Location = new Point(280, 17);
_labelVideoPlayerName.ForeColor = Color.Gray;
_labelVideoPlayerName.BackColor = Color.FromArgb(67, 75, 93);
_labelVideoPlayerName.AutoSize = true;
_labelVideoPlayerName.Font = new Font(_labelTimeCode.Font.FontFamily, 5);
_panelcontrols.Controls.Add(_labelVideoPlayerName);
_pictureBoxBackground.SendToBack();
_pictureBoxFastForward.BringToFront();
_pictureBoxFastForwardDown.BringToFront();
@ -600,6 +635,7 @@ namespace Nikse.SubtitleEdit.Controls
_pictureBoxFastForwardOver.Left = _pictureBoxFastForward.Left;
_labelTimeCode.Left = Width - 170;
_labelVideoPlayerName.Left = Width - _labelVideoPlayerName.Width - 3;
}
#region PlayPauseButtons
@ -942,7 +978,7 @@ namespace Nikse.SubtitleEdit.Controls
double percent = (VideoPlayer.CurrentPosition * 100.0) / VideoPlayer.Duration;
_pictureBoxProgressBar.Width = (int)(max * percent / 100.0);
if (VideoPlayer.Duration == 0)
if (Convert.ToInt64(Duration) == 0)
return;
var pos = CurrentPosition;

View File

@ -722,7 +722,7 @@
this.toolStripComboBoxFrameRate.FlatStyle = System.Windows.Forms.FlatStyle.Standard;
this.toolStripComboBoxFrameRate.Name = "toolStripComboBoxFrameRate";
this.toolStripComboBoxFrameRate.Size = new System.Drawing.Size(75, 40);
this.toolStripComboBoxFrameRate.TextChanged += new System.EventHandler(this.toolStripComboBoxFrameRate_TextChanged);
this.toolStripComboBoxFrameRate.TextChanged += new System.EventHandler(this.ToolStripComboBoxFrameRateTextChanged);
//
// toolStripButtonGetFrameRate
//
@ -835,28 +835,28 @@
this.openOriginalToolStripMenuItem.Name = "openOriginalToolStripMenuItem";
this.openOriginalToolStripMenuItem.Size = new System.Drawing.Size(334, 22);
this.openOriginalToolStripMenuItem.Text = "Open original (translator mode)...";
this.openOriginalToolStripMenuItem.Click += new System.EventHandler(this.openOriginalToolStripMenuItem_Click);
this.openOriginalToolStripMenuItem.Click += new System.EventHandler(this.OpenOriginalToolStripMenuItemClick);
//
// saveOriginalToolStripMenuItem
//
this.saveOriginalToolStripMenuItem.Name = "saveOriginalToolStripMenuItem";
this.saveOriginalToolStripMenuItem.Size = new System.Drawing.Size(334, 22);
this.saveOriginalToolStripMenuItem.Text = "Save original";
this.saveOriginalToolStripMenuItem.Click += new System.EventHandler(this.saveOriginalToolStripMenuItem_Click);
this.saveOriginalToolStripMenuItem.Click += new System.EventHandler(this.SaveOriginalToolStripMenuItemClick);
//
// saveOriginalAstoolStripMenuItem
//
this.saveOriginalAstoolStripMenuItem.Name = "saveOriginalAstoolStripMenuItem";
this.saveOriginalAstoolStripMenuItem.Size = new System.Drawing.Size(334, 22);
this.saveOriginalAstoolStripMenuItem.Text = "Save original as...";
this.saveOriginalAstoolStripMenuItem.Click += new System.EventHandler(this.saveOriginalAstoolStripMenuItem_Click);
this.saveOriginalAstoolStripMenuItem.Click += new System.EventHandler(this.SaveOriginalAstoolStripMenuItemClick);
//
// removeOriginalToolStripMenuItem
//
this.removeOriginalToolStripMenuItem.Name = "removeOriginalToolStripMenuItem";
this.removeOriginalToolStripMenuItem.Size = new System.Drawing.Size(334, 22);
this.removeOriginalToolStripMenuItem.Text = "Remove original";
this.removeOriginalToolStripMenuItem.Click += new System.EventHandler(this.removeOriginalToolStripMenuItem_Click);
this.removeOriginalToolStripMenuItem.Click += new System.EventHandler(this.RemoveOriginalToolStripMenuItemClick);
//
// toolStripSeparator12
//
@ -957,63 +957,63 @@
this.adobeEncoreFABImageScriptToolStripMenuItem.Name = "adobeEncoreFABImageScriptToolStripMenuItem";
this.adobeEncoreFABImageScriptToolStripMenuItem.Size = new System.Drawing.Size(258, 22);
this.adobeEncoreFABImageScriptToolStripMenuItem.Text = "Adobe Encore FAB image script...";
this.adobeEncoreFABImageScriptToolStripMenuItem.Click += new System.EventHandler(this.adobeEncoreFABImageScriptToolStripMenuItem_Click);
this.adobeEncoreFABImageScriptToolStripMenuItem.Click += new System.EventHandler(this.AdobeEncoreFabImageScriptToolStripMenuItemClick);
//
// toolStripMenuItemExportPngXml
//
this.toolStripMenuItemExportPngXml.Name = "toolStripMenuItemExportPngXml";
this.toolStripMenuItemExportPngXml.Size = new System.Drawing.Size(258, 22);
this.toolStripMenuItemExportPngXml.Text = "BDN xml/png...";
this.toolStripMenuItemExportPngXml.Click += new System.EventHandler(this.toolStripMenuItemExportPngXml_Click);
this.toolStripMenuItemExportPngXml.Click += new System.EventHandler(this.ToolStripMenuItemExportPngXmlClick);
//
// bluraySupToolStripMenuItem
//
this.bluraySupToolStripMenuItem.Name = "bluraySupToolStripMenuItem";
this.bluraySupToolStripMenuItem.Size = new System.Drawing.Size(258, 22);
this.bluraySupToolStripMenuItem.Text = "Blu-ray sup...";
this.bluraySupToolStripMenuItem.Click += new System.EventHandler(this.bluraySupToolStripMenuItem_Click);
this.bluraySupToolStripMenuItem.Click += new System.EventHandler(this.BluraySupToolStripMenuItemClick);
//
// toolStripMenuItemCavena890
//
this.toolStripMenuItemCavena890.Name = "toolStripMenuItemCavena890";
this.toolStripMenuItemCavena890.Size = new System.Drawing.Size(258, 22);
this.toolStripMenuItemCavena890.Text = "Cavena 890...";
this.toolStripMenuItemCavena890.Click += new System.EventHandler(this.toolStripMenuItemCavena890_Click);
this.toolStripMenuItemCavena890.Click += new System.EventHandler(this.ToolStripMenuItemCavena890Click);
//
// eBUSTLToolStripMenuItem
//
this.eBUSTLToolStripMenuItem.Name = "eBUSTLToolStripMenuItem";
this.eBUSTLToolStripMenuItem.Size = new System.Drawing.Size(258, 22);
this.eBUSTLToolStripMenuItem.Text = "EBU STL...";
this.eBUSTLToolStripMenuItem.Click += new System.EventHandler(this.eBUSTLToolStripMenuItem_Click);
this.eBUSTLToolStripMenuItem.Click += new System.EventHandler(this.EBustlToolStripMenuItemClick);
//
// pACScreenElectronicsToolStripMenuItem
//
this.pACScreenElectronicsToolStripMenuItem.Name = "pACScreenElectronicsToolStripMenuItem";
this.pACScreenElectronicsToolStripMenuItem.Size = new System.Drawing.Size(258, 22);
this.pACScreenElectronicsToolStripMenuItem.Text = "PAC (Screen Electronics)...";
this.pACScreenElectronicsToolStripMenuItem.Click += new System.EventHandler(this.pACScreenElectronicsToolStripMenuItem_Click);
this.pACScreenElectronicsToolStripMenuItem.Click += new System.EventHandler(this.PAcScreenElectronicsToolStripMenuItemClick);
//
// plainTextToolStripMenuItem
//
this.plainTextToolStripMenuItem.Name = "plainTextToolStripMenuItem";
this.plainTextToolStripMenuItem.Size = new System.Drawing.Size(258, 22);
this.plainTextToolStripMenuItem.Text = "Plain text...";
this.plainTextToolStripMenuItem.Click += new System.EventHandler(this.plainTextToolStripMenuItem_Click);
this.plainTextToolStripMenuItem.Click += new System.EventHandler(this.PlainTextToolStripMenuItemClick);
//
// plainTextWithoutLineBreaksToolStripMenuItem
//
this.plainTextWithoutLineBreaksToolStripMenuItem.Name = "plainTextWithoutLineBreaksToolStripMenuItem";
this.plainTextWithoutLineBreaksToolStripMenuItem.Size = new System.Drawing.Size(258, 22);
this.plainTextWithoutLineBreaksToolStripMenuItem.Text = "Plain text without line breaks...";
this.plainTextWithoutLineBreaksToolStripMenuItem.Click += new System.EventHandler(this.plainTextWithoutLineBreaksToolStripMenuItem_Click);
this.plainTextWithoutLineBreaksToolStripMenuItem.Click += new System.EventHandler(this.PlainTextWithoutLineBreaksToolStripMenuItemClick);
//
// vobSubsubidxToolStripMenuItem
//
this.vobSubsubidxToolStripMenuItem.Name = "vobSubsubidxToolStripMenuItem";
this.vobSubsubidxToolStripMenuItem.Size = new System.Drawing.Size(258, 22);
this.vobSubsubidxToolStripMenuItem.Text = "VobSub (sub/idx)...";
this.vobSubsubidxToolStripMenuItem.Click += new System.EventHandler(this.vobSubsubidxToolStripMenuItem_Click);
this.vobSubsubidxToolStripMenuItem.Click += new System.EventHandler(this.VobSubsubidxToolStripMenuItemClick);
//
// toolStripSeparator10
//
@ -1155,7 +1155,7 @@
this.editSelectAllToolStripMenuItem.Name = "editSelectAllToolStripMenuItem";
this.editSelectAllToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
this.editSelectAllToolStripMenuItem.Text = "Select all";
this.editSelectAllToolStripMenuItem.Click += new System.EventHandler(this.editSelectAllToolStripMenuItem_Click);
this.editSelectAllToolStripMenuItem.Click += new System.EventHandler(this.EditSelectAllToolStripMenuItemClick);
//
// toolsToolStripMenuItem
//
@ -1178,7 +1178,7 @@
this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
this.toolsToolStripMenuItem.Text = "Tools";
this.toolsToolStripMenuItem.DropDownOpening += new System.EventHandler(this.toolsToolStripMenuItem_DropDownOpening);
this.toolsToolStripMenuItem.DropDownOpening += new System.EventHandler(this.ToolsToolStripMenuItemDropDownOpening);
//
// adjustDisplayTimeToolStripMenuItem
//
@ -1333,14 +1333,14 @@
this.toolStripMenuItemShowOriginalInPreview.Name = "toolStripMenuItemShowOriginalInPreview";
this.toolStripMenuItemShowOriginalInPreview.Size = new System.Drawing.Size(346, 22);
this.toolStripMenuItemShowOriginalInPreview.Text = "Show original text in video/audio previews";
this.toolStripMenuItemShowOriginalInPreview.Click += new System.EventHandler(this.toolStripMenuItemShowOriginalInPreview_Click);
this.toolStripMenuItemShowOriginalInPreview.Click += new System.EventHandler(this.ToolStripMenuItemShowOriginalInPreviewClick);
//
// toolStripMenuItemMakeEmptyFromCurrent
//
this.toolStripMenuItemMakeEmptyFromCurrent.Name = "toolStripMenuItemMakeEmptyFromCurrent";
this.toolStripMenuItemMakeEmptyFromCurrent.Size = new System.Drawing.Size(346, 22);
this.toolStripMenuItemMakeEmptyFromCurrent.Text = "Make new empty translation from current subtitle";
this.toolStripMenuItemMakeEmptyFromCurrent.Click += new System.EventHandler(this.toolStripMenuItemMakeEmptyFromCurrent_Click);
this.toolStripMenuItemMakeEmptyFromCurrent.Click += new System.EventHandler(this.ToolStripMenuItemMakeEmptyFromCurrentClick);
//
// toolStripSeparator3
//
@ -1376,8 +1376,8 @@
this.toolStripMenuItemVideo.Name = "toolStripMenuItemVideo";
this.toolStripMenuItemVideo.Size = new System.Drawing.Size(50, 20);
this.toolStripMenuItemVideo.Text = "Video";
this.toolStripMenuItemVideo.DropDownClosed += new System.EventHandler(this.toolStripMenuItemVideo_DropDownClosed);
this.toolStripMenuItemVideo.DropDownOpening += new System.EventHandler(this.toolStripMenuItemVideo_DropDownOpening);
this.toolStripMenuItemVideo.DropDownClosed += new System.EventHandler(this.ToolStripMenuItemVideoDropDownClosed);
this.toolStripMenuItemVideo.DropDownOpening += new System.EventHandler(this.ToolStripMenuItemVideoDropDownOpening);
//
// openVideoToolStripMenuItem
//
@ -1397,7 +1397,7 @@
this.closeVideoToolStripMenuItem.Name = "closeVideoToolStripMenuItem";
this.closeVideoToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
this.closeVideoToolStripMenuItem.Text = "Close video";
this.closeVideoToolStripMenuItem.Click += new System.EventHandler(this.closeVideoToolStripMenuItem_Click);
this.closeVideoToolStripMenuItem.Click += new System.EventHandler(this.CloseVideoToolStripMenuItemClick);
//
// toolStripSeparator5
//
@ -1409,7 +1409,7 @@
this.showhideWaveFormToolStripMenuItem.Name = "showhideWaveFormToolStripMenuItem";
this.showhideWaveFormToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
this.showhideWaveFormToolStripMenuItem.Text = "Show/hide wave form";
this.showhideWaveFormToolStripMenuItem.Click += new System.EventHandler(this.showhideWaveFormToolStripMenuItem_Click);
this.showhideWaveFormToolStripMenuItem.Click += new System.EventHandler(this.ShowhideWaveFormToolStripMenuItemClick);
//
// showhideVideoToolStripMenuItem
//
@ -1428,7 +1428,7 @@
this.undockVideoControlsToolStripMenuItem.Name = "undockVideoControlsToolStripMenuItem";
this.undockVideoControlsToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
this.undockVideoControlsToolStripMenuItem.Text = "Un-dock video controls";
this.undockVideoControlsToolStripMenuItem.Click += new System.EventHandler(this.undockVideoControlsToolStripMenuItem_Click);
this.undockVideoControlsToolStripMenuItem.Click += new System.EventHandler(this.UndockVideoControlsToolStripMenuItemClick);
//
// redockVideoControlsToolStripMenuItem
//
@ -1436,7 +1436,7 @@
this.redockVideoControlsToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
this.redockVideoControlsToolStripMenuItem.Text = "Re-dock video controls";
this.redockVideoControlsToolStripMenuItem.Visible = false;
this.redockVideoControlsToolStripMenuItem.Click += new System.EventHandler(this.redockVideoControlsToolStripMenuItem_Click);
this.redockVideoControlsToolStripMenuItem.Click += new System.EventHandler(this.RedockVideoControlsToolStripMenuItemClick);
//
// toolStripMenuItemSpellCheckMain
//
@ -1450,7 +1450,7 @@
this.toolStripMenuItemSpellCheckMain.Name = "toolStripMenuItemSpellCheckMain";
this.toolStripMenuItemSpellCheckMain.Size = new System.Drawing.Size(80, 20);
this.toolStripMenuItemSpellCheckMain.Text = "Spell check";
this.toolStripMenuItemSpellCheckMain.DropDownOpening += new System.EventHandler(this.toolStripMenuItemSpellCheckMain_DropDownOpening);
this.toolStripMenuItemSpellCheckMain.DropDownOpening += new System.EventHandler(this.ToolStripMenuItemSpellCheckMainDropDownOpening);
//
// spellCheckToolStripMenuItem
//
@ -1475,7 +1475,7 @@
this.FindDoubleLinesToolStripMenuItem.Name = "FindDoubleLinesToolStripMenuItem";
this.FindDoubleLinesToolStripMenuItem.Size = new System.Drawing.Size(296, 22);
this.FindDoubleLinesToolStripMenuItem.Text = "Find double lines";
this.FindDoubleLinesToolStripMenuItem.Click += new System.EventHandler(this.FindDoubleLinesToolStripMenuItem_Click);
this.FindDoubleLinesToolStripMenuItem.Click += new System.EventHandler(this.FindDoubleLinesToolStripMenuItemClick);
//
// toolStripSeparator9
//
@ -1750,14 +1750,14 @@
this.toolStripMenuItemInsertSubtitle.Name = "toolStripMenuItemInsertSubtitle";
this.toolStripMenuItemInsertSubtitle.Size = new System.Drawing.Size(284, 22);
this.toolStripMenuItemInsertSubtitle.Text = "Insert subtitle file after this line...";
this.toolStripMenuItemInsertSubtitle.Click += new System.EventHandler(this.toolStripMenuItemInsertSubtitle_Click);
this.toolStripMenuItemInsertSubtitle.Click += new System.EventHandler(this.ToolStripMenuItemInsertSubtitleClick);
//
// toolStripMenuItemCopySourceText
//
this.toolStripMenuItemCopySourceText.Name = "toolStripMenuItemCopySourceText";
this.toolStripMenuItemCopySourceText.Size = new System.Drawing.Size(284, 22);
this.toolStripMenuItemCopySourceText.Text = "Copy as text to clipboard";
this.toolStripMenuItemCopySourceText.Click += new System.EventHandler(this.toolStripMenuItemCopySourceText_Click);
this.toolStripMenuItemCopySourceText.Click += new System.EventHandler(this.ToolStripMenuItemCopySourceTextClick);
//
// toolStripSeparator7
//
@ -1904,7 +1904,7 @@
this.toolStripMenuItemGoogleMicrosoftTranslateSelLine.Name = "toolStripMenuItemGoogleMicrosoftTranslateSelLine";
this.toolStripMenuItemGoogleMicrosoftTranslateSelLine.Size = new System.Drawing.Size(284, 22);
this.toolStripMenuItemGoogleMicrosoftTranslateSelLine.Text = "Google/Microsoft translate selected line";
this.toolStripMenuItemGoogleMicrosoftTranslateSelLine.Click += new System.EventHandler(this.toolStripMenuItemGoogleMicrosoftTranslateSelLine_Click);
this.toolStripMenuItemGoogleMicrosoftTranslateSelLine.Click += new System.EventHandler(this.ToolStripMenuItemGoogleMicrosoftTranslateSelLineClick);
//
// googleTranslateSelectedLinesToolStripMenuItem
//
@ -2107,7 +2107,7 @@
this.toolStripMenuItemPlayRateSlow.Name = "toolStripMenuItemPlayRateSlow";
this.toolStripMenuItemPlayRateSlow.Size = new System.Drawing.Size(148, 22);
this.toolStripMenuItemPlayRateSlow.Text = "Slow";
this.toolStripMenuItemPlayRateSlow.Click += new System.EventHandler(this.toolStripMenuItemPlayRateSlow_Click);
this.toolStripMenuItemPlayRateSlow.Click += new System.EventHandler(this.ToolStripMenuItemPlayRateSlowClick);
//
// toolStripMenuItemPlayRateNormal
//
@ -2116,21 +2116,21 @@
this.toolStripMenuItemPlayRateNormal.Name = "toolStripMenuItemPlayRateNormal";
this.toolStripMenuItemPlayRateNormal.Size = new System.Drawing.Size(148, 22);
this.toolStripMenuItemPlayRateNormal.Text = "Normal speed";
this.toolStripMenuItemPlayRateNormal.Click += new System.EventHandler(this.toolStripMenuItemPlayRateNormal_Click);
this.toolStripMenuItemPlayRateNormal.Click += new System.EventHandler(this.ToolStripMenuItemPlayRateNormalClick);
//
// toolStripMenuItemPlayRateFast
//
this.toolStripMenuItemPlayRateFast.Name = "toolStripMenuItemPlayRateFast";
this.toolStripMenuItemPlayRateFast.Size = new System.Drawing.Size(148, 22);
this.toolStripMenuItemPlayRateFast.Text = "Fast ";
this.toolStripMenuItemPlayRateFast.Click += new System.EventHandler(this.toolStripMenuItemPlayRateFast_Click);
this.toolStripMenuItemPlayRateFast.Click += new System.EventHandler(this.ToolStripMenuItemPlayRateFastClick);
//
// toolStripMenuItemPlayRateVeryFast
//
this.toolStripMenuItemPlayRateVeryFast.Name = "toolStripMenuItemPlayRateVeryFast";
this.toolStripMenuItemPlayRateVeryFast.Size = new System.Drawing.Size(148, 22);
this.toolStripMenuItemPlayRateVeryFast.Text = "Very fast";
this.toolStripMenuItemPlayRateVeryFast.Click += new System.EventHandler(this.veryFastToolStripMenuItem_Click);
this.toolStripMenuItemPlayRateVeryFast.Click += new System.EventHandler(this.VeryFastToolStripMenuItemClick);
//
// audioVisualizer
//
@ -2160,8 +2160,8 @@
this.audioVisualizer.WavePeaks = null;
this.audioVisualizer.ZoomFactor = 1D;
this.audioVisualizer.Click += new System.EventHandler(this.AudioWaveForm_Click);
this.audioVisualizer.DragDrop += new System.Windows.Forms.DragEventHandler(this.AudioWaveForm_DragDrop);
this.audioVisualizer.DragEnter += new System.Windows.Forms.DragEventHandler(this.AudioWaveForm_DragEnter);
this.audioVisualizer.DragDrop += new System.Windows.Forms.DragEventHandler(this.AudioWaveFormDragDrop);
this.audioVisualizer.DragEnter += new System.Windows.Forms.DragEventHandler(this.AudioWaveFormDragEnter);
//
// tabControlButtons
//
@ -2174,7 +2174,7 @@
this.tabControlButtons.SelectedIndex = 0;
this.tabControlButtons.Size = new System.Drawing.Size(467, 283);
this.tabControlButtons.TabIndex = 0;
this.tabControlButtons.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControlButtons_DrawItem);
this.tabControlButtons.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.TabControlButtonsDrawItem);
this.tabControlButtons.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
//
// tabPageTranslate
@ -2573,7 +2573,7 @@
0,
0,
196608});
this.numericUpDownSec2.ValueChanged += new System.EventHandler(this.numericUpDownSec2_ValueChanged);
this.numericUpDownSec2.ValueChanged += new System.EventHandler(this.NumericUpDownSec2ValueChanged);
//
// buttonSecBack2
//
@ -2627,7 +2627,7 @@
0,
0,
196608});
this.numericUpDownSec1.ValueChanged += new System.EventHandler(this.numericUpDownSec1_ValueChanged);
this.numericUpDownSec1.ValueChanged += new System.EventHandler(this.NumericUpDownSec1ValueChanged);
//
// labelVideoPosition
//
@ -2808,7 +2808,7 @@
0,
0,
196608});
this.numericUpDownSecAdjust2.ValueChanged += new System.EventHandler(this.numericUpDownSecAdjust2_ValueChanged);
this.numericUpDownSecAdjust2.ValueChanged += new System.EventHandler(this.NumericUpDownSecAdjust2ValueChanged);
//
// buttonAdjustSecBack2
//
@ -2852,7 +2852,7 @@
0,
0,
196608});
this.numericUpDownSecAdjust1.ValueChanged += new System.EventHandler(this.numericUpDownSecAdjust1_ValueChanged);
this.numericUpDownSecAdjust1.ValueChanged += new System.EventHandler(this.NumericUpDownSecAdjust1ValueChanged);
//
// buttonAdjustSecBack1
//
@ -2933,7 +2933,7 @@
this.showOnlySpectrogramToolStripMenuItem});
this.contextMenuStripWaveForm.Name = "contextMenuStripWaveForm";
this.contextMenuStripWaveForm.Size = new System.Drawing.Size(253, 214);
this.contextMenuStripWaveForm.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStripWaveForm_Opening);
this.contextMenuStripWaveForm.Opening += new System.ComponentModel.CancelEventHandler(this.ContextMenuStripWaveFormOpening);
//
// addParagraphHereToolStripMenuItem
//
@ -2992,21 +2992,21 @@
this.showWaveformAndSpectrogramToolStripMenuItem.Name = "showWaveformAndSpectrogramToolStripMenuItem";
this.showWaveformAndSpectrogramToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
this.showWaveformAndSpectrogramToolStripMenuItem.Text = "Show waveform and spectrogram";
this.showWaveformAndSpectrogramToolStripMenuItem.Click += new System.EventHandler(this.showWaveformAndSpectrogramToolStripMenuItem_Click);
this.showWaveformAndSpectrogramToolStripMenuItem.Click += new System.EventHandler(this.ShowWaveformAndSpectrogramToolStripMenuItemClick);
//
// showOnlyWaveformToolStripMenuItem
//
this.showOnlyWaveformToolStripMenuItem.Name = "showOnlyWaveformToolStripMenuItem";
this.showOnlyWaveformToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
this.showOnlyWaveformToolStripMenuItem.Text = "Show only waveform";
this.showOnlyWaveformToolStripMenuItem.Click += new System.EventHandler(this.showOnlyWaveformToolStripMenuItem_Click);
this.showOnlyWaveformToolStripMenuItem.Click += new System.EventHandler(this.ShowOnlyWaveformToolStripMenuItemClick);
//
// showOnlySpectrogramToolStripMenuItem
//
this.showOnlySpectrogramToolStripMenuItem.Name = "showOnlySpectrogramToolStripMenuItem";
this.showOnlySpectrogramToolStripMenuItem.Size = new System.Drawing.Size(252, 22);
this.showOnlySpectrogramToolStripMenuItem.Text = "Show only spectrogram";
this.showOnlySpectrogramToolStripMenuItem.Click += new System.EventHandler(this.showOnlySpectrogramToolStripMenuItem_Click);
this.showOnlySpectrogramToolStripMenuItem.Click += new System.EventHandler(this.ShowOnlySpectrogramToolStripMenuItemClick);
//
// splitContainerMain
//
@ -3026,7 +3026,7 @@
this.splitContainerMain.Size = new System.Drawing.Size(1244, 592);
this.splitContainerMain.SplitterDistance = 283;
this.splitContainerMain.TabIndex = 8;
this.splitContainerMain.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.splitContainerMain_SplitterMoved);
this.splitContainerMain.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.SplitContainerMainSplitterMoved);
//
// splitContainer1
//
@ -3044,7 +3044,7 @@
this.splitContainer1.Size = new System.Drawing.Size(1244, 283);
this.splitContainer1.SplitterDistance = 950;
this.splitContainer1.TabIndex = 7;
this.splitContainer1.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.splitContainer1_SplitterMoved);
this.splitContainer1.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.SplitContainer1SplitterMoved);
//
// tabControlSubtitle
//
@ -3060,7 +3060,7 @@
this.tabControlSubtitle.Size = new System.Drawing.Size(945, 280);
this.tabControlSubtitle.TabIndex = 0;
this.tabControlSubtitle.SelectedIndexChanged += new System.EventHandler(this.TabControlSubtitleSelectedIndexChanged);
this.tabControlSubtitle.Selecting += new System.Windows.Forms.TabControlCancelEventHandler(this.tabControlSubtitle_Selecting);
this.tabControlSubtitle.Selecting += new System.Windows.Forms.TabControlCancelEventHandler(this.TabControlSubtitleSelecting);
//
// tabPage1
//
@ -3119,7 +3119,7 @@
this.buttonSplitLine.Text = "Split line";
this.buttonSplitLine.UseVisualStyleBackColor = true;
this.buttonSplitLine.Visible = false;
this.buttonSplitLine.Click += new System.EventHandler(this.buttonSplitLine_Click);
this.buttonSplitLine.Click += new System.EventHandler(this.ButtonSplitLineClick);
//
// labelAlternateCharactersPerSecond
//
@ -3194,10 +3194,10 @@
this.textBoxListViewTextAlternate.Visible = false;
this.textBoxListViewTextAlternate.MouseClick += new System.Windows.Forms.MouseEventHandler(this.textBoxListViewTextAlternate_MouseClick);
this.textBoxListViewTextAlternate.TextChanged += new System.EventHandler(this.textBoxListViewTextAlternate_TextChanged);
this.textBoxListViewTextAlternate.Enter += new System.EventHandler(this.textBoxListViewTextAlternate_Enter);
this.textBoxListViewTextAlternate.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBoxListViewTextAlternate_KeyDown);
this.textBoxListViewTextAlternate.KeyUp += new System.Windows.Forms.KeyEventHandler(this.textBoxListViewTextAlternate_KeyUp);
this.textBoxListViewTextAlternate.MouseMove += new System.Windows.Forms.MouseEventHandler(this.textBoxListViewTextAlternate_MouseMove);
this.textBoxListViewTextAlternate.Enter += new System.EventHandler(this.TextBoxListViewTextAlternateEnter);
this.textBoxListViewTextAlternate.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBoxListViewTextAlternateKeyDown);
this.textBoxListViewTextAlternate.KeyUp += new System.Windows.Forms.KeyEventHandler(this.TextBoxListViewTextAlternateKeyUp);
this.textBoxListViewTextAlternate.MouseMove += new System.Windows.Forms.MouseEventHandler(this.TextBoxListViewTextAlternateMouseMove);
//
// contextMenuStripTextBoxListView
//
@ -3220,7 +3220,7 @@
this.toolStripMenuItemInsertUnicodeSymbol});
this.contextMenuStripTextBoxListView.Name = "contextMenuStripTextBoxListView";
this.contextMenuStripTextBoxListView.Size = new System.Drawing.Size(215, 308);
this.contextMenuStripTextBoxListView.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStripTextBoxListView_Opening);
this.contextMenuStripTextBoxListView.Opening += new System.ComponentModel.CancelEventHandler(this.ContextMenuStripTextBoxListViewOpening);
//
// cutToolStripMenuItem
//
@ -3244,21 +3244,21 @@
this.pasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V)));
this.pasteToolStripMenuItem.Size = new System.Drawing.Size(214, 22);
this.pasteToolStripMenuItem.Text = "Paste";
this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click);
this.pasteToolStripMenuItem.Click += new System.EventHandler(this.PasteToolStripMenuItemClick);
//
// deleteToolStripMenuItem
//
this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem";
this.deleteToolStripMenuItem.Size = new System.Drawing.Size(214, 22);
this.deleteToolStripMenuItem.Text = "Delete";
this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click);
this.deleteToolStripMenuItem.Click += new System.EventHandler(this.DeleteToolStripMenuItemClick);
//
// toolStripMenuItemSplitTextAtCursor
//
this.toolStripMenuItemSplitTextAtCursor.Name = "toolStripMenuItemSplitTextAtCursor";
this.toolStripMenuItemSplitTextAtCursor.Size = new System.Drawing.Size(214, 22);
this.toolStripMenuItemSplitTextAtCursor.Text = "Split text at cursor position";
this.toolStripMenuItemSplitTextAtCursor.Click += new System.EventHandler(this.toolStripMenuItemSplitTextAtCursor_Click);
this.toolStripMenuItemSplitTextAtCursor.Click += new System.EventHandler(this.ToolStripMenuItemSplitTextAtCursorClick);
//
// toolStripSeparator18
//
@ -3283,14 +3283,14 @@
this.normalToolStripMenuItem1.Name = "normalToolStripMenuItem1";
this.normalToolStripMenuItem1.Size = new System.Drawing.Size(214, 22);
this.normalToolStripMenuItem1.Text = "Normal";
this.normalToolStripMenuItem1.Click += new System.EventHandler(this.normalToolStripMenuItem1_Click);
this.normalToolStripMenuItem1.Click += new System.EventHandler(this.NormalToolStripMenuItem1Click);
//
// boldToolStripMenuItem1
//
this.boldToolStripMenuItem1.Name = "boldToolStripMenuItem1";
this.boldToolStripMenuItem1.Size = new System.Drawing.Size(214, 22);
this.boldToolStripMenuItem1.Text = "Bold";
this.boldToolStripMenuItem1.Click += new System.EventHandler(this.boldToolStripMenuItem1_Click);
this.boldToolStripMenuItem1.Click += new System.EventHandler(this.BoldToolStripMenuItem1Click);
//
// italicToolStripMenuItem1
//
@ -3298,28 +3298,28 @@
this.italicToolStripMenuItem1.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I)));
this.italicToolStripMenuItem1.Size = new System.Drawing.Size(214, 22);
this.italicToolStripMenuItem1.Text = "Italic";
this.italicToolStripMenuItem1.Click += new System.EventHandler(this.italicToolStripMenuItem1_Click);
this.italicToolStripMenuItem1.Click += new System.EventHandler(this.ItalicToolStripMenuItem1Click);
//
// underlineToolStripMenuItem1
//
this.underlineToolStripMenuItem1.Name = "underlineToolStripMenuItem1";
this.underlineToolStripMenuItem1.Size = new System.Drawing.Size(214, 22);
this.underlineToolStripMenuItem1.Text = "Underline";
this.underlineToolStripMenuItem1.Click += new System.EventHandler(this.underlineToolStripMenuItem1_Click);
this.underlineToolStripMenuItem1.Click += new System.EventHandler(this.UnderlineToolStripMenuItem1Click);
//
// colorToolStripMenuItem1
//
this.colorToolStripMenuItem1.Name = "colorToolStripMenuItem1";
this.colorToolStripMenuItem1.Size = new System.Drawing.Size(214, 22);
this.colorToolStripMenuItem1.Text = "Color...";
this.colorToolStripMenuItem1.Click += new System.EventHandler(this.colorToolStripMenuItem1_Click);
this.colorToolStripMenuItem1.Click += new System.EventHandler(this.ColorToolStripMenuItem1Click);
//
// fontNameToolStripMenuItem
//
this.fontNameToolStripMenuItem.Name = "fontNameToolStripMenuItem";
this.fontNameToolStripMenuItem.Size = new System.Drawing.Size(214, 22);
this.fontNameToolStripMenuItem.Text = "Font name...";
this.fontNameToolStripMenuItem.Click += new System.EventHandler(this.fontNameToolStripMenuItem_Click);
this.fontNameToolStripMenuItem.Click += new System.EventHandler(this.FontNameToolStripMenuItemClick);
//
// toolStripSeparator26
//
@ -3523,7 +3523,7 @@
this.textBoxListViewText.TabIndex = 5;
this.textBoxListViewText.MouseClick += new System.Windows.Forms.MouseEventHandler(this.textBoxListViewText_MouseClick);
this.textBoxListViewText.TextChanged += new System.EventHandler(this.TextBoxListViewTextTextChanged);
this.textBoxListViewText.Enter += new System.EventHandler(this.textBoxListViewText_Enter);
this.textBoxListViewText.Enter += new System.EventHandler(this.TextBoxListViewTextEnter);
this.textBoxListViewText.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBoxListViewTextKeyDown);
this.textBoxListViewText.KeyUp += new System.Windows.Forms.KeyEventHandler(this.textBoxListViewText_KeyUp);
this.textBoxListViewText.Leave += new System.EventHandler(this.textBoxListViewText_Leave);
@ -3652,7 +3652,7 @@
this.insertLineToolStripMenuItem.Name = "insertLineToolStripMenuItem";
this.insertLineToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
this.insertLineToolStripMenuItem.Text = "Insert line";
this.insertLineToolStripMenuItem.Click += new System.EventHandler(this.insertLineToolStripMenuItem_Click);
this.insertLineToolStripMenuItem.Click += new System.EventHandler(this.InsertLineToolStripMenuItemClick);
//
// imageListPlayRate
//
@ -3664,12 +3664,12 @@
// timerTextUndo
//
this.timerTextUndo.Interval = 700;
this.timerTextUndo.Tick += new System.EventHandler(this.timerTextUndo_Tick);
this.timerTextUndo.Tick += new System.EventHandler(this.TimerTextUndoTick);
//
// timerAlternateTextUndo
//
this.timerAlternateTextUndo.Interval = 700;
this.timerAlternateTextUndo.Tick += new System.EventHandler(this.timerAlternateTextUndo_Tick);
this.timerAlternateTextUndo.Tick += new System.EventHandler(this.TimerAlternateTextUndoTick);
//
// Main
//

View File

@ -2424,6 +2424,7 @@ namespace Nikse.SubtitleEdit.Forms
private void ShowSettings()
{
string oldVideoPlayer = Configuration.Settings.General.VideoPlayer;
string oldListViewLineSeparatorString = Configuration.Settings.General.ListViewLineSeparatorString;
string oldSubtitleFontSettings = Configuration.Settings.General.SubtitleFontName +
Configuration.Settings.General.SubtitleFontBold +
@ -2514,6 +2515,13 @@ namespace Nikse.SubtitleEdit.Forms
SetShortcuts();
_timerAutoSave.Stop();
if (!string.IsNullOrEmpty(_videoFileName) && oldVideoPlayer != Configuration.Settings.General.VideoPlayer && mediaPlayer.VideoPlayer != null)
{
string vfn = _videoFileName;
CloseVideoToolStripMenuItemClick(null, null);
OpenVideo(vfn);
}
if (Configuration.Settings.General.AutoBackupSeconds > 0)
{
_timerAutoSave.Interval = 1000 * Configuration.Settings.General.AutoBackupSeconds; // take backup every x second if changes were made
@ -2608,7 +2616,7 @@ namespace Nikse.SubtitleEdit.Forms
if (_changeAlternate && Configuration.Settings.General.AllowEditOfOriginalSubtitle && _subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0)
{
saveOriginalToolStripMenuItem_Click(null, null);
SaveOriginalToolStripMenuItemClick(null, null);
if (oldChange && !_change && !_changeAlternate)
ShowStatus(string.Format(_language.SavedSubtitleX, Path.GetFileName(_fileName)) + " + " +
string.Format(_language.SavedOriginalSubtitleX, Path.GetFileName(_subtitleAlternateFileName)));
@ -3842,8 +3850,8 @@ namespace Nikse.SubtitleEdit.Forms
timerAlternateTextUndo.Stop();
_listViewTextTicks = 0;
_listViewAlternateTextTicks = 0;
timerTextUndo_Tick(null, null);
timerAlternateTextUndo_Tick(null, null);
TimerTextUndoTick(null, null);
TimerAlternateTextUndoTick(null, null);
int selectedIndex = FirstSelectedIndex;
@ -7638,9 +7646,9 @@ namespace Nikse.SubtitleEdit.Forms
else if (e.KeyData == _toggleVideoDockUndock)
{
if (_isVideoControlsUnDocked)
redockVideoControlsToolStripMenuItem_Click(null, null);
RedockVideoControlsToolStripMenuItemClick(null, null);
else
undockVideoControlsToolStripMenuItem_Click(null, null);
UndockVideoControlsToolStripMenuItemClick(null, null);
}
else if (mediaPlayer != null && mediaPlayer.VideoPlayer != null && e.KeyData == _video100MsLeft)
{
@ -7689,7 +7697,7 @@ namespace Nikse.SubtitleEdit.Forms
else if (e.KeyData == _mainVideoFullscreen) // fullscreen
{
if (_videoPlayerUnDocked == null || _videoPlayerUnDocked.IsDisposed)
undockVideoControlsToolStripMenuItem_Click(null, null);
UndockVideoControlsToolStripMenuItemClick(null, null);
_videoPlayerUnDocked.Focus();
_videoPlayerUnDocked.GoFullscreen();
_videoPlayerUnDocked.RedockOnFullscreenEnd = true;
@ -9965,7 +9973,7 @@ namespace Nikse.SubtitleEdit.Forms
_timerAutoSave.Interval = 1000 * Configuration.Settings.General.AutoBackupSeconds; // take backup every x second if changes were made
_timerAutoSave.Start();
}
toolStripMenuItemPlayRateNormal_Click(null, null);
ToolStripMenuItemPlayRateNormalClick(null, null);
SetPositionFromXYString(Configuration.Settings.General.UndockedVideoPosition, "VideoPlayerUnDocked");
SetPositionFromXYString(Configuration.Settings.General.UndockedWaveformPosition, "WaveFormUnDocked");
@ -9973,7 +9981,7 @@ namespace Nikse.SubtitleEdit.Forms
if (Configuration.Settings.General.Undocked && Configuration.Settings.General.StartRememberPositionAndSize)
{
Configuration.Settings.General.Undocked = false;
undockVideoControlsToolStripMenuItem_Click(null, null);
UndockVideoControlsToolStripMenuItemClick(null, null);
}
Main_Resize(null, null);
@ -10622,19 +10630,19 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void showhideWaveFormToolStripMenuItem_Click(object sender, EventArgs e)
private void ShowhideWaveFormToolStripMenuItemClick(object sender, EventArgs e)
{
toolStripButtonToggleWaveForm_Click(null, null);
}
private void AudioWaveForm_DragEnter(object sender, DragEventArgs e)
private void AudioWaveFormDragEnter(object sender, DragEventArgs e)
{
// make sure they're actually dropping files (not text or anything else)
if (e.Data.GetDataPresent(DataFormats.FileDrop, false))
e.Effect = DragDropEffects.All;
}
private void AudioWaveForm_DragDrop(object sender, DragEventArgs e)
private void AudioWaveFormDragDrop(object sender, DragEventArgs e)
{
if (string.IsNullOrEmpty(_videoFileName))
buttonOpenVideo_Click(null, null);
@ -10652,9 +10660,9 @@ namespace Nikse.SubtitleEdit.Forms
return;
}
AddWareForm addWaveForm = new AddWareForm();
var addWaveForm = new AddWareForm();
addWaveForm.InitializeViaWaveFile(fileName);
if (addWaveForm.ShowDialog() == System.Windows.Forms.DialogResult.OK)
if (addWaveForm.ShowDialog() == DialogResult.OK)
{
string peakWaveFileName = GetPeakWaveFileName(_videoFileName);
addWaveForm.WavePeak.WritePeakSamples(peakWaveFileName);
@ -10686,7 +10694,7 @@ namespace Nikse.SubtitleEdit.Forms
private void ImportAndOcrBluRaySup(string fileName)
{
StringBuilder log = new StringBuilder();
var log = new StringBuilder();
var subtitles = BluRaySupParser.ParseBluRaySup(fileName, log);
subtitles = SplitBitmaps(subtitles);
if (subtitles.Count > 0)
@ -10785,7 +10793,7 @@ namespace Nikse.SubtitleEdit.Forms
textBoxListViewText.Copy();
}
private void pasteToolStripMenuItem_Click(object sender, EventArgs e)
private void PasteToolStripMenuItemClick(object sender, EventArgs e)
{
if (textBoxListViewTextAlternate.Focused)
textBoxListViewTextAlternate.Paste();
@ -10793,7 +10801,7 @@ namespace Nikse.SubtitleEdit.Forms
textBoxListViewText.Paste();
}
private void deleteToolStripMenuItem_Click(object sender, EventArgs e)
private void DeleteToolStripMenuItemClick(object sender, EventArgs e)
{
if (textBoxListViewTextAlternate.Focused)
textBoxListViewTextAlternate.DeselectAll();
@ -10801,7 +10809,7 @@ namespace Nikse.SubtitleEdit.Forms
textBoxListViewText.DeselectAll();
}
private void normalToolStripMenuItem1_Click(object sender, EventArgs e)
private void NormalToolStripMenuItem1Click(object sender, EventArgs e)
{
TextBox tb;
if (textBoxListViewTextAlternate.Focused)
@ -10843,22 +10851,22 @@ namespace Nikse.SubtitleEdit.Forms
tb.SelectionLength = text.Length;
}
private void boldToolStripMenuItem1_Click(object sender, EventArgs e)
private void BoldToolStripMenuItem1Click(object sender, EventArgs e)
{
TextBoxListViewToggleTag("b");
}
private void italicToolStripMenuItem1_Click(object sender, EventArgs e)
private void ItalicToolStripMenuItem1Click(object sender, EventArgs e)
{
TextBoxListViewToggleTag("i");
}
private void underlineToolStripMenuItem1_Click(object sender, EventArgs e)
private void UnderlineToolStripMenuItem1Click(object sender, EventArgs e)
{
TextBoxListViewToggleTag("u");
}
private void colorToolStripMenuItem1_Click(object sender, EventArgs e)
private void ColorToolStripMenuItem1Click(object sender, EventArgs e)
{
TextBox tb;
if (textBoxListViewTextAlternate.Focused)
@ -10913,7 +10921,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void fontNameToolStripMenuItem_Click(object sender, EventArgs e)
private void FontNameToolStripMenuItemClick(object sender, EventArgs e)
{
TextBox tb;
if (textBoxListViewTextAlternate.Focused)
@ -11417,10 +11425,6 @@ namespace Nikse.SubtitleEdit.Forms
if (firstUndock)
{
Configuration.Settings.General.UndockedVideoPosition = _videoPlayerUnDocked.Left.ToString() + ";" + _videoPlayerUnDocked.Top.ToString() + ";" + _videoPlayerUnDocked.Width + ";" + _videoPlayerUnDocked.Height;
//if (_waveFormUnDocked != null && !_waveFormUnDocked.IsDisposed)
// Configuration.Settings.General.UndockedWaveformPosition = _waveFormUnDocked.Left.ToString() + ";" + _waveFormUnDocked.Top.ToString() + ";" + _waveFormUnDocked.Width + ";" + _waveFormUnDocked.Height;
//if (_videoControlsUnDocked != null && !_videoControlsUnDocked.IsDisposed)
// Configuration.Settings.General.UndockedVideoControlsPosition = _videoControlsUnDocked.Left.ToString() + ";" + _videoControlsUnDocked.Top.ToString() + ";" + _videoControlsUnDocked.Width + ";" + _videoControlsUnDocked.Height;
}
Control control = null;
@ -11522,7 +11526,7 @@ namespace Nikse.SubtitleEdit.Forms
checkBoxSyncSubWithVideo.Left = videoButtons.Left + videoButtons.Width + 5;
}
private void undockVideoControlsToolStripMenuItem_Click(object sender, EventArgs e)
private void UndockVideoControlsToolStripMenuItemClick(object sender, EventArgs e)
{
if (Configuration.Settings.General.Undocked)
return;
@ -11577,7 +11581,7 @@ namespace Nikse.SubtitleEdit.Forms
tabControl1_SelectedIndexChanged(null, null);
}
public void redockVideoControlsToolStripMenuItem_Click(object sender, EventArgs e)
public void RedockVideoControlsToolStripMenuItemClick(object sender, EventArgs e)
{
if (!Configuration.Settings.General.Undocked)
return;
@ -11629,7 +11633,7 @@ namespace Nikse.SubtitleEdit.Forms
HideVideoPlayer();
mediaPlayer.Invalidate();
this.Refresh();
Refresh();
undockVideoControlsToolStripMenuItem.Visible = true;
redockVideoControlsToolStripMenuItem.Visible = false;
@ -11645,7 +11649,7 @@ namespace Nikse.SubtitleEdit.Forms
toolStripButtonToggleVideo.Checked = false;
}
private void toolStripMenuItemInsertSubtitle_Click(object sender, EventArgs e)
private void ToolStripMenuItemInsertSubtitleClick(object sender, EventArgs e)
{
openFileDialog1.Title = _languageGeneral.OpenSubtitle;
openFileDialog1.FileName = string.Empty;
@ -11668,7 +11672,7 @@ namespace Nikse.SubtitleEdit.Forms
MakeHistoryForUndo(string.Format(_language.BeforeInsertLine, openFileDialog1.FileName));
Encoding encoding = null;
Subtitle subtitle = new Subtitle();
var subtitle = new Subtitle();
SubtitleFormat format = subtitle.LoadSubtitle(openFileDialog1.FileName, out encoding, encoding);
if (format != null)
@ -11724,12 +11728,12 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void insertLineToolStripMenuItem_Click(object sender, EventArgs e)
private void InsertLineToolStripMenuItemClick(object sender, EventArgs e)
{
InsertBefore();
}
private void closeVideoToolStripMenuItem_Click(object sender, EventArgs e)
private void CloseVideoToolStripMenuItemClick(object sender, EventArgs e)
{
timer1.Stop();
if (mediaPlayer != null && mediaPlayer.VideoPlayer != null)
@ -11737,6 +11741,8 @@ namespace Nikse.SubtitleEdit.Forms
mediaPlayer.SubtitleText = string.Empty;
mediaPlayer.VideoPlayer.DisposeVideoPlayer();
}
mediaPlayer.SetPlayerName(string.Empty);
mediaPlayer.ResetTimeLabel();
mediaPlayer.VideoPlayer = null;
_videoFileName = null;
_videoAudioTrackNumber = -1;
@ -11747,7 +11753,7 @@ namespace Nikse.SubtitleEdit.Forms
}
private void toolStripMenuItemVideo_DropDownOpening(object sender, EventArgs e)
private void ToolStripMenuItemVideoDropDownOpening(object sender, EventArgs e)
{
if (_isVideoControlsUnDocked)
{
@ -11762,9 +11768,9 @@ namespace Nikse.SubtitleEdit.Forms
closeVideoToolStripMenuItem.Visible = !string.IsNullOrEmpty(_videoFileName);
toolStripMenuItemSetAudioTrack.Visible = false;
if (mediaPlayer.VideoPlayer != null && mediaPlayer.VideoPlayer is Nikse.SubtitleEdit.Logic.VideoPlayers.LibVlc11xDynamic)
if (mediaPlayer.VideoPlayer != null && mediaPlayer.VideoPlayer is Logic.VideoPlayers.LibVlc11xDynamic)
{
var libVlc = (Nikse.SubtitleEdit.Logic.VideoPlayers.LibVlc11xDynamic)mediaPlayer.VideoPlayer;
var libVlc = (Logic.VideoPlayers.LibVlc11xDynamic)mediaPlayer.VideoPlayer;
int numberOfTracks = libVlc.AudioTrackCount;
_videoAudioTrackNumber = libVlc.AudioTrackNumber;
if (numberOfTracks > 1)
@ -11783,9 +11789,9 @@ namespace Nikse.SubtitleEdit.Forms
private void ChooseAudioTrack(object sender, EventArgs e)
{
if (mediaPlayer.VideoPlayer != null && mediaPlayer.VideoPlayer is Nikse.SubtitleEdit.Logic.VideoPlayers.LibVlc11xDynamic)
if (mediaPlayer.VideoPlayer != null && mediaPlayer.VideoPlayer is Logic.VideoPlayers.LibVlc11xDynamic)
{
var libVlc = (Nikse.SubtitleEdit.Logic.VideoPlayers.LibVlc11xDynamic)mediaPlayer.VideoPlayer;
var libVlc = (Logic.VideoPlayers.LibVlc11xDynamic)mediaPlayer.VideoPlayer;
var item = sender as ToolStripItem;
int number = int.Parse(item.Text);
@ -11816,7 +11822,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void textBoxListViewTextAlternate_KeyDown(object sender, KeyEventArgs e)
private void TextBoxListViewTextAlternateKeyDown(object sender, KeyEventArgs e)
{
_listViewAlternateTextTicks = DateTime.Now.Ticks;
if (_subtitleAlternate == null || _subtitleAlternate.Paragraphs.Count < 1)
@ -11871,15 +11877,14 @@ namespace Nikse.SubtitleEdit.Forms
_lastTextKeyDownTicks = DateTime.Now.Ticks;
UpdatePositionAndTotalLength(labelTextAlternateLineTotal, textBoxListViewTextAlternate);
}
private void openOriginalToolStripMenuItem_Click(object sender, EventArgs e)
private void OpenOriginalToolStripMenuItemClick(object sender, EventArgs e)
{
OpenAlternateSubtitle();
}
private void saveOriginalAstoolStripMenuItem_Click(object sender, EventArgs e)
private void SaveOriginalAstoolStripMenuItemClick(object sender, EventArgs e)
{
SubtitleFormat currentFormat = GetCurrentSubtitleFormat();
Utilities.SetSaveDialogFilter(saveFileDialog1, currentFormat);
@ -11904,11 +11909,11 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void saveOriginalToolStripMenuItem_Click(object sender, EventArgs e)
private void SaveOriginalToolStripMenuItemClick(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(_subtitleAlternateFileName))
{
saveOriginalAstoolStripMenuItem_Click(null, null);
SaveOriginalAstoolStripMenuItemClick(null, null);
return;
}
@ -11922,7 +11927,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void removeOriginalToolStripMenuItem_Click(object sender, EventArgs e)
private void RemoveOriginalToolStripMenuItemClick(object sender, EventArgs e)
{
if (ContinueNewOrExitAlternate())
{
@ -11957,7 +11962,7 @@ namespace Nikse.SubtitleEdit.Forms
SetTitle();
}
private void toolStripMenuItemSpellCheckMain_DropDownOpening(object sender, EventArgs e)
private void ToolStripMenuItemSpellCheckMainDropDownOpening(object sender, EventArgs e)
{
if (Configuration.Settings.General.SpellChecker.ToLower().Contains("word"))
{
@ -11973,7 +11978,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void toolStripMenuItemPlayRateSlow_Click(object sender, EventArgs e)
private void ToolStripMenuItemPlayRateSlowClick(object sender, EventArgs e)
{
if (mediaPlayer.VideoPlayer != null)
{
@ -11986,7 +11991,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void toolStripMenuItemPlayRateNormal_Click(object sender, EventArgs e)
private void ToolStripMenuItemPlayRateNormalClick(object sender, EventArgs e)
{
if (mediaPlayer.VideoPlayer != null)
{
@ -11999,7 +12004,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void toolStripMenuItemPlayRateFast_Click(object sender, EventArgs e)
private void ToolStripMenuItemPlayRateFastClick(object sender, EventArgs e)
{
if (mediaPlayer.VideoPlayer != null)
{
@ -12012,7 +12017,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void veryFastToolStripMenuItem_Click(object sender, EventArgs e)
private void VeryFastToolStripMenuItemClick(object sender, EventArgs e)
{
if (mediaPlayer.VideoPlayer != null)
{
@ -12025,19 +12030,17 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void splitContainer1_SplitterMoved(object sender, SplitterEventArgs e)
private void SplitContainer1SplitterMoved(object sender, SplitterEventArgs e)
{
Main_Resize(null, null);
}
private void buttonSplitLine_Click(object sender, EventArgs e)
private void ButtonSplitLineClick(object sender, EventArgs e)
{
SplitSelectedParagraph(null, null);
}
///////////// 3.2 /////////////
private void toolStripMenuItemCopySourceText_Click(object sender, EventArgs e)
private void ToolStripMenuItemCopySourceTextClick(object sender, EventArgs e)
{
Subtitle selectedLines = new Subtitle(_subtitle);
selectedLines.Paragraphs.Clear();
@ -12073,7 +12076,7 @@ namespace Nikse.SubtitleEdit.Forms
double durationTotalMilliseconds = p.Duration.TotalMilliseconds;
double totalMillisecondsEnd = mediaPlayer.CurrentPosition * 1000.0;
TimeCode tc = new TimeCode(TimeSpan.FromMilliseconds(totalMillisecondsEnd - durationTotalMilliseconds));
var tc = new TimeCode(TimeSpan.FromMilliseconds(totalMillisecondsEnd - durationTotalMilliseconds));
MakeHistoryForUndo(_language.BeforeSetEndAndVideoPosition + " " + tc.ToString());
_makeHistory = false;
@ -12105,7 +12108,7 @@ namespace Nikse.SubtitleEdit.Forms
}
timeUpDownStartTime.MaskedTextBox.TextChanged -= MaskedTextBox_TextChanged;
Paragraph oldParagraph = new Paragraph(_subtitle.Paragraphs[index]);
var oldParagraph = new Paragraph(_subtitle.Paragraphs[index]);
double videoPosition = mediaPlayer.CurrentPosition;
timeUpDownStartTime.TimeCode = new TimeCode(TimeSpan.FromSeconds(videoPosition));
@ -12132,13 +12135,13 @@ namespace Nikse.SubtitleEdit.Forms
audioVisualizer.Invalidate();
}
private void editSelectAllToolStripMenuItem_Click(object sender, EventArgs e)
private void EditSelectAllToolStripMenuItemClick(object sender, EventArgs e)
{
for (int i = 0; i < SubtitleListview1.Items.Count; i++)
SubtitleListview1.Items[i].Selected = true;
}
private void toolStripMenuItemSplitTextAtCursor_Click(object sender, EventArgs e)
private void ToolStripMenuItemSplitTextAtCursorClick(object sender, EventArgs e)
{
TextBox tb =textBoxListViewText;
if (textBoxListViewTextAlternate.Focused)
@ -12150,7 +12153,7 @@ namespace Nikse.SubtitleEdit.Forms
SplitSelectedParagraph(null, pos);
}
private void contextMenuStripTextBoxListView_Opening(object sender, System.ComponentModel.CancelEventArgs e)
private void ContextMenuStripTextBoxListViewOpening(object sender, System.ComponentModel.CancelEventArgs e)
{
TextBox tb = textBoxListViewText;
if (textBoxListViewTextAlternate.Focused)
@ -12169,30 +12172,30 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void toolStripMenuItemExportPngXml_Click(object sender, EventArgs e)
private void ToolStripMenuItemExportPngXmlClick(object sender, EventArgs e)
{
ExportPngXml exportBdnXmlPng = new ExportPngXml();
var exportBdnXmlPng = new ExportPngXml();
exportBdnXmlPng.Initialize(_subtitle, "BDNXML", _fileName);
exportBdnXmlPng.ShowDialog(this);
}
private void tabControlSubtitle_Selecting(object sender, TabControlCancelEventArgs e)
private void TabControlSubtitleSelecting(object sender, TabControlCancelEventArgs e)
{
if (tabControlSubtitle.SelectedIndex != TabControlSourceView && textBoxSource.Text.Trim().Length > 1)
{
Subtitle temp = new Subtitle(_subtitle);
var temp = new Subtitle(_subtitle);
SubtitleFormat format = temp.ReloadLoadSubtitle(new List<string>(textBoxSource.Lines), null);
if (format == null)
e.Cancel = true;
}
}
private void toolStripComboBoxFrameRate_TextChanged(object sender, EventArgs e)
private void ToolStripComboBoxFrameRateTextChanged(object sender, EventArgs e)
{
Configuration.Settings.General.CurrentFrameRate = CurrentFrameRate;
}
private void toolStripMenuItemGoogleMicrosoftTranslateSelLine_Click(object sender, EventArgs e)
private void ToolStripMenuItemGoogleMicrosoftTranslateSelLineClick(object sender, EventArgs e)
{
int firstSelectedIndex = FirstSelectedIndex;
if (firstSelectedIndex >= 0)
@ -12227,27 +12230,27 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void numericUpDownSec1_ValueChanged(object sender, EventArgs e)
private void NumericUpDownSec1ValueChanged(object sender, EventArgs e)
{
Configuration.Settings.General.SmallDelayMilliseconds = (int)(numericUpDownSec1.Value * 1000);
}
private void numericUpDownSec2_ValueChanged(object sender, EventArgs e)
private void NumericUpDownSec2ValueChanged(object sender, EventArgs e)
{
Configuration.Settings.General.LargeDelayMilliseconds = (int)(numericUpDownSec2.Value * 1000);
}
private void numericUpDownSecAdjust1_ValueChanged(object sender, EventArgs e)
private void NumericUpDownSecAdjust1ValueChanged(object sender, EventArgs e)
{
Configuration.Settings.General.SmallDelayMilliseconds = (int)(numericUpDownSecAdjust1.Value * 1000);
}
private void numericUpDownSecAdjust2_ValueChanged(object sender, EventArgs e)
private void NumericUpDownSecAdjust2ValueChanged(object sender, EventArgs e)
{
Configuration.Settings.General.LargeDelayMilliseconds = (int)(numericUpDownSecAdjust2.Value * 1000);
}
private void toolStripMenuItemMakeEmptyFromCurrent_Click(object sender, EventArgs e)
private void ToolStripMenuItemMakeEmptyFromCurrentClick(object sender, EventArgs e)
{
if (ContinueNewOrExit())
{
@ -12276,20 +12279,20 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void toolStripMenuItemShowOriginalInPreview_Click(object sender, EventArgs e)
private void ToolStripMenuItemShowOriginalInPreviewClick(object sender, EventArgs e)
{
toolStripMenuItemShowOriginalInPreview.Checked = !toolStripMenuItemShowOriginalInPreview.Checked;
Configuration.Settings.General.ShowOriginalAsPreviewIfAvailable = toolStripMenuItemShowOriginalInPreview.Checked;
}
private void toolStripMenuItemVideo_DropDownClosed(object sender, EventArgs e)
private void ToolStripMenuItemVideoDropDownClosed(object sender, EventArgs e)
{
redockVideoControlsToolStripMenuItem.ShortcutKeys = Keys.None;
undockVideoControlsToolStripMenuItem.ShortcutKeys = Keys.None;
}
private void toolsToolStripMenuItem_DropDownOpening(object sender, EventArgs e)
private void ToolsToolStripMenuItemDropDownOpening(object sender, EventArgs e)
{
if (_subtitle != null && _subtitle.Paragraphs.Count > 0 && _networkSession == null)
{
@ -12306,7 +12309,7 @@ namespace Nikse.SubtitleEdit.Forms
toolStripMenuItemShowOriginalInPreview.Visible = SubtitleListview1.IsAlternateTextColumnVisible;
}
private void contextMenuStripWaveForm_Opening(object sender, System.ComponentModel.CancelEventArgs e)
private void ContextMenuStripWaveFormOpening(object sender, System.ComponentModel.CancelEventArgs e)
{
if (audioVisualizer.IsSpectrogramAvailable)
{
@ -12338,30 +12341,30 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void showWaveformAndSpectrogramToolStripMenuItem_Click(object sender, EventArgs e)
private void ShowWaveformAndSpectrogramToolStripMenuItemClick(object sender, EventArgs e)
{
audioVisualizer.ShowSpectrogram = true;
audioVisualizer.ShowWaveform = true;
}
private void showOnlyWaveformToolStripMenuItem_Click(object sender, EventArgs e)
private void ShowOnlyWaveformToolStripMenuItemClick(object sender, EventArgs e)
{
audioVisualizer.ShowSpectrogram = false;
audioVisualizer.ShowWaveform = true;
}
private void showOnlySpectrogramToolStripMenuItem_Click(object sender, EventArgs e)
private void ShowOnlySpectrogramToolStripMenuItemClick(object sender, EventArgs e)
{
audioVisualizer.ShowSpectrogram = true;
audioVisualizer.ShowWaveform = false;
}
private void splitContainerMain_SplitterMoved(object sender, SplitterEventArgs e)
private void SplitContainerMainSplitterMoved(object sender, SplitterEventArgs e)
{
mediaPlayer.Refresh();
}
private void FindDoubleLinesToolStripMenuItem_Click(object sender, EventArgs e)
private void FindDoubleLinesToolStripMenuItemClick(object sender, EventArgs e)
{
for (int i = FirstSelectedIndex+1; i < _subtitle.Paragraphs.Count; i++)
{
@ -12379,9 +12382,9 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void textBoxListViewTextAlternate_MouseMove(object sender, MouseEventArgs e)
private void TextBoxListViewTextAlternateMouseMove(object sender, MouseEventArgs e)
{
if (Control.ModifierKeys == Keys.Control && MouseButtons == System.Windows.Forms.MouseButtons.Left)
if (Control.ModifierKeys == Keys.Control && MouseButtons == MouseButtons.Left)
{
if (!string.IsNullOrEmpty(textBoxListViewTextAlternate.SelectedText))
textBoxListViewTextAlternate.DoDragDrop(textBoxListViewTextAlternate.SelectedText, DragDropEffects.Copy);
@ -12390,7 +12393,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void eBUSTLToolStripMenuItem_Click(object sender, EventArgs e)
private void EBustlToolStripMenuItemClick(object sender, EventArgs e)
{
var ebu = new Ebu();
saveFileDialog1.Filter = ebu.Name + "|*" + ebu.Extension;
@ -12423,7 +12426,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void toolStripMenuItemCavena890_Click(object sender, EventArgs e)
private void ToolStripMenuItemCavena890Click(object sender, EventArgs e)
{
var cavena890 = new Cavena890();
saveFileDialog1.Filter = cavena890.Name + "|*" + cavena890.Extension;
@ -12456,7 +12459,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void pACScreenElectronicsToolStripMenuItem_Click(object sender, EventArgs e)
private void PAcScreenElectronicsToolStripMenuItemClick(object sender, EventArgs e)
{
var pac = new Pac();
saveFileDialog1.Filter = pac.Name + "|*" + pac.Extension;
@ -12489,24 +12492,24 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void textBoxListViewText_Enter(object sender, EventArgs e)
private void TextBoxListViewTextEnter(object sender, EventArgs e)
{
if (_findHelper != null)
_findHelper.MatchInOriginal = false;
}
private void textBoxListViewTextAlternate_Enter(object sender, EventArgs e)
private void TextBoxListViewTextAlternateEnter(object sender, EventArgs e)
{
if (_findHelper != null)
_findHelper.MatchInOriginal = true;
}
private void plainTextToolStripMenuItem_Click(object sender, EventArgs e)
private void PlainTextToolStripMenuItemClick(object sender, EventArgs e)
{
ExportTextOnly(false);
}
private void plainTextWithoutLineBreaksToolStripMenuItem_Click(object sender, EventArgs e)
private void PlainTextWithoutLineBreaksToolStripMenuItemClick(object sender, EventArgs e)
{
ExportTextOnly(true);
}
@ -12537,27 +12540,27 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void bluraySupToolStripMenuItem_Click(object sender, EventArgs e)
private void BluraySupToolStripMenuItemClick(object sender, EventArgs e)
{
ExportPngXml exportBdnXmlPng = new ExportPngXml();
var exportBdnXmlPng = new ExportPngXml();
exportBdnXmlPng.Initialize(_subtitle, "BLURAYSUP", _fileName);
exportBdnXmlPng.ShowDialog(this);
}
private void vobSubsubidxToolStripMenuItem_Click(object sender, EventArgs e)
private void VobSubsubidxToolStripMenuItemClick(object sender, EventArgs e)
{
ExportPngXml exportBdnXmlPng = new ExportPngXml();
var exportBdnXmlPng = new ExportPngXml();
exportBdnXmlPng.Initialize(_subtitle, "VOBSUB", _fileName);
exportBdnXmlPng.ShowDialog(this);
}
private void textBoxListViewTextAlternate_KeyUp(object sender, KeyEventArgs e)
private void TextBoxListViewTextAlternateKeyUp(object sender, KeyEventArgs e)
{
textBoxListViewTextAlternate.ClearUndo();
UpdatePositionAndTotalLength(labelTextAlternateLineTotal, textBoxListViewTextAlternate);
}
private void timerTextUndo_Tick(object sender, EventArgs e)
private void TimerTextUndoTick(object sender, EventArgs e)
{
int index = _listViewTextUndoIndex;
if (_listViewTextTicks == -1 || !this.CanFocus | _subtitle == null || _subtitle.Paragraphs.Count == 0 || index < 0 || index >= _subtitle.Paragraphs.Count)
@ -12568,10 +12571,7 @@ namespace Nikse.SubtitleEdit.Forms
string newText = _subtitle.Paragraphs[index].Text.TrimEnd();
string oldText = _listViewTextUndoLast;
if (oldText == null)
{
oldText = newText;
return;
}
if (_listViewTextUndoLast != newText)
{
@ -12584,7 +12584,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void timerAlternateTextUndo_Tick(object sender, EventArgs e)
private void TimerAlternateTextUndoTick(object sender, EventArgs e)
{
if (Configuration.Settings.General.AllowEditOfOriginalSubtitle && _subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0)
{
@ -12603,10 +12603,7 @@ namespace Nikse.SubtitleEdit.Forms
string newText = _subtitleAlternate.Paragraphs[index].Text.TrimEnd();
string oldText = _listViewAlternateTextUndoLast;
if (oldText == null)
{
oldText = newText;
return;
}
if (_listViewAlternateTextUndoLast != newText)
{
@ -12639,35 +12636,26 @@ namespace Nikse.SubtitleEdit.Forms
lineTotal.Left = textBox.Left + (textBox.Width - lineTotal.Width);
return;
}
else
int secondLineBreakPos = textBox.Text.IndexOf(Environment.NewLine, lineBreakPos + 1);
if (secondLineBreakPos == -1 || pos <= secondLineBreakPos + extraNewLineLength)
{
int secondLineBreakPos = textBox.Text.IndexOf(Environment.NewLine, lineBreakPos + 1);
if (secondLineBreakPos == -1 || pos <= secondLineBreakPos + extraNewLineLength)
{
lineTotal.Text = "2," + (pos - (lineBreakPos + extraNewLineLength)) + totalL;
lineTotal.Left = textBox.Left + (textBox.Width - lineTotal.Width);
return;
}
else
{
int thirdLineBreakPos = textBox.Text.IndexOf(Environment.NewLine, secondLineBreakPos + 1);
if (thirdLineBreakPos == -1 || pos < thirdLineBreakPos + (extraNewLineLength * 2))
{
lineTotal.Text = "3," + (pos - (secondLineBreakPos + extraNewLineLength)) + totalL;
lineTotal.Left = textBox.Left + (textBox.Width - lineTotal.Width);
return;
}
else
{
int forthLineBreakPos = textBox.Text.IndexOf(Environment.NewLine, thirdLineBreakPos + 1);
if (forthLineBreakPos == -1 || pos < forthLineBreakPos + (extraNewLineLength * 3))
{
lineTotal.Text = "4," + (pos - (thirdLineBreakPos + extraNewLineLength)) + totalL;
lineTotal.Left = textBox.Left + (textBox.Width - lineTotal.Width);
return;
}
}
}
lineTotal.Text = "2," + (pos - (lineBreakPos + extraNewLineLength)) + totalL;
lineTotal.Left = textBox.Left + (textBox.Width - lineTotal.Width);
return;
}
int thirdLineBreakPos = textBox.Text.IndexOf(Environment.NewLine, secondLineBreakPos + 1);
if (thirdLineBreakPos == -1 || pos < thirdLineBreakPos + (extraNewLineLength * 2))
{
lineTotal.Text = "3," + (pos - (secondLineBreakPos + extraNewLineLength)) + totalL;
lineTotal.Left = textBox.Left + (textBox.Width - lineTotal.Width);
return;
}
int forthLineBreakPos = textBox.Text.IndexOf(Environment.NewLine, thirdLineBreakPos + 1);
if (forthLineBreakPos == -1 || pos < forthLineBreakPos + (extraNewLineLength * 3))
{
lineTotal.Text = "4," + (pos - (thirdLineBreakPos + extraNewLineLength)) + totalL;
lineTotal.Left = textBox.Left + (textBox.Width - lineTotal.Width);
return;
}
lineTotal.Text = string.Empty;
}
@ -12682,11 +12670,11 @@ namespace Nikse.SubtitleEdit.Forms
UpdatePositionAndTotalLength(labelTextAlternateLineTotal, textBoxListViewTextAlternate);
}
private void tabControlButtons_DrawItem(object sender, DrawItemEventArgs e)
private void TabControlButtonsDrawItem(object sender, DrawItemEventArgs e)
{
TabControl tc = (TabControl)sender;
Brush textBrush = new SolidBrush(this.ForeColor);
Font tabFont = new Font(tc.Font, FontStyle.Regular);
var tc = (TabControl)sender;
var textBrush = new SolidBrush(this.ForeColor);
var tabFont = new Font(tc.Font, FontStyle.Regular);
if (e.State == DrawItemState.Selected)
{
tabFont = new Font(tc.Font, FontStyle.Bold);
@ -12743,9 +12731,9 @@ namespace Nikse.SubtitleEdit.Forms
}
}
private void adobeEncoreFABImageScriptToolStripMenuItem_Click(object sender, EventArgs e)
private void AdobeEncoreFabImageScriptToolStripMenuItemClick(object sender, EventArgs e)
{
ExportPngXml exportBdnXmlPng = new ExportPngXml();
var exportBdnXmlPng = new ExportPngXml();
exportBdnXmlPng.Initialize(_subtitle, "FAB", _fileName);
exportBdnXmlPng.ShowDialog(this);
}

View File

@ -681,7 +681,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD0
CAAAAk1TRnQBSQFMAgEBAgEAATgBEAE4AhABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
CAAAAk1TRnQBSQFMAgEBAgEAAUABEAFAAhABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA
AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA
AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm

View File

@ -52,7 +52,7 @@ namespace Nikse.SubtitleEdit.Forms
private void VideoControlsUndocked_KeyDown(object sender, KeyEventArgs e)
{
if (_redockKeys == e.KeyData)
_mainForm.redockVideoControlsToolStripMenuItem_Click(null, null);
_mainForm.RedockVideoControlsToolStripMenuItemClick(null, null);
}
}
}

View File

@ -40,7 +40,7 @@ namespace Nikse.SubtitleEdit.Forms
{
if (RedockOnFullscreenEnd)
{
_mainForm.redockVideoControlsToolStripMenuItem_Click(null, null);
_mainForm.RedockVideoControlsToolStripMenuItemClick(null, null);
}
else if (e.CloseReason == CloseReason.UserClosing && panelContainer.Controls.Count > 0)
{
@ -116,7 +116,7 @@ namespace Nikse.SubtitleEdit.Forms
else if (_redockKeys == e.KeyData)
{
_mainForm.redockVideoControlsToolStripMenuItem_Click(null, null);
_mainForm.RedockVideoControlsToolStripMenuItemClick(null, null);
e.SuppressKeyPress = true;
}
else

View File

@ -48,7 +48,7 @@ namespace Nikse.SubtitleEdit.Forms
private void WaveFormUnDocked_KeyDown(object sender, KeyEventArgs e)
{
if (_redockKeys == e.KeyData)
_mainForm.redockVideoControlsToolStripMenuItem_Click(null, null);
_mainForm.RedockVideoControlsToolStripMenuItemClick(null, null);
else
_mainForm.Main_KeyDown(sender, e);
}