Working on waveform/spectrogram

git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@479 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2011-06-09 07:23:58 +00:00
parent 114546e6d3
commit d86da67543
6 changed files with 184 additions and 169 deletions

View File

@ -1,10 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.IO;
using System.Windows.Forms; using System.Windows.Forms;
using System.Xml; using System.Xml;
using Nikse.SubtitleEdit.Logic; using Nikse.SubtitleEdit.Logic;
using System.IO;
namespace Nikse.SubtitleEdit.Controls namespace Nikse.SubtitleEdit.Controls
{ {
@ -261,6 +261,15 @@ namespace Nikse.SubtitleEdit.Controls
break; break;
} }
} }
if (_previousAndNextParagraphs.Count == 0 && _subtitle.Paragraphs.Count > 0)
{
int i = _subtitle.Paragraphs.Count;
for (int j = 1; j < 10; j++)
{
Paragraph nextParagraph = subtitle.GetParagraphOrDefault(i - j);
_previousAndNextParagraphs.Add(nextParagraph);
}
}
} }
} }
} }

View File

@ -223,6 +223,7 @@
this.toolStripMenuItemPlayRateNormal = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemPlayRateNormal = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItemPlayRateFast = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemPlayRateFast = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItemPlayRateVeryFast = 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.tabControlButtons = new System.Windows.Forms.TabControl();
this.tabPageTranslate = new System.Windows.Forms.TabPage(); this.tabPageTranslate = new System.Windows.Forms.TabPage();
this.labelTranslateTip = new System.Windows.Forms.Label(); this.labelTranslateTip = new System.Windows.Forms.Label();
@ -244,6 +245,7 @@
this.buttonPlayCurrent = new System.Windows.Forms.Button(); this.buttonPlayCurrent = new System.Windows.Forms.Button();
this.buttonPlayNext = new System.Windows.Forms.Button(); this.buttonPlayNext = new System.Windows.Forms.Button();
this.tabPageCreate = new System.Windows.Forms.TabPage(); this.tabPageCreate = new System.Windows.Forms.TabPage();
this.timeUpDownVideoPosition = new Nikse.SubtitleEdit.Controls.TimeUpDown();
this.buttonGotoSub = new System.Windows.Forms.Button(); this.buttonGotoSub = new System.Windows.Forms.Button();
this.buttonBeforeText = new System.Windows.Forms.Button(); this.buttonBeforeText = new System.Windows.Forms.Button();
this.buttonSetEnd = new System.Windows.Forms.Button(); this.buttonSetEnd = new System.Windows.Forms.Button();
@ -262,6 +264,7 @@
this.labelVideoPosition = new System.Windows.Forms.Label(); this.labelVideoPosition = new System.Windows.Forms.Label();
this.buttonSecBack1 = new System.Windows.Forms.Button(); this.buttonSecBack1 = new System.Windows.Forms.Button();
this.tabPageAdjust = new System.Windows.Forms.TabPage(); this.tabPageAdjust = new System.Windows.Forms.TabPage();
this.timeUpDownVideoPositionAdjust = new Nikse.SubtitleEdit.Controls.TimeUpDown();
this.buttonAdjustSetEndTime = new System.Windows.Forms.Button(); this.buttonAdjustSetEndTime = new System.Windows.Forms.Button();
this.buttonSetEndAndGoToNext = new System.Windows.Forms.Button(); this.buttonSetEndAndGoToNext = new System.Windows.Forms.Button();
this.buttonSetStartAndOffsetRest = new System.Windows.Forms.Button(); this.buttonSetStartAndOffsetRest = new System.Windows.Forms.Button();
@ -331,6 +334,7 @@
this.labelTextLineTotal = new System.Windows.Forms.Label(); this.labelTextLineTotal = new System.Windows.Forms.Label();
this.labelCharactersPerSecond = new System.Windows.Forms.Label(); this.labelCharactersPerSecond = new System.Windows.Forms.Label();
this.buttonUnBreak = new System.Windows.Forms.Button(); this.buttonUnBreak = new System.Windows.Forms.Button();
this.timeUpDownStartTime = new Nikse.SubtitleEdit.Controls.TimeUpDown();
this.buttonUndoListViewChanges = new System.Windows.Forms.Button(); this.buttonUndoListViewChanges = new System.Windows.Forms.Button();
this.labelStartTimeWarning = new System.Windows.Forms.Label(); this.labelStartTimeWarning = new System.Windows.Forms.Label();
this.labelDurationWarning = new System.Windows.Forms.Label(); this.labelDurationWarning = new System.Windows.Forms.Label();
@ -341,18 +345,14 @@
this.textBoxListViewText = new System.Windows.Forms.TextBox(); this.textBoxListViewText = new System.Windows.Forms.TextBox();
this.labelDuration = new System.Windows.Forms.Label(); this.labelDuration = new System.Windows.Forms.Label();
this.labelAutoDuration = new System.Windows.Forms.Label(); this.labelAutoDuration = new System.Windows.Forms.Label();
this.SubtitleListview1 = new Nikse.SubtitleEdit.Controls.SubtitleListView();
this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage();
this.textBoxSource = new System.Windows.Forms.TextBox(); this.textBoxSource = new System.Windows.Forms.TextBox();
this.panelVideoPlayer = new System.Windows.Forms.Panel(); this.panelVideoPlayer = new System.Windows.Forms.Panel();
this.mediaPlayer = new Nikse.SubtitleEdit.Controls.VideoPlayerContainer();
this.contextMenuStripEmpty = new System.Windows.Forms.ContextMenuStrip(this.components); this.contextMenuStripEmpty = new System.Windows.Forms.ContextMenuStrip(this.components);
this.insertLineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.insertLineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.imageListPlayRate = new System.Windows.Forms.ImageList(this.components); this.imageListPlayRate = new System.Windows.Forms.ImageList(this.components);
this.timeUpDownStartTime = new Nikse.SubtitleEdit.Controls.TimeUpDown();
this.SubtitleListview1 = new Nikse.SubtitleEdit.Controls.SubtitleListView();
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.statusStrip1.SuspendLayout();
this.toolStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
@ -2023,6 +2023,36 @@
this.toolStripMenuItemPlayRateVeryFast.Text = "Very fast"; this.toolStripMenuItemPlayRateVeryFast.Text = "Very fast";
this.toolStripMenuItemPlayRateVeryFast.Click += new System.EventHandler(this.veryFastToolStripMenuItem_Click); this.toolStripMenuItemPlayRateVeryFast.Click += new System.EventHandler(this.veryFastToolStripMenuItem_Click);
// //
// audioVisualizer
//
this.audioVisualizer.AllowDrop = true;
this.audioVisualizer.AllowNewSelection = true;
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.SelectedColor = System.Drawing.Color.Red;
this.audioVisualizer.ShowSpectrogram = false;
this.audioVisualizer.ShowWaveform = true;
this.audioVisualizer.Size = new System.Drawing.Size(768, 229);
this.audioVisualizer.StartPositionSeconds = 0D;
this.audioVisualizer.TabIndex = 6;
this.audioVisualizer.TextColor = System.Drawing.Color.Gray;
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.AudioWaveForm_DragDrop);
this.audioVisualizer.DragEnter += new System.Windows.Forms.DragEventHandler(this.AudioWaveForm_DragEnter);
//
// tabControlButtons // tabControlButtons
// //
this.tabControlButtons.Controls.Add(this.tabPageTranslate); this.tabControlButtons.Controls.Add(this.tabPageTranslate);
@ -2298,6 +2328,16 @@
this.tabPageCreate.Text = "Create"; this.tabPageCreate.Text = "Create";
this.tabPageCreate.UseVisualStyleBackColor = true; this.tabPageCreate.UseVisualStyleBackColor = true;
// //
// timeUpDownVideoPosition
//
this.timeUpDownVideoPosition.AutoSize = true;
this.timeUpDownVideoPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.timeUpDownVideoPosition.Location = new System.Drawing.Point(86, 192);
this.timeUpDownVideoPosition.Margin = new System.Windows.Forms.Padding(4);
this.timeUpDownVideoPosition.Name = "timeUpDownVideoPosition";
this.timeUpDownVideoPosition.Size = new System.Drawing.Size(92, 25);
this.timeUpDownVideoPosition.TabIndex = 12;
//
// buttonGotoSub // buttonGotoSub
// //
this.buttonGotoSub.Location = new System.Drawing.Point(6, 58); this.buttonGotoSub.Location = new System.Drawing.Point(6, 58);
@ -2523,6 +2563,16 @@
this.tabPageAdjust.Text = "Adjust"; this.tabPageAdjust.Text = "Adjust";
this.tabPageAdjust.UseVisualStyleBackColor = true; this.tabPageAdjust.UseVisualStyleBackColor = true;
// //
// timeUpDownVideoPositionAdjust
//
this.timeUpDownVideoPositionAdjust.AutoSize = true;
this.timeUpDownVideoPositionAdjust.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.timeUpDownVideoPositionAdjust.Location = new System.Drawing.Point(87, 214);
this.timeUpDownVideoPositionAdjust.Margin = new System.Windows.Forms.Padding(4);
this.timeUpDownVideoPositionAdjust.Name = "timeUpDownVideoPositionAdjust";
this.timeUpDownVideoPositionAdjust.Size = new System.Drawing.Size(92, 25);
this.timeUpDownVideoPositionAdjust.TabIndex = 13;
//
// buttonAdjustSetEndTime // buttonAdjustSetEndTime
// //
this.buttonAdjustSetEndTime.Location = new System.Drawing.Point(6, 84); this.buttonAdjustSetEndTime.Location = new System.Drawing.Point(6, 84);
@ -2769,7 +2819,7 @@
this.showOnlyWaveformToolStripMenuItem, this.showOnlyWaveformToolStripMenuItem,
this.showOnlySpectrogramToolStripMenuItem}); this.showOnlySpectrogramToolStripMenuItem});
this.contextMenuStripWaveForm.Name = "contextMenuStripWaveForm"; this.contextMenuStripWaveForm.Name = "contextMenuStripWaveForm";
this.contextMenuStripWaveForm.Size = new System.Drawing.Size(253, 214); this.contextMenuStripWaveForm.Size = new System.Drawing.Size(253, 236);
this.contextMenuStripWaveForm.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStripWaveForm_Opening); this.contextMenuStripWaveForm.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStripWaveForm_Opening);
// //
// addParagraphHereToolStripMenuItem // addParagraphHereToolStripMenuItem
@ -3211,6 +3261,16 @@
this.buttonUnBreak.UseVisualStyleBackColor = true; this.buttonUnBreak.UseVisualStyleBackColor = true;
this.buttonUnBreak.Click += new System.EventHandler(this.ButtonUnBreakClick); 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, 27);
this.timeUpDownStartTime.Margin = new System.Windows.Forms.Padding(4);
this.timeUpDownStartTime.Name = "timeUpDownStartTime";
this.timeUpDownStartTime.Size = new System.Drawing.Size(92, 25);
this.timeUpDownStartTime.TabIndex = 0;
//
// buttonUndoListViewChanges // buttonUndoListViewChanges
// //
this.buttonUndoListViewChanges.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.buttonUndoListViewChanges.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@ -3332,6 +3392,31 @@
this.labelAutoDuration.TabIndex = 30; this.labelAutoDuration.TabIndex = 30;
this.labelAutoDuration.Text = "Auto"; this.labelAutoDuration.Text = "Auto";
// //
// SubtitleListview1
//
this.SubtitleListview1.AllowDrop = true;
this.SubtitleListview1.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.SubtitleListview1.ContextMenuStrip = this.contextMenuStripListview;
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(1, 3);
this.SubtitleListview1.Name = "SubtitleListview1";
this.SubtitleListview1.Size = new System.Drawing.Size(932, 148);
this.SubtitleListview1.SmallImageList = this.imageList1;
this.SubtitleListview1.TabIndex = 0;
this.SubtitleListview1.UseCompatibleStateImageBehavior = false;
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.SubtitleListview1_KeyDown);
this.SubtitleListview1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.SubtitleListview1_MouseDoubleClick);
//
// tabPage2 // tabPage2
// //
this.tabPage2.Controls.Add(this.textBoxSource); this.tabPage2.Controls.Add(this.textBoxSource);
@ -3376,62 +3461,6 @@
this.panelVideoPlayer.Size = new System.Drawing.Size(282, 278); this.panelVideoPlayer.Size = new System.Drawing.Size(282, 278);
this.panelVideoPlayer.TabIndex = 5; this.panelVideoPlayer.TabIndex = 5;
// //
// contextMenuStripEmpty
//
this.contextMenuStripEmpty.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.insertLineToolStripMenuItem});
this.contextMenuStripEmpty.Name = "contextMenuStripEmpty";
this.contextMenuStripEmpty.Size = new System.Drawing.Size(126, 26);
//
// insertLineToolStripMenuItem
//
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);
//
// imageListPlayRate
//
this.imageListPlayRate.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageListPlayRate.ImageStream")));
this.imageListPlayRate.TransparentColor = System.Drawing.Color.Transparent;
this.imageListPlayRate.Images.SetKeyName(0, "FastForward.png");
this.imageListPlayRate.Images.SetKeyName(1, "FastForwardHighLight.png");
//
// timeUpDownStartTime
//
this.timeUpDownStartTime.AutoSize = true;
this.timeUpDownStartTime.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.timeUpDownStartTime.Location = new System.Drawing.Point(9, 27);
this.timeUpDownStartTime.Margin = new System.Windows.Forms.Padding(4);
this.timeUpDownStartTime.Name = "timeUpDownStartTime";
this.timeUpDownStartTime.Size = new System.Drawing.Size(92, 25);
this.timeUpDownStartTime.TabIndex = 0;
//
// SubtitleListview1
//
this.SubtitleListview1.AllowDrop = true;
this.SubtitleListview1.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.SubtitleListview1.ContextMenuStrip = this.contextMenuStripListview;
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(1, 3);
this.SubtitleListview1.Name = "SubtitleListview1";
this.SubtitleListview1.Size = new System.Drawing.Size(932, 148);
this.SubtitleListview1.SmallImageList = this.imageList1;
this.SubtitleListview1.TabIndex = 0;
this.SubtitleListview1.UseCompatibleStateImageBehavior = false;
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.SubtitleListview1_KeyDown);
this.SubtitleListview1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.SubtitleListview1_MouseDoubleClick);
//
// mediaPlayer // mediaPlayer
// //
this.mediaPlayer.AllowDrop = true; this.mediaPlayer.AllowDrop = true;
@ -3454,55 +3483,26 @@
this.mediaPlayer.DragDrop += new System.Windows.Forms.DragEventHandler(this.mediaPlayer_DragDrop); this.mediaPlayer.DragDrop += new System.Windows.Forms.DragEventHandler(this.mediaPlayer_DragDrop);
this.mediaPlayer.DragEnter += new System.Windows.Forms.DragEventHandler(this.mediaPlayer_DragEnter); this.mediaPlayer.DragEnter += new System.Windows.Forms.DragEventHandler(this.mediaPlayer_DragEnter);
// //
// audioVisualizer // contextMenuStripEmpty
// //
this.audioVisualizer.AllowDrop = true; this.contextMenuStripEmpty.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.audioVisualizer.AllowNewSelection = true; this.insertLineToolStripMenuItem});
this.audioVisualizer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.contextMenuStripEmpty.Name = "contextMenuStripEmpty";
| System.Windows.Forms.AnchorStyles.Left) this.contextMenuStripEmpty.Size = new System.Drawing.Size(126, 26);
| 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.SelectedColor = System.Drawing.Color.Red;
this.audioVisualizer.ShowSpectrogram = false;
this.audioVisualizer.ShowWaveform = true;
this.audioVisualizer.Size = new System.Drawing.Size(768, 229);
this.audioVisualizer.StartPositionSeconds = 0D;
this.audioVisualizer.TabIndex = 6;
this.audioVisualizer.TextColor = System.Drawing.Color.Gray;
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.AudioWaveForm_DragDrop);
this.audioVisualizer.DragEnter += new System.Windows.Forms.DragEventHandler(this.AudioWaveForm_DragEnter);
// //
// timeUpDownVideoPosition // insertLineToolStripMenuItem
// //
this.timeUpDownVideoPosition.AutoSize = true; this.insertLineToolStripMenuItem.Name = "insertLineToolStripMenuItem";
this.timeUpDownVideoPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.insertLineToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
this.timeUpDownVideoPosition.Location = new System.Drawing.Point(86, 192); this.insertLineToolStripMenuItem.Text = "Insert line";
this.timeUpDownVideoPosition.Margin = new System.Windows.Forms.Padding(4); this.insertLineToolStripMenuItem.Click += new System.EventHandler(this.insertLineToolStripMenuItem_Click);
this.timeUpDownVideoPosition.Name = "timeUpDownVideoPosition";
this.timeUpDownVideoPosition.Size = new System.Drawing.Size(92, 25);
this.timeUpDownVideoPosition.TabIndex = 12;
// //
// timeUpDownVideoPositionAdjust // imageListPlayRate
// //
this.timeUpDownVideoPositionAdjust.AutoSize = true; this.imageListPlayRate.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageListPlayRate.ImageStream")));
this.timeUpDownVideoPositionAdjust.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.imageListPlayRate.TransparentColor = System.Drawing.Color.Transparent;
this.timeUpDownVideoPositionAdjust.Location = new System.Drawing.Point(87, 214); this.imageListPlayRate.Images.SetKeyName(0, "FastForward.png");
this.timeUpDownVideoPositionAdjust.Margin = new System.Windows.Forms.Padding(4); this.imageListPlayRate.Images.SetKeyName(1, "FastForwardHighLight.png");
this.timeUpDownVideoPositionAdjust.Name = "timeUpDownVideoPositionAdjust";
this.timeUpDownVideoPositionAdjust.Size = new System.Drawing.Size(92, 25);
this.timeUpDownVideoPositionAdjust.TabIndex = 13;
// //
// Main // Main
// //

View File

@ -498,11 +498,15 @@ namespace Nikse.SubtitleEdit.Forms
void AudioWaveForm_OnNonParagraphRightClicked(double seconds, Paragraph paragraph) void AudioWaveForm_OnNonParagraphRightClicked(double seconds, Paragraph paragraph)
{ {
if (Configuration.Settings.VideoControls.WaveFormDoubleClickOnNonParagraphAction == "ButtonSetStartAndOffsetRest") addParagraphHereToolStripMenuItem.Visible = false;
{ deleteParagraphToolStripMenuItem.Visible = false;
mediaPlayer.CurrentPosition = seconds; splitToolStripMenuItem1.Visible = false;
ButtonSetStartAndOffsetRestClick(null, null); mergeWithPreviousToolStripMenuItem.Visible = false;
} mergeWithNextToolStripMenuItem.Visible = false;
toolStripSeparator11.Visible = false;
toolStripMenuItemWaveFormPlaySelection.Visible = false;
toolStripSeparator24.Visible = false;
contextMenuStripWaveForm.Show(MousePosition.X, MousePosition.Y);
} }
void AudioWaveForm_OnDoubleClickNonParagraph(double seconds, Paragraph paragraph) void AudioWaveForm_OnDoubleClickNonParagraph(double seconds, Paragraph paragraph)
@ -569,6 +573,9 @@ namespace Nikse.SubtitleEdit.Forms
splitToolStripMenuItem1.Visible = true; splitToolStripMenuItem1.Visible = true;
mergeWithPreviousToolStripMenuItem.Visible = true; mergeWithPreviousToolStripMenuItem.Visible = true;
mergeWithNextToolStripMenuItem.Visible = true; mergeWithNextToolStripMenuItem.Visible = true;
toolStripSeparator11.Visible = true;
toolStripMenuItemWaveFormPlaySelection.Visible = true;
toolStripSeparator24.Visible = true;
_audioWaveFormRightClickSeconds = seconds; _audioWaveFormRightClickSeconds = seconds;
contextMenuStripWaveForm.Show(MousePosition.X, MousePosition.Y); contextMenuStripWaveForm.Show(MousePosition.X, MousePosition.Y);

View File

@ -684,7 +684,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
CAAAAk1TRnQBSQFMAgEBAgEAATgBBwE4AQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo CAAAAk1TRnQBSQFMAgEBAgEAAUABBwFAAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

View File

@ -126,6 +126,8 @@
this.radioButtonVideoPlayerManagedDirectX = new System.Windows.Forms.RadioButton(); this.radioButtonVideoPlayerManagedDirectX = new System.Windows.Forms.RadioButton();
this.tabPageWaveForm = new System.Windows.Forms.TabPage(); this.tabPageWaveForm = new System.Windows.Forms.TabPage();
this.groupBoxSpectrogram = new System.Windows.Forms.GroupBox(); this.groupBoxSpectrogram = new System.Windows.Forms.GroupBox();
this.labelSpectrogramAppearance = new System.Windows.Forms.Label();
this.comboBoxSpectrogramAppearance = new System.Windows.Forms.ComboBox();
this.checkBoxGenerateSpectrogram = new System.Windows.Forms.CheckBox(); this.checkBoxGenerateSpectrogram = new System.Windows.Forms.CheckBox();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.buttonWaveFormsFolderEmpty = new System.Windows.Forms.Button(); this.buttonWaveFormsFolderEmpty = new System.Windows.Forms.Button();
@ -212,8 +214,6 @@
this.colorDialogSSAStyle = new System.Windows.Forms.ColorDialog(); this.colorDialogSSAStyle = new System.Windows.Forms.ColorDialog();
this.fontDialogSSAStyle = new System.Windows.Forms.FontDialog(); this.fontDialogSSAStyle = new System.Windows.Forms.FontDialog();
this.labelStatus = new System.Windows.Forms.Label(); this.labelStatus = new System.Windows.Forms.Label();
this.comboBoxSpectrogramAppearance = new System.Windows.Forms.ComboBox();
this.labelSpectrogramAppearance = new System.Windows.Forms.Label();
this.tabControlSettings.SuspendLayout(); this.tabControlSettings.SuspendLayout();
this.tabPageGenerel.SuspendLayout(); this.tabPageGenerel.SuspendLayout();
this.groupBoxMiscellaneous.SuspendLayout(); this.groupBoxMiscellaneous.SuspendLayout();
@ -357,7 +357,7 @@
this.checkBoxPromptDeleteLines.AutoSize = true; this.checkBoxPromptDeleteLines.AutoSize = true;
this.checkBoxPromptDeleteLines.Location = new System.Drawing.Point(436, 319); this.checkBoxPromptDeleteLines.Location = new System.Drawing.Point(436, 319);
this.checkBoxPromptDeleteLines.Name = "checkBoxPromptDeleteLines"; this.checkBoxPromptDeleteLines.Name = "checkBoxPromptDeleteLines";
this.checkBoxPromptDeleteLines.Size = new System.Drawing.Size(138, 17); this.checkBoxPromptDeleteLines.Size = new System.Drawing.Size(142, 17);
this.checkBoxPromptDeleteLines.TabIndex = 40; this.checkBoxPromptDeleteLines.TabIndex = 40;
this.checkBoxPromptDeleteLines.Text = "Prompt for deleting lines"; this.checkBoxPromptDeleteLines.Text = "Prompt for deleting lines";
this.checkBoxPromptDeleteLines.UseVisualStyleBackColor = true; this.checkBoxPromptDeleteLines.UseVisualStyleBackColor = true;
@ -367,7 +367,7 @@
this.checkBoxAutoWrapWhileTyping.AutoSize = true; this.checkBoxAutoWrapWhileTyping.AutoSize = true;
this.checkBoxAutoWrapWhileTyping.Location = new System.Drawing.Point(193, 146); this.checkBoxAutoWrapWhileTyping.Location = new System.Drawing.Point(193, 146);
this.checkBoxAutoWrapWhileTyping.Name = "checkBoxAutoWrapWhileTyping"; this.checkBoxAutoWrapWhileTyping.Name = "checkBoxAutoWrapWhileTyping";
this.checkBoxAutoWrapWhileTyping.Size = new System.Drawing.Size(132, 17); this.checkBoxAutoWrapWhileTyping.Size = new System.Drawing.Size(137, 17);
this.checkBoxAutoWrapWhileTyping.TabIndex = 4; this.checkBoxAutoWrapWhileTyping.TabIndex = 4;
this.checkBoxAutoWrapWhileTyping.Text = "Auto-wrap while typing"; this.checkBoxAutoWrapWhileTyping.Text = "Auto-wrap while typing";
this.checkBoxAutoWrapWhileTyping.UseVisualStyleBackColor = true; this.checkBoxAutoWrapWhileTyping.UseVisualStyleBackColor = true;
@ -395,7 +395,7 @@
this.checkBoxAllowEditOfOriginalSubtitle.AutoSize = true; this.checkBoxAllowEditOfOriginalSubtitle.AutoSize = true;
this.checkBoxAllowEditOfOriginalSubtitle.Location = new System.Drawing.Point(436, 296); this.checkBoxAllowEditOfOriginalSubtitle.Location = new System.Drawing.Point(436, 296);
this.checkBoxAllowEditOfOriginalSubtitle.Name = "checkBoxAllowEditOfOriginalSubtitle"; this.checkBoxAllowEditOfOriginalSubtitle.Name = "checkBoxAllowEditOfOriginalSubtitle";
this.checkBoxAllowEditOfOriginalSubtitle.Size = new System.Drawing.Size(155, 17); this.checkBoxAllowEditOfOriginalSubtitle.Size = new System.Drawing.Size(160, 17);
this.checkBoxAllowEditOfOriginalSubtitle.TabIndex = 24; this.checkBoxAllowEditOfOriginalSubtitle.TabIndex = 24;
this.checkBoxAllowEditOfOriginalSubtitle.Text = "Allow edit of original subtitle"; this.checkBoxAllowEditOfOriginalSubtitle.Text = "Allow edit of original subtitle";
this.checkBoxAllowEditOfOriginalSubtitle.UseVisualStyleBackColor = true; this.checkBoxAllowEditOfOriginalSubtitle.UseVisualStyleBackColor = true;
@ -563,7 +563,7 @@
this.checkBoxRememberWindowPosition.AutoSize = true; this.checkBoxRememberWindowPosition.AutoSize = true;
this.checkBoxRememberWindowPosition.Location = new System.Drawing.Point(436, 101); this.checkBoxRememberWindowPosition.Location = new System.Drawing.Point(436, 101);
this.checkBoxRememberWindowPosition.Name = "checkBoxRememberWindowPosition"; this.checkBoxRememberWindowPosition.Name = "checkBoxRememberWindowPosition";
this.checkBoxRememberWindowPosition.Size = new System.Drawing.Size(222, 17); this.checkBoxRememberWindowPosition.Size = new System.Drawing.Size(223, 17);
this.checkBoxRememberWindowPosition.TabIndex = 15; this.checkBoxRememberWindowPosition.TabIndex = 15;
this.checkBoxRememberWindowPosition.Text = "Remember main window position and size"; this.checkBoxRememberWindowPosition.Text = "Remember main window position and size";
this.checkBoxRememberWindowPosition.UseVisualStyleBackColor = true; this.checkBoxRememberWindowPosition.UseVisualStyleBackColor = true;
@ -610,7 +610,7 @@
this.checkBoxStartInSourceView.AutoSize = true; this.checkBoxStartInSourceView.AutoSize = true;
this.checkBoxStartInSourceView.Location = new System.Drawing.Point(436, 124); this.checkBoxStartInSourceView.Location = new System.Drawing.Point(436, 124);
this.checkBoxStartInSourceView.Name = "checkBoxStartInSourceView"; this.checkBoxStartInSourceView.Name = "checkBoxStartInSourceView";
this.checkBoxStartInSourceView.Size = new System.Drawing.Size(119, 17); this.checkBoxStartInSourceView.Size = new System.Drawing.Size(121, 17);
this.checkBoxStartInSourceView.TabIndex = 16; this.checkBoxStartInSourceView.TabIndex = 16;
this.checkBoxStartInSourceView.Text = "Start in source view"; this.checkBoxStartInSourceView.Text = "Start in source view";
this.checkBoxStartInSourceView.UseVisualStyleBackColor = true; this.checkBoxStartInSourceView.UseVisualStyleBackColor = true;
@ -620,7 +620,7 @@
this.checkBoxReopenLastOpened.AutoSize = true; this.checkBoxReopenLastOpened.AutoSize = true;
this.checkBoxReopenLastOpened.Location = new System.Drawing.Point(444, 52); this.checkBoxReopenLastOpened.Location = new System.Drawing.Point(444, 52);
this.checkBoxReopenLastOpened.Name = "checkBoxReopenLastOpened"; this.checkBoxReopenLastOpened.Name = "checkBoxReopenLastOpened";
this.checkBoxReopenLastOpened.Size = new System.Drawing.Size(140, 17); this.checkBoxReopenLastOpened.Size = new System.Drawing.Size(145, 17);
this.checkBoxReopenLastOpened.TabIndex = 13; this.checkBoxReopenLastOpened.TabIndex = 13;
this.checkBoxReopenLastOpened.Text = "Start with last file loaded"; this.checkBoxReopenLastOpened.Text = "Start with last file loaded";
this.checkBoxReopenLastOpened.UseVisualStyleBackColor = true; this.checkBoxReopenLastOpened.UseVisualStyleBackColor = true;
@ -630,7 +630,7 @@
this.checkBoxRememberRecentFiles.AutoSize = true; this.checkBoxRememberRecentFiles.AutoSize = true;
this.checkBoxRememberRecentFiles.Location = new System.Drawing.Point(436, 28); this.checkBoxRememberRecentFiles.Location = new System.Drawing.Point(436, 28);
this.checkBoxRememberRecentFiles.Name = "checkBoxRememberRecentFiles"; this.checkBoxRememberRecentFiles.Name = "checkBoxRememberRecentFiles";
this.checkBoxRememberRecentFiles.Size = new System.Drawing.Size(188, 17); this.checkBoxRememberRecentFiles.Size = new System.Drawing.Size(195, 17);
this.checkBoxRememberRecentFiles.TabIndex = 12; this.checkBoxRememberRecentFiles.TabIndex = 12;
this.checkBoxRememberRecentFiles.Text = "Remember recent files (for reopen)"; this.checkBoxRememberRecentFiles.Text = "Remember recent files (for reopen)";
this.checkBoxRememberRecentFiles.UseVisualStyleBackColor = true; this.checkBoxRememberRecentFiles.UseVisualStyleBackColor = true;
@ -641,7 +641,7 @@
this.checkBoxSubtitleFontBold.AutoSize = true; this.checkBoxSubtitleFontBold.AutoSize = true;
this.checkBoxSubtitleFontBold.Location = new System.Drawing.Point(193, 269); this.checkBoxSubtitleFontBold.Location = new System.Drawing.Point(193, 269);
this.checkBoxSubtitleFontBold.Name = "checkBoxSubtitleFontBold"; this.checkBoxSubtitleFontBold.Name = "checkBoxSubtitleFontBold";
this.checkBoxSubtitleFontBold.Size = new System.Drawing.Size(47, 17); this.checkBoxSubtitleFontBold.Size = new System.Drawing.Size(46, 17);
this.checkBoxSubtitleFontBold.TabIndex = 8; this.checkBoxSubtitleFontBold.TabIndex = 8;
this.checkBoxSubtitleFontBold.Text = "Bold"; this.checkBoxSubtitleFontBold.Text = "Bold";
this.checkBoxSubtitleFontBold.UseVisualStyleBackColor = true; this.checkBoxSubtitleFontBold.UseVisualStyleBackColor = true;
@ -745,7 +745,7 @@
this.checkBoxShowFrameRate.AutoSize = true; this.checkBoxShowFrameRate.AutoSize = true;
this.checkBoxShowFrameRate.Location = new System.Drawing.Point(16, 29); this.checkBoxShowFrameRate.Location = new System.Drawing.Point(16, 29);
this.checkBoxShowFrameRate.Name = "checkBoxShowFrameRate"; this.checkBoxShowFrameRate.Name = "checkBoxShowFrameRate";
this.checkBoxShowFrameRate.Size = new System.Drawing.Size(149, 17); this.checkBoxShowFrameRate.Size = new System.Drawing.Size(154, 17);
this.checkBoxShowFrameRate.TabIndex = 34; this.checkBoxShowFrameRate.TabIndex = 34;
this.checkBoxShowFrameRate.Text = "Show frame rate in toolbar"; this.checkBoxShowFrameRate.Text = "Show frame rate in toolbar";
this.checkBoxShowFrameRate.UseVisualStyleBackColor = true; this.checkBoxShowFrameRate.UseVisualStyleBackColor = true;
@ -811,7 +811,7 @@
this.checkBoxHelp.AutoSize = true; this.checkBoxHelp.AutoSize = true;
this.checkBoxHelp.Location = new System.Drawing.Point(596, 80); this.checkBoxHelp.Location = new System.Drawing.Point(596, 80);
this.checkBoxHelp.Name = "checkBoxHelp"; this.checkBoxHelp.Name = "checkBoxHelp";
this.checkBoxHelp.Size = new System.Drawing.Size(56, 17); this.checkBoxHelp.Size = new System.Drawing.Size(55, 17);
this.checkBoxHelp.TabIndex = 31; this.checkBoxHelp.TabIndex = 31;
this.checkBoxHelp.Text = "Visible"; this.checkBoxHelp.Text = "Visible";
this.checkBoxHelp.UseVisualStyleBackColor = true; this.checkBoxHelp.UseVisualStyleBackColor = true;
@ -838,7 +838,7 @@
this.checkBoxSettings.AutoSize = true; this.checkBoxSettings.AutoSize = true;
this.checkBoxSettings.Location = new System.Drawing.Point(532, 80); this.checkBoxSettings.Location = new System.Drawing.Point(532, 80);
this.checkBoxSettings.Name = "checkBoxSettings"; this.checkBoxSettings.Name = "checkBoxSettings";
this.checkBoxSettings.Size = new System.Drawing.Size(56, 17); this.checkBoxSettings.Size = new System.Drawing.Size(55, 17);
this.checkBoxSettings.TabIndex = 28; this.checkBoxSettings.TabIndex = 28;
this.checkBoxSettings.Text = "Visible"; this.checkBoxSettings.Text = "Visible";
this.checkBoxSettings.UseVisualStyleBackColor = true; this.checkBoxSettings.UseVisualStyleBackColor = true;
@ -865,7 +865,7 @@
this.checkBoxSpellCheck.AutoSize = true; this.checkBoxSpellCheck.AutoSize = true;
this.checkBoxSpellCheck.Location = new System.Drawing.Point(464, 80); this.checkBoxSpellCheck.Location = new System.Drawing.Point(464, 80);
this.checkBoxSpellCheck.Name = "checkBoxSpellCheck"; this.checkBoxSpellCheck.Name = "checkBoxSpellCheck";
this.checkBoxSpellCheck.Size = new System.Drawing.Size(56, 17); this.checkBoxSpellCheck.Size = new System.Drawing.Size(55, 17);
this.checkBoxSpellCheck.TabIndex = 26; this.checkBoxSpellCheck.TabIndex = 26;
this.checkBoxSpellCheck.Text = "Visible"; this.checkBoxSpellCheck.Text = "Visible";
this.checkBoxSpellCheck.UseVisualStyleBackColor = true; this.checkBoxSpellCheck.UseVisualStyleBackColor = true;
@ -892,7 +892,7 @@
this.checkBoxVisualSync.AutoSize = true; this.checkBoxVisualSync.AutoSize = true;
this.checkBoxVisualSync.Location = new System.Drawing.Point(398, 80); this.checkBoxVisualSync.Location = new System.Drawing.Point(398, 80);
this.checkBoxVisualSync.Name = "checkBoxVisualSync"; this.checkBoxVisualSync.Name = "checkBoxVisualSync";
this.checkBoxVisualSync.Size = new System.Drawing.Size(56, 17); this.checkBoxVisualSync.Size = new System.Drawing.Size(55, 17);
this.checkBoxVisualSync.TabIndex = 19; this.checkBoxVisualSync.TabIndex = 19;
this.checkBoxVisualSync.Text = "Visible"; this.checkBoxVisualSync.Text = "Visible";
this.checkBoxVisualSync.UseVisualStyleBackColor = true; this.checkBoxVisualSync.UseVisualStyleBackColor = true;
@ -919,7 +919,7 @@
this.checkBoxReplace.AutoSize = true; this.checkBoxReplace.AutoSize = true;
this.checkBoxReplace.Location = new System.Drawing.Point(335, 80); this.checkBoxReplace.Location = new System.Drawing.Point(335, 80);
this.checkBoxReplace.Name = "checkBoxReplace"; this.checkBoxReplace.Name = "checkBoxReplace";
this.checkBoxReplace.Size = new System.Drawing.Size(56, 17); this.checkBoxReplace.Size = new System.Drawing.Size(55, 17);
this.checkBoxReplace.TabIndex = 16; this.checkBoxReplace.TabIndex = 16;
this.checkBoxReplace.Text = "Visible"; this.checkBoxReplace.Text = "Visible";
this.checkBoxReplace.UseVisualStyleBackColor = true; this.checkBoxReplace.UseVisualStyleBackColor = true;
@ -946,7 +946,7 @@
this.checkBoxToolbarFind.AutoSize = true; this.checkBoxToolbarFind.AutoSize = true;
this.checkBoxToolbarFind.Location = new System.Drawing.Point(272, 80); this.checkBoxToolbarFind.Location = new System.Drawing.Point(272, 80);
this.checkBoxToolbarFind.Name = "checkBoxToolbarFind"; this.checkBoxToolbarFind.Name = "checkBoxToolbarFind";
this.checkBoxToolbarFind.Size = new System.Drawing.Size(56, 17); this.checkBoxToolbarFind.Size = new System.Drawing.Size(55, 17);
this.checkBoxToolbarFind.TabIndex = 13; this.checkBoxToolbarFind.TabIndex = 13;
this.checkBoxToolbarFind.Text = "Visible"; this.checkBoxToolbarFind.Text = "Visible";
this.checkBoxToolbarFind.UseVisualStyleBackColor = true; this.checkBoxToolbarFind.UseVisualStyleBackColor = true;
@ -973,7 +973,7 @@
this.checkBoxToolbarSaveAs.AutoSize = true; this.checkBoxToolbarSaveAs.AutoSize = true;
this.checkBoxToolbarSaveAs.Location = new System.Drawing.Point(209, 80); this.checkBoxToolbarSaveAs.Location = new System.Drawing.Point(209, 80);
this.checkBoxToolbarSaveAs.Name = "checkBoxToolbarSaveAs"; this.checkBoxToolbarSaveAs.Name = "checkBoxToolbarSaveAs";
this.checkBoxToolbarSaveAs.Size = new System.Drawing.Size(56, 17); this.checkBoxToolbarSaveAs.Size = new System.Drawing.Size(55, 17);
this.checkBoxToolbarSaveAs.TabIndex = 10; this.checkBoxToolbarSaveAs.TabIndex = 10;
this.checkBoxToolbarSaveAs.Text = "Visible"; this.checkBoxToolbarSaveAs.Text = "Visible";
this.checkBoxToolbarSaveAs.UseVisualStyleBackColor = true; this.checkBoxToolbarSaveAs.UseVisualStyleBackColor = true;
@ -1000,7 +1000,7 @@
this.checkBoxToolbarSave.AutoSize = true; this.checkBoxToolbarSave.AutoSize = true;
this.checkBoxToolbarSave.Location = new System.Drawing.Point(146, 80); this.checkBoxToolbarSave.Location = new System.Drawing.Point(146, 80);
this.checkBoxToolbarSave.Name = "checkBoxToolbarSave"; this.checkBoxToolbarSave.Name = "checkBoxToolbarSave";
this.checkBoxToolbarSave.Size = new System.Drawing.Size(56, 17); this.checkBoxToolbarSave.Size = new System.Drawing.Size(55, 17);
this.checkBoxToolbarSave.TabIndex = 7; this.checkBoxToolbarSave.TabIndex = 7;
this.checkBoxToolbarSave.Text = "Visible"; this.checkBoxToolbarSave.Text = "Visible";
this.checkBoxToolbarSave.UseVisualStyleBackColor = true; this.checkBoxToolbarSave.UseVisualStyleBackColor = true;
@ -1027,7 +1027,7 @@
this.checkBoxToolbarOpen.AutoSize = true; this.checkBoxToolbarOpen.AutoSize = true;
this.checkBoxToolbarOpen.Location = new System.Drawing.Point(83, 80); this.checkBoxToolbarOpen.Location = new System.Drawing.Point(83, 80);
this.checkBoxToolbarOpen.Name = "checkBoxToolbarOpen"; this.checkBoxToolbarOpen.Name = "checkBoxToolbarOpen";
this.checkBoxToolbarOpen.Size = new System.Drawing.Size(56, 17); this.checkBoxToolbarOpen.Size = new System.Drawing.Size(55, 17);
this.checkBoxToolbarOpen.TabIndex = 4; this.checkBoxToolbarOpen.TabIndex = 4;
this.checkBoxToolbarOpen.Text = "Visible"; this.checkBoxToolbarOpen.Text = "Visible";
this.checkBoxToolbarOpen.UseVisualStyleBackColor = true; this.checkBoxToolbarOpen.UseVisualStyleBackColor = true;
@ -1054,7 +1054,7 @@
this.checkBoxToolbarNew.AutoSize = true; this.checkBoxToolbarNew.AutoSize = true;
this.checkBoxToolbarNew.Location = new System.Drawing.Point(20, 80); this.checkBoxToolbarNew.Location = new System.Drawing.Point(20, 80);
this.checkBoxToolbarNew.Name = "checkBoxToolbarNew"; this.checkBoxToolbarNew.Name = "checkBoxToolbarNew";
this.checkBoxToolbarNew.Size = new System.Drawing.Size(56, 17); this.checkBoxToolbarNew.Size = new System.Drawing.Size(55, 17);
this.checkBoxToolbarNew.TabIndex = 1; this.checkBoxToolbarNew.TabIndex = 1;
this.checkBoxToolbarNew.Text = "Visible"; this.checkBoxToolbarNew.Text = "Visible";
this.checkBoxToolbarNew.UseVisualStyleBackColor = true; this.checkBoxToolbarNew.UseVisualStyleBackColor = true;
@ -1165,7 +1165,7 @@
this.checkBoxVideoPlayerShowStopButton.AutoSize = true; this.checkBoxVideoPlayerShowStopButton.AutoSize = true;
this.checkBoxVideoPlayerShowStopButton.Location = new System.Drawing.Point(9, 19); this.checkBoxVideoPlayerShowStopButton.Location = new System.Drawing.Point(9, 19);
this.checkBoxVideoPlayerShowStopButton.Name = "checkBoxVideoPlayerShowStopButton"; this.checkBoxVideoPlayerShowStopButton.Name = "checkBoxVideoPlayerShowStopButton";
this.checkBoxVideoPlayerShowStopButton.Size = new System.Drawing.Size(109, 17); this.checkBoxVideoPlayerShowStopButton.Size = new System.Drawing.Size(111, 17);
this.checkBoxVideoPlayerShowStopButton.TabIndex = 10; this.checkBoxVideoPlayerShowStopButton.TabIndex = 10;
this.checkBoxVideoPlayerShowStopButton.Text = "Show stop button"; this.checkBoxVideoPlayerShowStopButton.Text = "Show stop button";
this.checkBoxVideoPlayerShowStopButton.UseVisualStyleBackColor = true; this.checkBoxVideoPlayerShowStopButton.UseVisualStyleBackColor = true;
@ -1232,7 +1232,7 @@
this.radioButtonVideoPlayerVLC.AutoSize = true; this.radioButtonVideoPlayerVLC.AutoSize = true;
this.radioButtonVideoPlayerVLC.Location = new System.Drawing.Point(10, 46); this.radioButtonVideoPlayerVLC.Location = new System.Drawing.Point(10, 46);
this.radioButtonVideoPlayerVLC.Name = "radioButtonVideoPlayerVLC"; this.radioButtonVideoPlayerVLC.Name = "radioButtonVideoPlayerVLC";
this.radioButtonVideoPlayerVLC.Size = new System.Drawing.Size(45, 17); this.radioButtonVideoPlayerVLC.Size = new System.Drawing.Size(43, 17);
this.radioButtonVideoPlayerVLC.TabIndex = 4; this.radioButtonVideoPlayerVLC.TabIndex = 4;
this.radioButtonVideoPlayerVLC.TabStop = true; this.radioButtonVideoPlayerVLC.TabStop = true;
this.radioButtonVideoPlayerVLC.Text = "VLC"; this.radioButtonVideoPlayerVLC.Text = "VLC";
@ -1288,7 +1288,7 @@
this.radioButtonVideoPlayerDirectShow.AutoSize = true; this.radioButtonVideoPlayerDirectShow.AutoSize = true;
this.radioButtonVideoPlayerDirectShow.Location = new System.Drawing.Point(10, 23); this.radioButtonVideoPlayerDirectShow.Location = new System.Drawing.Point(10, 23);
this.radioButtonVideoPlayerDirectShow.Name = "radioButtonVideoPlayerDirectShow"; this.radioButtonVideoPlayerDirectShow.Name = "radioButtonVideoPlayerDirectShow";
this.radioButtonVideoPlayerDirectShow.Size = new System.Drawing.Size(83, 17); this.radioButtonVideoPlayerDirectShow.Size = new System.Drawing.Size(82, 17);
this.radioButtonVideoPlayerDirectShow.TabIndex = 1; this.radioButtonVideoPlayerDirectShow.TabIndex = 1;
this.radioButtonVideoPlayerDirectShow.TabStop = true; this.radioButtonVideoPlayerDirectShow.TabStop = true;
this.radioButtonVideoPlayerDirectShow.Text = "DirectShow "; this.radioButtonVideoPlayerDirectShow.Text = "DirectShow ";
@ -1299,7 +1299,7 @@
this.radioButtonVideoPlayerManagedDirectX.AutoSize = true; this.radioButtonVideoPlayerManagedDirectX.AutoSize = true;
this.radioButtonVideoPlayerManagedDirectX.Location = new System.Drawing.Point(10, 90); this.radioButtonVideoPlayerManagedDirectX.Location = new System.Drawing.Point(10, 90);
this.radioButtonVideoPlayerManagedDirectX.Name = "radioButtonVideoPlayerManagedDirectX"; this.radioButtonVideoPlayerManagedDirectX.Name = "radioButtonVideoPlayerManagedDirectX";
this.radioButtonVideoPlayerManagedDirectX.Size = new System.Drawing.Size(108, 17); this.radioButtonVideoPlayerManagedDirectX.Size = new System.Drawing.Size(106, 17);
this.radioButtonVideoPlayerManagedDirectX.TabIndex = 6; this.radioButtonVideoPlayerManagedDirectX.TabIndex = 6;
this.radioButtonVideoPlayerManagedDirectX.TabStop = true; this.radioButtonVideoPlayerManagedDirectX.TabStop = true;
this.radioButtonVideoPlayerManagedDirectX.Text = "Managed DirectX"; this.radioButtonVideoPlayerManagedDirectX.Text = "Managed DirectX";
@ -1330,6 +1330,27 @@
this.groupBoxSpectrogram.TabStop = false; this.groupBoxSpectrogram.TabStop = false;
this.groupBoxSpectrogram.Text = "Spectrogram"; this.groupBoxSpectrogram.Text = "Spectrogram";
// //
// labelSpectrogramAppearance
//
this.labelSpectrogramAppearance.AutoSize = true;
this.labelSpectrogramAppearance.Location = new System.Drawing.Point(7, 54);
this.labelSpectrogramAppearance.Name = "labelSpectrogramAppearance";
this.labelSpectrogramAppearance.Size = new System.Drawing.Size(164, 13);
this.labelSpectrogramAppearance.TabIndex = 15;
this.labelSpectrogramAppearance.Text = "Appearence (at generation time)";
//
// comboBoxSpectrogramAppearance
//
this.comboBoxSpectrogramAppearance.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxSpectrogramAppearance.FormattingEnabled = true;
this.comboBoxSpectrogramAppearance.Items.AddRange(new object[] {
"Classic",
"Use waveform color (one color gradient)"});
this.comboBoxSpectrogramAppearance.Location = new System.Drawing.Point(7, 70);
this.comboBoxSpectrogramAppearance.Name = "comboBoxSpectrogramAppearance";
this.comboBoxSpectrogramAppearance.Size = new System.Drawing.Size(328, 21);
this.comboBoxSpectrogramAppearance.TabIndex = 14;
//
// checkBoxGenerateSpectrogram // checkBoxGenerateSpectrogram
// //
this.checkBoxGenerateSpectrogram.AutoSize = true; this.checkBoxGenerateSpectrogram.AutoSize = true;
@ -1522,7 +1543,7 @@
this.checkBoxSpellCheckAutoChangeNames.AutoSize = true; this.checkBoxSpellCheckAutoChangeNames.AutoSize = true;
this.checkBoxSpellCheckAutoChangeNames.Location = new System.Drawing.Point(15, 20); this.checkBoxSpellCheckAutoChangeNames.Location = new System.Drawing.Point(15, 20);
this.checkBoxSpellCheckAutoChangeNames.Name = "checkBoxSpellCheckAutoChangeNames"; this.checkBoxSpellCheckAutoChangeNames.Name = "checkBoxSpellCheckAutoChangeNames";
this.checkBoxSpellCheckAutoChangeNames.Size = new System.Drawing.Size(209, 17); this.checkBoxSpellCheckAutoChangeNames.Size = new System.Drawing.Size(216, 17);
this.checkBoxSpellCheckAutoChangeNames.TabIndex = 0; this.checkBoxSpellCheckAutoChangeNames.TabIndex = 0;
this.checkBoxSpellCheckAutoChangeNames.Text = "Auto fix names where only casing differ"; this.checkBoxSpellCheckAutoChangeNames.Text = "Auto fix names where only casing differ";
this.checkBoxSpellCheckAutoChangeNames.UseVisualStyleBackColor = true; this.checkBoxSpellCheckAutoChangeNames.UseVisualStyleBackColor = true;
@ -1546,7 +1567,7 @@
this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.AutoSize = true; this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.AutoSize = true;
this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.Location = new System.Drawing.Point(15, 115); this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.Location = new System.Drawing.Point(15, 115);
this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.Name = "checkBoxFixCommonOcrErrorsUsingHardcodedRules"; this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.Name = "checkBoxFixCommonOcrErrorsUsingHardcodedRules";
this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.Size = new System.Drawing.Size(264, 17); this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.Size = new System.Drawing.Size(268, 17);
this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.TabIndex = 2; this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.TabIndex = 2;
this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.Text = "Fix common OCR errors - also use hardcoded rules"; this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.Text = "Fix common OCR errors - also use hardcoded rules";
this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.UseVisualStyleBackColor = true; this.checkBoxFixCommonOcrErrorsUsingHardcodedRules.UseVisualStyleBackColor = true;
@ -1829,7 +1850,7 @@
this.checkBoxNamesEtcOnline.AutoSize = true; this.checkBoxNamesEtcOnline.AutoSize = true;
this.checkBoxNamesEtcOnline.Location = new System.Drawing.Point(7, 22); this.checkBoxNamesEtcOnline.Location = new System.Drawing.Point(7, 22);
this.checkBoxNamesEtcOnline.Name = "checkBoxNamesEtcOnline"; this.checkBoxNamesEtcOnline.Name = "checkBoxNamesEtcOnline";
this.checkBoxNamesEtcOnline.Size = new System.Drawing.Size(162, 17); this.checkBoxNamesEtcOnline.Size = new System.Drawing.Size(163, 17);
this.checkBoxNamesEtcOnline.TabIndex = 26; this.checkBoxNamesEtcOnline.TabIndex = 26;
this.checkBoxNamesEtcOnline.Text = "Use online names etc xml file"; this.checkBoxNamesEtcOnline.Text = "Use online names etc xml file";
this.checkBoxNamesEtcOnline.UseVisualStyleBackColor = true; this.checkBoxNamesEtcOnline.UseVisualStyleBackColor = true;
@ -2213,7 +2234,7 @@
this.checkBoxShortcutsShift.Enabled = false; this.checkBoxShortcutsShift.Enabled = false;
this.checkBoxShortcutsShift.Location = new System.Drawing.Point(243, 366); this.checkBoxShortcutsShift.Location = new System.Drawing.Point(243, 366);
this.checkBoxShortcutsShift.Name = "checkBoxShortcutsShift"; this.checkBoxShortcutsShift.Name = "checkBoxShortcutsShift";
this.checkBoxShortcutsShift.Size = new System.Drawing.Size(47, 17); this.checkBoxShortcutsShift.Size = new System.Drawing.Size(48, 17);
this.checkBoxShortcutsShift.TabIndex = 3; this.checkBoxShortcutsShift.TabIndex = 3;
this.checkBoxShortcutsShift.Text = "Shift"; this.checkBoxShortcutsShift.Text = "Shift";
this.checkBoxShortcutsShift.UseVisualStyleBackColor = true; this.checkBoxShortcutsShift.UseVisualStyleBackColor = true;
@ -2224,7 +2245,7 @@
this.checkBoxShortcutsAlt.Enabled = false; this.checkBoxShortcutsAlt.Enabled = false;
this.checkBoxShortcutsAlt.Location = new System.Drawing.Point(174, 366); this.checkBoxShortcutsAlt.Location = new System.Drawing.Point(174, 366);
this.checkBoxShortcutsAlt.Name = "checkBoxShortcutsAlt"; this.checkBoxShortcutsAlt.Name = "checkBoxShortcutsAlt";
this.checkBoxShortcutsAlt.Size = new System.Drawing.Size(38, 17); this.checkBoxShortcutsAlt.Size = new System.Drawing.Size(39, 17);
this.checkBoxShortcutsAlt.TabIndex = 2; this.checkBoxShortcutsAlt.TabIndex = 2;
this.checkBoxShortcutsAlt.Text = "Alt"; this.checkBoxShortcutsAlt.Text = "Alt";
this.checkBoxShortcutsAlt.UseVisualStyleBackColor = true; this.checkBoxShortcutsAlt.UseVisualStyleBackColor = true;
@ -2235,7 +2256,7 @@
this.checkBoxShortcutsControl.Enabled = false; this.checkBoxShortcutsControl.Enabled = false;
this.checkBoxShortcutsControl.Location = new System.Drawing.Point(87, 367); this.checkBoxShortcutsControl.Location = new System.Drawing.Point(87, 367);
this.checkBoxShortcutsControl.Name = "checkBoxShortcutsControl"; this.checkBoxShortcutsControl.Name = "checkBoxShortcutsControl";
this.checkBoxShortcutsControl.Size = new System.Drawing.Size(59, 17); this.checkBoxShortcutsControl.Size = new System.Drawing.Size(61, 17);
this.checkBoxShortcutsControl.TabIndex = 1; this.checkBoxShortcutsControl.TabIndex = 1;
this.checkBoxShortcutsControl.Text = "Control"; this.checkBoxShortcutsControl.Text = "Control";
this.checkBoxShortcutsControl.UseVisualStyleBackColor = true; this.checkBoxShortcutsControl.UseVisualStyleBackColor = true;
@ -2278,27 +2299,6 @@
this.labelStatus.TabIndex = 3; this.labelStatus.TabIndex = 3;
this.labelStatus.Text = "labelStatus"; this.labelStatus.Text = "labelStatus";
// //
// comboBoxSpectrogramAppearance
//
this.comboBoxSpectrogramAppearance.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxSpectrogramAppearance.FormattingEnabled = true;
this.comboBoxSpectrogramAppearance.Items.AddRange(new object[] {
"Classic",
"Use waveform color (one color gradient)"});
this.comboBoxSpectrogramAppearance.Location = new System.Drawing.Point(7, 70);
this.comboBoxSpectrogramAppearance.Name = "comboBoxSpectrogramAppearance";
this.comboBoxSpectrogramAppearance.Size = new System.Drawing.Size(328, 21);
this.comboBoxSpectrogramAppearance.TabIndex = 14;
//
// labelSpectrogramAppearance
//
this.labelSpectrogramAppearance.AutoSize = true;
this.labelSpectrogramAppearance.Location = new System.Drawing.Point(7, 54);
this.labelSpectrogramAppearance.Name = "labelSpectrogramAppearance";
this.labelSpectrogramAppearance.Size = new System.Drawing.Size(164, 13);
this.labelSpectrogramAppearance.TabIndex = 15;
this.labelSpectrogramAppearance.Text = "Appearence (at generation time)";
//
// Settings // Settings
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

View File

@ -3,11 +3,11 @@ using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using System.Xml; using System.Xml;
using Nikse.SubtitleEdit.Logic; using Nikse.SubtitleEdit.Logic;
using Nikse.SubtitleEdit.Logic.VideoPlayers; using Nikse.SubtitleEdit.Logic.VideoPlayers;
using System.Text;
namespace Nikse.SubtitleEdit.Forms namespace Nikse.SubtitleEdit.Forms
{ {
@ -246,7 +246,6 @@ namespace Nikse.SubtitleEdit.Forms
buttonWaveFormsFolderEmpty.Text = language.WaveformAndSpectrogramsFolderEmpty; buttonWaveFormsFolderEmpty.Text = language.WaveformAndSpectrogramsFolderEmpty;
InitializeWaveformsAndSpectrogramsFolderEmpty(language); InitializeWaveformsAndSpectrogramsFolderEmpty(language);
groupBoxSsaStyle.Text = language.SubStationAlphaStyle; groupBoxSsaStyle.Text = language.SubStationAlphaStyle;
buttonSSAChooseFont.Text = language.ChooseFont; buttonSSAChooseFont.Text = language.ChooseFont;
buttonSSAChooseColor.Text = language.ChooseColor; buttonSSAChooseColor.Text = language.ChooseColor;
@ -490,7 +489,7 @@ namespace Nikse.SubtitleEdit.Forms
comboBoxShortcutKey.Items[0] = Configuration.Settings.Language.General.None; comboBoxShortcutKey.Items[0] = Configuration.Settings.Language.General.None;
FixLargeFonts(); FixLargeFonts();
} }
private string GetShortcutText(string shortcut) private string GetShortcutText(string shortcut)
{ {