diff --git a/src/Forms/Main.Designer.cs b/src/Forms/Main.Designer.cs index 5060e57f9..e2a81226c 100644 --- a/src/Forms/Main.Designer.cs +++ b/src/Forms/Main.Designer.cs @@ -294,7 +294,6 @@ this.toolStripMenuItemPlayRateNormal = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemPlayRateFast = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemPlayRateVeryFast = new System.Windows.Forms.ToolStripMenuItem(); - this.audioVisualizer = new Nikse.SubtitleEdit.Controls.AudioVisualizer(); this.tabControlButtons = new System.Windows.Forms.TabControl(); this.tabPageTranslate = new System.Windows.Forms.TabPage(); this.labelTranslateTip = new System.Windows.Forms.Label(); @@ -317,7 +316,6 @@ this.buttonPlayCurrent = new System.Windows.Forms.Button(); this.buttonPlayNext = new System.Windows.Forms.Button(); this.tabPageCreate = new System.Windows.Forms.TabPage(); - this.timeUpDownVideoPosition = new Nikse.SubtitleEdit.Controls.TimeUpDown(); this.buttonGotoSub = new System.Windows.Forms.Button(); this.buttonBeforeText = new System.Windows.Forms.Button(); this.buttonSetEnd = new System.Windows.Forms.Button(); @@ -354,7 +352,6 @@ this.labelVideoPosition2 = new System.Windows.Forms.Label(); this.buttonAdjustGoToPosAndPause = new System.Windows.Forms.Button(); this.buttonAdjustPlayBefore = new System.Windows.Forms.Button(); - this.timeUpDownVideoPositionAdjust = new Nikse.SubtitleEdit.Controls.TimeUpDown(); this.ShowSubtitleTimer = new System.Windows.Forms.Timer(this.components); this.timerAutoDuration = new System.Windows.Forms.Timer(this.components); this.timerAutoContinue = new System.Windows.Forms.Timer(this.components); @@ -382,7 +379,6 @@ this.tabControlSubtitle = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.splitContainerListViewAndText = new System.Windows.Forms.SplitContainer(); - this.SubtitleListview1 = new Nikse.SubtitleEdit.Controls.SubtitleListView(); this.groupBoxEdit = new System.Windows.Forms.GroupBox(); this.labelSingleLine = new System.Windows.Forms.Label(); this.labelAlternateSingleLine = new System.Windows.Forms.Label(); @@ -394,7 +390,6 @@ this.labelTextAlternateLineLengths = new System.Windows.Forms.Label(); this.labelAlternateText = new System.Windows.Forms.Label(); this.labelText = new System.Windows.Forms.Label(); - this.textBoxListViewTextAlternate = new Nikse.SubtitleEdit.Controls.SETextBox(); this.contextMenuStripTextBoxListView = new System.Windows.Forms.ContextMenuStrip(this.components); this.toolStripMenuItemWebVttVoice = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparatorWebVTT = new System.Windows.Forms.ToolStripSeparator(); @@ -428,23 +423,28 @@ this.labelTextLineTotal = new System.Windows.Forms.Label(); this.labelCharactersPerSecond = new System.Windows.Forms.Label(); this.buttonUnBreak = new System.Windows.Forms.Button(); - this.timeUpDownStartTime = new Nikse.SubtitleEdit.Controls.TimeUpDown(); this.numericUpDownDuration = new System.Windows.Forms.NumericUpDown(); this.buttonPrevious = new System.Windows.Forms.Button(); this.buttonNext = new System.Windows.Forms.Button(); this.labelStartTime = new System.Windows.Forms.Label(); - this.textBoxListViewText = new Nikse.SubtitleEdit.Controls.SETextBox(); this.labelDuration = new System.Windows.Forms.Label(); this.labelAutoDuration = new System.Windows.Forms.Label(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.textBoxSource = new System.Windows.Forms.TextBox(); this.panelVideoPlayer = new System.Windows.Forms.Panel(); - this.mediaPlayer = new Nikse.SubtitleEdit.Controls.VideoPlayerContainer(); this.contextMenuStripEmpty = new System.Windows.Forms.ContextMenuStrip(this.components); this.insertLineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.imageListPlayRate = new System.Windows.Forms.ImageList(this.components); this.timerTextUndo = new System.Windows.Forms.Timer(this.components); this.timerAlternateTextUndo = new System.Windows.Forms.Timer(this.components); + this.SubtitleListview1 = new Nikse.SubtitleEdit.Controls.SubtitleListView(); + this.textBoxListViewTextAlternate = new Nikse.SubtitleEdit.Controls.SETextBox(); + this.timeUpDownStartTime = new Nikse.SubtitleEdit.Controls.TimeUpDown(); + this.textBoxListViewText = new Nikse.SubtitleEdit.Controls.SETextBox(); + this.mediaPlayer = new Nikse.SubtitleEdit.Controls.VideoPlayerContainer(); + this.audioVisualizer = new Nikse.SubtitleEdit.Controls.AudioVisualizer(); + this.timeUpDownVideoPosition = new Nikse.SubtitleEdit.Controls.TimeUpDown(); + this.timeUpDownVideoPositionAdjust = new Nikse.SubtitleEdit.Controls.TimeUpDown(); this.statusStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -661,6 +661,7 @@ this.toolStripButtonFixCommonErrors.Name = "toolStripButtonFixCommonErrors"; this.toolStripButtonFixCommonErrors.Size = new System.Drawing.Size(36, 37); this.toolStripButtonFixCommonErrors.Text = "Visual sync"; + this.toolStripButtonFixCommonErrors.ToolTipText = "Fix common errors"; this.toolStripButtonFixCommonErrors.Click += new System.EventHandler(this.toolStripButtonFixCommonErrors_Click); // // toolStripButtonVisualSync @@ -2700,40 +2701,6 @@ this.toolStripMenuItemPlayRateVeryFast.Text = "Very fast"; this.toolStripMenuItemPlayRateVeryFast.Click += new System.EventHandler(this.VeryFastToolStripMenuItemClick); // - // audioVisualizer - // - this.audioVisualizer.AllowDrop = true; - this.audioVisualizer.AllowNewSelection = true; - this.audioVisualizer.AllowOverlap = false; - this.audioVisualizer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.audioVisualizer.BackColor = System.Drawing.Color.Black; - this.audioVisualizer.BackgroundColor = System.Drawing.Color.Black; - this.audioVisualizer.Color = System.Drawing.Color.GreenYellow; - this.audioVisualizer.DrawGridLines = true; - this.audioVisualizer.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(18))))); - this.audioVisualizer.Location = new System.Drawing.Point(472, 32); - this.audioVisualizer.Margin = new System.Windows.Forms.Padding(0); - this.audioVisualizer.Name = "audioVisualizer"; - this.audioVisualizer.NewSelectionParagraph = null; - this.audioVisualizer.SceneChanges = ((System.Collections.Generic.List)(resources.GetObject("audioVisualizer.SceneChanges"))); - this.audioVisualizer.SelectedColor = System.Drawing.Color.Red; - this.audioVisualizer.ShowSpectrogram = false; - this.audioVisualizer.ShowWaveform = true; - this.audioVisualizer.Size = new System.Drawing.Size(499, 229); - this.audioVisualizer.StartPositionSeconds = 0D; - this.audioVisualizer.TabIndex = 6; - this.audioVisualizer.TextColor = System.Drawing.Color.Gray; - this.audioVisualizer.VerticalZoomPercent = 1D; - this.audioVisualizer.WaveFormNotLoadedText = "Click to add wave form"; - 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.AudioWaveFormDragDrop); - this.audioVisualizer.DragEnter += new System.Windows.Forms.DragEventHandler(this.AudioWaveFormDragEnter); - this.audioVisualizer.MouseEnter += new System.EventHandler(this.audioVisualizer_MouseEnter); - // // tabControlButtons // this.tabControlButtons.Controls.Add(this.tabPageTranslate); @@ -3023,16 +2990,6 @@ this.tabPageCreate.Text = "Create"; this.tabPageCreate.UseVisualStyleBackColor = true; // - // timeUpDownVideoPosition - // - this.timeUpDownVideoPosition.AutoSize = true; - this.timeUpDownVideoPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.timeUpDownVideoPosition.Location = new System.Drawing.Point(96, 191); - this.timeUpDownVideoPosition.Margin = new System.Windows.Forms.Padding(4); - this.timeUpDownVideoPosition.Name = "timeUpDownVideoPosition"; - this.timeUpDownVideoPosition.Size = new System.Drawing.Size(96, 25); - this.timeUpDownVideoPosition.TabIndex = 12; - // // buttonGotoSub // this.buttonGotoSub.Location = new System.Drawing.Point(6, 58); @@ -3467,16 +3424,6 @@ this.buttonAdjustPlayBefore.UseVisualStyleBackColor = true; this.buttonAdjustPlayBefore.Click += new System.EventHandler(this.buttonBeforeText_Click); // - // timeUpDownVideoPositionAdjust - // - this.timeUpDownVideoPositionAdjust.AutoSize = true; - this.timeUpDownVideoPositionAdjust.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.timeUpDownVideoPositionAdjust.Location = new System.Drawing.Point(96, 213); - this.timeUpDownVideoPositionAdjust.Margin = new System.Windows.Forms.Padding(4); - this.timeUpDownVideoPositionAdjust.Name = "timeUpDownVideoPositionAdjust"; - this.timeUpDownVideoPositionAdjust.Size = new System.Drawing.Size(96, 25); - this.timeUpDownVideoPositionAdjust.TabIndex = 13; - // // ShowSubtitleTimer // this.ShowSubtitleTimer.Enabled = true; @@ -3716,32 +3663,6 @@ this.splitContainerListViewAndText.SplitterDistance = 90; this.splitContainerListViewAndText.TabIndex = 2; // - // SubtitleListview1 - // - this.SubtitleListview1.AllowDrop = true; - this.SubtitleListview1.ContextMenuStrip = this.contextMenuStripListview; - this.SubtitleListview1.DisplayExtraFromExtra = false; - this.SubtitleListview1.Dock = System.Windows.Forms.DockStyle.Fill; - this.SubtitleListview1.FirstVisibleIndex = -1; - this.SubtitleListview1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.SubtitleListview1.FullRowSelect = true; - this.SubtitleListview1.GridLines = true; - this.SubtitleListview1.HideSelection = false; - this.SubtitleListview1.Location = new System.Drawing.Point(0, 0); - this.SubtitleListview1.Name = "SubtitleListview1"; - this.SubtitleListview1.OwnerDraw = true; - this.SubtitleListview1.Size = new System.Drawing.Size(724, 90); - this.SubtitleListview1.TabIndex = 0; - this.SubtitleListview1.UseCompatibleStateImageBehavior = false; - this.SubtitleListview1.UseSyntaxColoring = true; - this.SubtitleListview1.View = System.Windows.Forms.View.Details; - this.SubtitleListview1.SelectedIndexChanged += new System.EventHandler(this.SubtitleListview1_SelectedIndexChanged); - this.SubtitleListview1.DragDrop += new System.Windows.Forms.DragEventHandler(this.SubtitleListview1_DragDrop); - this.SubtitleListview1.DragEnter += new System.Windows.Forms.DragEventHandler(this.SubtitleListview1_DragEnter); - this.SubtitleListview1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SubtitleListview1KeyDown); - this.SubtitleListview1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.SubtitleListview1_MouseDoubleClick); - this.SubtitleListview1.MouseEnter += new System.EventHandler(this.SubtitleListview1_MouseEnter); - // // groupBoxEdit // this.groupBoxEdit.Controls.Add(this.labelSingleLine); @@ -3877,28 +3798,6 @@ this.labelText.TabIndex = 5; this.labelText.Text = "Text"; // - // textBoxListViewTextAlternate - // - this.textBoxListViewTextAlternate.AllowDrop = true; - this.textBoxListViewTextAlternate.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.textBoxListViewTextAlternate.ContextMenuStrip = this.contextMenuStripTextBoxListView; - this.textBoxListViewTextAlternate.Enabled = false; - this.textBoxListViewTextAlternate.HideSelection = false; - this.textBoxListViewTextAlternate.Location = new System.Drawing.Point(946, 28); - this.textBoxListViewTextAlternate.Multiline = true; - this.textBoxListViewTextAlternate.Name = "textBoxListViewTextAlternate"; - this.textBoxListViewTextAlternate.Size = new System.Drawing.Size(0, 59); - this.textBoxListViewTextAlternate.TabIndex = 33; - this.textBoxListViewTextAlternate.Visible = false; - this.textBoxListViewTextAlternate.MouseClick += new System.Windows.Forms.MouseEventHandler(this.TextBoxListViewTextAlternateMouseClick); - this.textBoxListViewTextAlternate.TextChanged += new System.EventHandler(this.textBoxListViewTextAlternate_TextChanged); - 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 // this.contextMenuStripTextBoxListView.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -4169,16 +4068,6 @@ this.buttonUnBreak.UseVisualStyleBackColor = true; this.buttonUnBreak.Click += new System.EventHandler(this.ButtonUnBreakClick); // - // timeUpDownStartTime - // - this.timeUpDownStartTime.AutoSize = true; - this.timeUpDownStartTime.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.timeUpDownStartTime.Location = new System.Drawing.Point(9, 26); - this.timeUpDownStartTime.Margin = new System.Windows.Forms.Padding(4); - this.timeUpDownStartTime.Name = "timeUpDownStartTime"; - this.timeUpDownStartTime.Size = new System.Drawing.Size(96, 25); - this.timeUpDownStartTime.TabIndex = 0; - // // numericUpDownDuration // this.numericUpDownDuration.DecimalPlaces = 3; @@ -4232,28 +4121,6 @@ this.labelStartTime.TabIndex = 3; this.labelStartTime.Text = "Start time"; // - // textBoxListViewText - // - this.textBoxListViewText.AllowDrop = true; - this.textBoxListViewText.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.textBoxListViewText.ContextMenuStrip = this.contextMenuStripTextBoxListView; - this.textBoxListViewText.Enabled = false; - this.textBoxListViewText.HideSelection = false; - this.textBoxListViewText.Location = new System.Drawing.Point(236, 28); - this.textBoxListViewText.Multiline = true; - this.textBoxListViewText.Name = "textBoxListViewText"; - this.textBoxListViewText.Size = new System.Drawing.Size(362, 59); - this.textBoxListViewText.TabIndex = 5; - this.textBoxListViewText.MouseClick += new System.Windows.Forms.MouseEventHandler(this.TextBoxListViewTextMouseClick); - this.textBoxListViewText.TextChanged += new System.EventHandler(this.TextBoxListViewTextTextChanged); - 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); - this.textBoxListViewText.MouseMove += new System.Windows.Forms.MouseEventHandler(this.textBoxListViewText_MouseMove); - // // labelDuration // this.labelDuration.AutoSize = true; @@ -4314,32 +4181,6 @@ this.panelVideoPlayer.Size = new System.Drawing.Size(220, 241); this.panelVideoPlayer.TabIndex = 5; // - // mediaPlayer - // - this.mediaPlayer.AllowDrop = true; - this.mediaPlayer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.mediaPlayer.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); - this.mediaPlayer.CurrentPosition = 0D; - this.mediaPlayer.FontSizeFactor = 1F; - this.mediaPlayer.Location = new System.Drawing.Point(0, 0); - this.mediaPlayer.Margin = new System.Windows.Forms.Padding(0); - this.mediaPlayer.Name = "mediaPlayer"; - this.mediaPlayer.ShowFullscreenButton = true; - this.mediaPlayer.ShowMuteButton = true; - this.mediaPlayer.ShowStopButton = true; - this.mediaPlayer.Size = new System.Drawing.Size(219, 241); - this.mediaPlayer.SubtitleText = ""; - this.mediaPlayer.TabIndex = 5; - this.mediaPlayer.TextRightToLeft = System.Windows.Forms.RightToLeft.No; - this.mediaPlayer.VideoHeight = 0; - this.mediaPlayer.VideoPlayer = null; - this.mediaPlayer.VideoWidth = 0; - this.mediaPlayer.Volume = 0D; - this.mediaPlayer.DragDrop += new System.Windows.Forms.DragEventHandler(this.mediaPlayer_DragDrop); - this.mediaPlayer.DragEnter += new System.Windows.Forms.DragEventHandler(this.mediaPlayer_DragEnter); - // // contextMenuStripEmpty // this.contextMenuStripEmpty.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -4371,6 +4212,166 @@ this.timerAlternateTextUndo.Interval = 700; this.timerAlternateTextUndo.Tick += new System.EventHandler(this.TimerAlternateTextUndoTick); // + // SubtitleListview1 + // + this.SubtitleListview1.AllowDrop = true; + this.SubtitleListview1.ContextMenuStrip = this.contextMenuStripListview; + this.SubtitleListview1.DisplayExtraFromExtra = false; + this.SubtitleListview1.Dock = System.Windows.Forms.DockStyle.Fill; + this.SubtitleListview1.FirstVisibleIndex = -1; + this.SubtitleListview1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.SubtitleListview1.FullRowSelect = true; + this.SubtitleListview1.GridLines = true; + this.SubtitleListview1.HideSelection = false; + this.SubtitleListview1.Location = new System.Drawing.Point(0, 0); + this.SubtitleListview1.Name = "SubtitleListview1"; + this.SubtitleListview1.OwnerDraw = true; + this.SubtitleListview1.Size = new System.Drawing.Size(724, 90); + this.SubtitleListview1.TabIndex = 0; + this.SubtitleListview1.UseCompatibleStateImageBehavior = false; + this.SubtitleListview1.UseSyntaxColoring = true; + this.SubtitleListview1.View = System.Windows.Forms.View.Details; + this.SubtitleListview1.SelectedIndexChanged += new System.EventHandler(this.SubtitleListview1_SelectedIndexChanged); + this.SubtitleListview1.DragDrop += new System.Windows.Forms.DragEventHandler(this.SubtitleListview1_DragDrop); + this.SubtitleListview1.DragEnter += new System.Windows.Forms.DragEventHandler(this.SubtitleListview1_DragEnter); + this.SubtitleListview1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SubtitleListview1KeyDown); + this.SubtitleListview1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.SubtitleListview1_MouseDoubleClick); + this.SubtitleListview1.MouseEnter += new System.EventHandler(this.SubtitleListview1_MouseEnter); + // + // textBoxListViewTextAlternate + // + this.textBoxListViewTextAlternate.AllowDrop = true; + this.textBoxListViewTextAlternate.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxListViewTextAlternate.ContextMenuStrip = this.contextMenuStripTextBoxListView; + this.textBoxListViewTextAlternate.Enabled = false; + this.textBoxListViewTextAlternate.HideSelection = false; + this.textBoxListViewTextAlternate.Location = new System.Drawing.Point(946, 28); + this.textBoxListViewTextAlternate.Multiline = true; + this.textBoxListViewTextAlternate.Name = "textBoxListViewTextAlternate"; + this.textBoxListViewTextAlternate.Size = new System.Drawing.Size(0, 59); + this.textBoxListViewTextAlternate.TabIndex = 33; + this.textBoxListViewTextAlternate.Visible = false; + this.textBoxListViewTextAlternate.MouseClick += new System.Windows.Forms.MouseEventHandler(this.TextBoxListViewTextAlternateMouseClick); + this.textBoxListViewTextAlternate.TextChanged += new System.EventHandler(this.textBoxListViewTextAlternate_TextChanged); + 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); + // + // timeUpDownStartTime + // + this.timeUpDownStartTime.AutoSize = true; + this.timeUpDownStartTime.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.timeUpDownStartTime.Location = new System.Drawing.Point(9, 26); + this.timeUpDownStartTime.Margin = new System.Windows.Forms.Padding(4); + this.timeUpDownStartTime.Name = "timeUpDownStartTime"; + this.timeUpDownStartTime.Size = new System.Drawing.Size(96, 25); + this.timeUpDownStartTime.TabIndex = 0; + // + // textBoxListViewText + // + this.textBoxListViewText.AllowDrop = true; + this.textBoxListViewText.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxListViewText.ContextMenuStrip = this.contextMenuStripTextBoxListView; + this.textBoxListViewText.Enabled = false; + this.textBoxListViewText.HideSelection = false; + this.textBoxListViewText.Location = new System.Drawing.Point(236, 28); + this.textBoxListViewText.Multiline = true; + this.textBoxListViewText.Name = "textBoxListViewText"; + this.textBoxListViewText.Size = new System.Drawing.Size(362, 59); + this.textBoxListViewText.TabIndex = 5; + this.textBoxListViewText.MouseClick += new System.Windows.Forms.MouseEventHandler(this.TextBoxListViewTextMouseClick); + this.textBoxListViewText.TextChanged += new System.EventHandler(this.TextBoxListViewTextTextChanged); + 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); + this.textBoxListViewText.MouseMove += new System.Windows.Forms.MouseEventHandler(this.textBoxListViewText_MouseMove); + // + // mediaPlayer + // + this.mediaPlayer.AllowDrop = true; + this.mediaPlayer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.mediaPlayer.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); + this.mediaPlayer.CurrentPosition = 0D; + this.mediaPlayer.FontSizeFactor = 1F; + this.mediaPlayer.Location = new System.Drawing.Point(0, 0); + this.mediaPlayer.Margin = new System.Windows.Forms.Padding(0); + this.mediaPlayer.Name = "mediaPlayer"; + this.mediaPlayer.ShowFullscreenButton = true; + this.mediaPlayer.ShowMuteButton = true; + this.mediaPlayer.ShowStopButton = true; + this.mediaPlayer.Size = new System.Drawing.Size(219, 241); + this.mediaPlayer.SubtitleText = ""; + this.mediaPlayer.TabIndex = 5; + this.mediaPlayer.TextRightToLeft = System.Windows.Forms.RightToLeft.No; + this.mediaPlayer.VideoHeight = 0; + this.mediaPlayer.VideoPlayer = null; + this.mediaPlayer.VideoWidth = 0; + this.mediaPlayer.Volume = 0D; + this.mediaPlayer.DragDrop += new System.Windows.Forms.DragEventHandler(this.mediaPlayer_DragDrop); + this.mediaPlayer.DragEnter += new System.Windows.Forms.DragEventHandler(this.mediaPlayer_DragEnter); + // + // audioVisualizer + // + this.audioVisualizer.AllowDrop = true; + this.audioVisualizer.AllowNewSelection = true; + this.audioVisualizer.AllowOverlap = false; + this.audioVisualizer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.audioVisualizer.BackColor = System.Drawing.Color.Black; + this.audioVisualizer.BackgroundColor = System.Drawing.Color.Black; + this.audioVisualizer.Color = System.Drawing.Color.GreenYellow; + this.audioVisualizer.DrawGridLines = true; + this.audioVisualizer.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(18))))); + this.audioVisualizer.Location = new System.Drawing.Point(472, 32); + this.audioVisualizer.Margin = new System.Windows.Forms.Padding(0); + this.audioVisualizer.Name = "audioVisualizer"; + this.audioVisualizer.NewSelectionParagraph = null; + this.audioVisualizer.SceneChanges = ((System.Collections.Generic.List)(resources.GetObject("audioVisualizer.SceneChanges"))); + this.audioVisualizer.SelectedColor = System.Drawing.Color.Red; + this.audioVisualizer.ShowSpectrogram = false; + this.audioVisualizer.ShowWaveform = true; + this.audioVisualizer.Size = new System.Drawing.Size(499, 229); + this.audioVisualizer.StartPositionSeconds = 0D; + this.audioVisualizer.TabIndex = 6; + this.audioVisualizer.TextColor = System.Drawing.Color.Gray; + this.audioVisualizer.VerticalZoomPercent = 1D; + this.audioVisualizer.WaveFormNotLoadedText = "Click to add wave form"; + 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.AudioWaveFormDragDrop); + this.audioVisualizer.DragEnter += new System.Windows.Forms.DragEventHandler(this.AudioWaveFormDragEnter); + this.audioVisualizer.MouseEnter += new System.EventHandler(this.audioVisualizer_MouseEnter); + // + // timeUpDownVideoPosition + // + this.timeUpDownVideoPosition.AutoSize = true; + this.timeUpDownVideoPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.timeUpDownVideoPosition.Location = new System.Drawing.Point(96, 191); + this.timeUpDownVideoPosition.Margin = new System.Windows.Forms.Padding(4); + this.timeUpDownVideoPosition.Name = "timeUpDownVideoPosition"; + this.timeUpDownVideoPosition.Size = new System.Drawing.Size(96, 25); + this.timeUpDownVideoPosition.TabIndex = 12; + // + // timeUpDownVideoPositionAdjust + // + this.timeUpDownVideoPositionAdjust.AutoSize = true; + this.timeUpDownVideoPositionAdjust.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.timeUpDownVideoPositionAdjust.Location = new System.Drawing.Point(96, 213); + this.timeUpDownVideoPositionAdjust.Margin = new System.Windows.Forms.Padding(4); + this.timeUpDownVideoPositionAdjust.Name = "timeUpDownVideoPositionAdjust"; + this.timeUpDownVideoPositionAdjust.Size = new System.Drawing.Size(96, 25); + this.timeUpDownVideoPositionAdjust.TabIndex = 13; + // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index 3d9c40ead..773222100 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -1706,6 +1706,7 @@ namespace Nikse.SubtitleEdit.Forms toolStripButtonSaveAs.ToolTipText = _language.Menu.ToolBar.SaveAs; toolStripButtonFind.ToolTipText = _language.Menu.ToolBar.Find; toolStripButtonReplace.ToolTipText = _language.Menu.ToolBar.Replace; + toolStripButtonFixCommonErrors.ToolTipText = Configuration.Settings.Language.Settings.FixCommonerrors; // TODO: 3.4 Use Toolbar translation tag toolStripButtonVisualSync.ToolTipText = _language.Menu.ToolBar.VisualSync; toolStripButtonSpellCheck.ToolTipText = _language.Menu.ToolBar.SpellCheck; toolStripButtonSettings.ToolTipText = _language.Menu.ToolBar.Settings; diff --git a/src/Forms/Main.resx b/src/Forms/Main.resx index bcd14ce7e..94fae0644 100644 --- a/src/Forms/Main.resx +++ b/src/Forms/Main.resx @@ -338,27 +338,33 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAS6SURBVFhHtZdrTJNXGMdxMrcPY25TN0eymwtLkM0MNkTi - OiJLSHCL6LjJghQqdKRAuRRo6SqHciml9EJbaIFioZRyCdLBFlAnrIACRm6iYJjgyJAJW6KyD36hhGfn - 7U7MuuCHwdvft+f5P8l7Ls//nPO6/R/4fP7uLIFAGhR0fD8Vp2RlpeQi9DNfKt3tKHA1t6enzzc2t0BU - LPMkFadkZ6clp2dAsUpldBS4Em5e3huLS0t2bU0txDBZjgGc5XBSk9K4UFBebkcIveIodBUavf7oL/P3 - oFSphLDo6PgMPj8YL781U/gd5EulkCEUvklKXUNERMRrPb29a9buHjA2N0O12QxyfTUIiyXUx4dJmWtR - 6/UWi/V7qG9rgxpzEyiqayA1J3cticv1JyWuJSM318dgaYa6lla8Ak3UzCGBw+ES2fXkIORZ3di0QQ2g - QFYOLA6nkkhO4H6JZ4SEvMVisTwyRaKPSHr7qOuMrKGxcTC1d4BUq7ULBIJXifSUkRs3wi/39UF4bGxA - Ko8XzBOJVrBDXiTy9sAzbx8cHQNlbR0UK5VXSdqJwZGRNmVlFQQHBx9M4fEKKZeIVaoAIm8dhGzu5o6u - xxklUjwAA4jlciGRnKg1m8vbun4Ag8UCpRotZCO0kobQy0TeOhqjmSGvNwEzR4C7vxpEpaW+RHJCrqk6 - eR73iK7BBFlC4cNvMzMPE2l7iDU6CVOEIPlcAZRUVDzAqR3/KM5YrJ2NBnxc5xUVzcWlpb1P0tsnVSKd - fPeLUEAqNRQpFPUk7YREq/2gp39gXWWoAySXO45rWmju7PT8LDZhY19gEKjw/qPy8igiOVFhNJsyikuh - rLJyAoebrtCWKFRXsjw+CQRGTNwz7VemN3qd4Gat50ikIJbJTpE0PYQlp7S7+/gCiy98pv2+Sk4zeR8P - w51fNYlD+maPbDZ3//Dox7s+9IMitWZT+xVW6L1eP/L5elKeiNqer0maHpS1RsaeAAYcwA0oq6ra1H6B - 0TEN7xwLgRKt9iYO6Zs9xZlsvuSFgx9DKIu9qf1EZWVe+w8ftcdn80GsUISTNH0wTsdOengfAi4Sb2q/ - wKiYhvcYwSBRa6ZwSO/sy7RaT++QLzf2+fqDFJ/v/7UftfchTJY99RyitAiSpo/iSh1r7xEGhJ5lb2q/ - JqvV1Hn5Csh0ulv4xnuOpOlDVl3TrmtswtfvBSf72aanX+ofuq4bnbq1YRsapnwfSST6sGH7WTq7Hl/q - HwRzR4eT/Wbu3q3BL+E7MoXi1PWJCTuSSt8mEn1cHLiWfA3f/bP3fsU3WwN+fBb7Eclt4f79q0qDgb20 - tLSnf3jYjmSyQ0Sih6GxMcGPP13ZuNjbt/77ygrUt7ZCFkJ7iey2vLx8enh0dNTa3f0bH6H+yMjInUTa - Pnfm5vzwvm5wBYKHiRyOz4OVFd7I+DgUKZVnSImDbxISDkTFxR1js9nPkxQ9/PHoEeeSrZ868RKpeG1t - 7dOb09MgVip1jgJX89eTJyduz87iZ1etGAB2LC4uNtS3tEBOfj6flLgW/NGdq6urA/MLC39OzczYWi50 - QGJ6+jwzPd21/37/Bh8qu4xmM5MnEJjwPotj2OynDUgvbm5/A/oxYljYC9qHAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAX9SURBVFhHzVeJT9RXEOYf8taaxqMmRkXOYmusVvGspYZo + EW/qUayRaqxHTVOiFeRWKLC4wC4LohzSZWE59mAPdjl2FwQjl7eiX2emu4rC6pZi0kkmwPu99+abb+bN + DEH/KykoKEBs7E6kpaXjxYsX8C5PSgYHh9DSYkC9rhFV1XfQ0NiEx48f+7/zwoVfcfToj1izZi0OHfoB + 586dnzQIZ0cH2ixWuN09MJktqPtLB5u93f9dKSmpmDlzDpKTL+HYsURERkYRiIRJgXC7Pbh7tw8eTy/M + bVZo6xtgtdnff8fWrd9g+fJgzJ37CS5e/A1HjhxDeMTnOHDgEM6eDRzEs2fP4HR2wNPTSwzYxPNWg3HC + s7zX+2tQ0P79B7F69RoBMWfOPDGakHAY4eGR4G+BgnC73US7BxarjTxvRKmqnJjoGXfOTuEwGM1v1oeH + h7F+fTTFfx2Cg0Mwe/Y8nD59BgcPJiAsLAL79h0ICITD4SDjdko8PSpuVqFQUYLiEjVevXr1+hwb58Rs + bX2HGQaxYcNGrFu3HiEh4Zg1ay6Skk4JA6Gh4di7d/8HQbS1WSjbm1F5uwbKEg3y8m8gIzsPN5SlEhp9 + UzMa9S3o7HJJknqPvREGER29SdgIC4sUECdOnBTjISFhiI/fSyDO+QWh1erEeLHXeM71AlzLLYSq7Caq + a+rkRXS7PBgYGITNX2IOD49g48bNAoRfA7+OxMSfxPjKlaHYvXvPhCAcTic05begLC7D9bwiZJLnWTl/ + yhqzYrHY4aL8GKD60H/vHoEY8Mtk0MjICDZt2iIaFfWFgOAaERcXLznC60ypd7vsV6nLUaRUicfpmbmi + 7LmuoQlWygs3JSMXp4cPH6K/v9+/cZ/wpZs3byXdhlWrVmPGjNk4fPgodu78HgsXLpb8GB0dJSZGUVlZ + BcUNlVB+Nf0aaQ5KSsvlJfBzZOPs+T3ynNVr4sPy4MEDbNmyTZRBTCcQCxYsxvbtMThz5qwk7PHjJ/B7 + 8h9ITcsW4ylXsyUHuAYY6am1O5zyNPv6+vD06dPAjfuEQXChYtqDg0MxffosAvOlsLFiRQh27IhFzHex + SDyehORLqZIDtXe0cLlcePny5b83OJFw3Jqbm3H+/AXExOyQirlrV5wYX7JkKZYuXYafT/2C9Ixr8sY5 + fN6jUyvczTgRIyKiMG3aTMTRi+BwLFu2AimpaVRcDHj+/PnHMe4TDsfatV9LheTE5CTNyskjhlreqngf + RTo7O8njb7Fo0WfUO77C/Pmf4uTJJEk6s6V96mI+kXBTuXz5CrXsy9izZx+V7WhKxCNQq9UoK9PQs9PA + YnN8HBAu6nJXrqQgLzcfuaQZGdlQKkuoGDnFGFdFtbpMup/N7pxaEF1d3UilBMsvUKCQND+/EDU1d9BD + Pd+7RYRBqFRqAlEBe3vH1IBgD3k+VCiUogUFRaitZePjezyLD4RKXUEFqPO/gbDZbEhPzyCqi4VuRaGS + jNdRVXO/91IGUVqqlnnANhkm+CkZjSaKc5ZcVFKiQjEBqKvToru7O6DLGIRGU46WVpMMKNz9AirD3Fya + qOJlZWWjvLyC6KTspolGq61HB0263m0ByT9MqKgNWyRZmTle834eL/xRp2tAZmY2blbeJg8YQBkZ18FB + DWUyRUav11N1bKV2bBUHOHf83mM0mVBYqJCNlbeq6FlpxDjPcMwMH/Qpx3UiHbuHdWhoCPX19TAYDDQB + 2cCFzO8swAarq2vlkMfjoSlGT/RZweMzs8M/uRc8evRIhgrukmOV1/gb7+F4c09g4Py3iZwzGo3kjF1A + sA2v2TdSUVEJNU0wjfommXaMJjN4RuTLBwcHZZDo7e0VcNxqOSG7urpE+XdWjjPvYS/5DINiAE+ePBHj + DKS9vZ3+YWkbD6C39y4URUqJPzcWHhqZNk4i1jY65FOz2fzaK6aXf/LfvM572Qh7yqA4pHwPf9PpdBKS + CacijhlTx72cB0bf+MR6//598Yip4++szM67yuvvhoO99ynfz+FkW16z42VsEo1V7+e35H3fApOgoL8B + cfixJwlGaR8AAAAASUVORK5CYII= @@ -716,7 +722,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2 - CAAAAk1TRnQBSQFMAgEBAgEAAcgBIAHIASABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAfABIAHwASABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/src/Icons/FixCommonErrors.png b/src/Icons/FixCommonErrors.png index 4d38688b4..ccbf0e069 100644 Binary files a/src/Icons/FixCommonErrors.png and b/src/Icons/FixCommonErrors.png differ diff --git a/src/Logic/Language.cs b/src/Logic/Language.cs index fbcf22f61..30972e0dc 100644 --- a/src/Logic/Language.cs +++ b/src/Logic/Language.cs @@ -1278,6 +1278,7 @@ namespace Nikse.SubtitleEdit.Logic SaveAs = "Save as", Find = "Find", Replace = "Replace", + FixCommonErrors = "Fix common errors", VisualSync = "Visual sync", SpellCheck = "Spell check", Settings = "Settings", diff --git a/src/Logic/LanguageStructure.cs b/src/Logic/LanguageStructure.cs index 18086ec49..20bcd1959 100644 --- a/src/Logic/LanguageStructure.cs +++ b/src/Logic/LanguageStructure.cs @@ -1158,6 +1158,7 @@ public string SaveAs { get; set; } public string Find { get; set; } public string Replace { get; set; } + public string FixCommonErrors { get; set; } public string VisualSync { get; set; } public string SpellCheck { get; set; } public string Settings { get; set; }