mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Fixed problem with moving subtitles in timeline (waveform/spectrogram) with mouse beeing too slow/jerky (taking too much cpu)
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1047 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk
parent
18df418bd3
commit
8f7424501b
@ -4,7 +4,7 @@ Subtitle Edit Changelog
|
||||
* NEW:
|
||||
* Added new subtitle formats (now +90!)
|
||||
* IMPROVED:
|
||||
* Many improvements to fix common errors - thx Majid
|
||||
* Improvements to fix common errors - thx Trottel
|
||||
* FIXED:
|
||||
* Crash in fix common errors (remove unneeded spaces) - thx menes
|
||||
* Merge selected lines with 2+ lines - thx Verteller
|
||||
@ -12,6 +12,10 @@ Subtitle Edit Changelog
|
||||
* Context menu normal/italic in ocr window - thx cipry
|
||||
* Editing search type for "Multiple replace"
|
||||
* Wrong positioning of some texts (mostly at startup) - thx Trottel
|
||||
* Fix crash in image export (due to blank lines) - thx Mahdi
|
||||
* Line-breaking now works better with font tags - thx Trottel/XhmikosR
|
||||
* Moving subtitles in timeline (waveform/spectrogram) with
|
||||
mouse is now fast again
|
||||
|
||||
|
||||
3.2.4 (11th March 2012)
|
||||
|
||||
@ -272,21 +272,21 @@ namespace Nikse.SubtitleEdit.Controls
|
||||
{
|
||||
double charactersPerSecond = Utilities.GetCharactersPerSecond(paragraph);
|
||||
if (charactersPerSecond > Configuration.Settings.General.SubtitleMaximumCharactersPerSeconds + 7)
|
||||
Items[i].SubItems[ColumnIndexDuration].BackColor = System.Drawing.Color.Red;
|
||||
Items[i].SubItems[ColumnIndexDuration].BackColor = Color.Red;
|
||||
else if (charactersPerSecond > Configuration.Settings.General.SubtitleMaximumCharactersPerSeconds)
|
||||
Items[i].SubItems[ColumnIndexDuration].BackColor = System.Drawing.Color.Orange;
|
||||
Items[i].SubItems[ColumnIndexDuration].BackColor = Color.Orange;
|
||||
else if (paragraph.Duration.TotalMilliseconds < Configuration.Settings.General.SubtitleMinimumDisplayMilliseconds - 100)
|
||||
Items[i].SubItems[ColumnIndexDuration].BackColor = System.Drawing.Color.Red;
|
||||
Items[i].SubItems[ColumnIndexDuration].BackColor = Color.Red;
|
||||
else if (paragraph.Duration.TotalMilliseconds < Configuration.Settings.General.SubtitleMinimumDisplayMilliseconds)
|
||||
Items[i].SubItems[ColumnIndexDuration].BackColor = System.Drawing.Color.Orange;
|
||||
Items[i].SubItems[ColumnIndexDuration].BackColor = Color.Orange;
|
||||
}
|
||||
if (_settings.Tools.ListViewSyntaxColorDurationBig)
|
||||
{
|
||||
double charactersPerSecond = Utilities.GetCharactersPerSecond(paragraph);
|
||||
// double charactersPerSecond = Utilities.GetCharactersPerSecond(paragraph);
|
||||
if (paragraph.Duration.TotalMilliseconds > Configuration.Settings.General.SubtitleMaximumDisplayMilliseconds + 100)
|
||||
Items[i].SubItems[ColumnIndexDuration].BackColor = System.Drawing.Color.Red;
|
||||
Items[i].SubItems[ColumnIndexDuration].BackColor = Color.Red;
|
||||
else if (paragraph.Duration.TotalMilliseconds > Configuration.Settings.General.SubtitleMaximumDisplayMilliseconds)
|
||||
Items[i].SubItems[ColumnIndexDuration].BackColor = System.Drawing.Color.Orange;
|
||||
Items[i].SubItems[ColumnIndexDuration].BackColor = Color.Orange;
|
||||
}
|
||||
|
||||
if (_settings.Tools.ListViewSyntaxColorOverlap && i > 0)
|
||||
|
||||
332
src/Forms/Main.Designer.cs
generated
332
src/Forms/Main.Designer.cs
generated
@ -233,7 +233,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();
|
||||
@ -255,7 +254,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();
|
||||
@ -274,7 +272,6 @@
|
||||
this.labelVideoPosition = new System.Windows.Forms.Label();
|
||||
this.buttonSecBack1 = new System.Windows.Forms.Button();
|
||||
this.tabPageAdjust = new System.Windows.Forms.TabPage();
|
||||
this.timeUpDownVideoPositionAdjust = new Nikse.SubtitleEdit.Controls.TimeUpDown();
|
||||
this.buttonAdjustSetEndTime = new System.Windows.Forms.Button();
|
||||
this.buttonSetEndAndGoToNext = new System.Windows.Forms.Button();
|
||||
this.buttonSetStartAndOffsetRest = new System.Windows.Forms.Button();
|
||||
@ -322,7 +319,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.cutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
@ -350,26 +346,31 @@
|
||||
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.labelStartTimeWarning = new System.Windows.Forms.Label();
|
||||
this.labelDurationWarning = new System.Windows.Forms.Label();
|
||||
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.SubtitleListview1 = new Nikse.SubtitleEdit.Controls.SubtitleListView();
|
||||
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.toolStripMenuItemMergeDialogue = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.textBoxListViewTextAlternate = new Nikse.SubtitleEdit.Controls.SETextBox();
|
||||
this.timeUpDownStartTime = new Nikse.SubtitleEdit.Controls.TimeUpDown();
|
||||
this.textBoxListViewText = new Nikse.SubtitleEdit.Controls.SETextBox();
|
||||
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.toolStrip1.SuspendLayout();
|
||||
this.menuStrip1.SuspendLayout();
|
||||
@ -1691,6 +1692,7 @@
|
||||
this.toolStripSeparator7,
|
||||
this.splitLineToolStripMenuItem,
|
||||
this.toolStripMenuItemMergeLines,
|
||||
this.toolStripMenuItemMergeDialogue,
|
||||
this.mergeBeforeToolStripMenuItem,
|
||||
this.mergeAfterToolStripMenuItem,
|
||||
this.toolStripSeparator8,
|
||||
@ -1715,7 +1717,7 @@
|
||||
this.fixCommonErrorsInSelectedLinesToolStripMenuItem,
|
||||
this.changeCasingForSelectedLinesToolStripMenuItem});
|
||||
this.contextMenuStripListview.Name = "contextMenuStripListview";
|
||||
this.contextMenuStripListview.Size = new System.Drawing.Size(285, 650);
|
||||
this.contextMenuStripListview.Size = new System.Drawing.Size(285, 672);
|
||||
this.contextMenuStripListview.Opening += new System.ComponentModel.CancelEventHandler(this.ContextMenuStripListviewOpening);
|
||||
//
|
||||
// setStylesForSelectedLinesToolStripMenuItem
|
||||
@ -2132,37 +2134,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.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.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);
|
||||
//
|
||||
// tabControlButtons
|
||||
//
|
||||
this.tabControlButtons.Controls.Add(this.tabPageTranslate);
|
||||
@ -2441,16 +2412,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(92, 25);
|
||||
this.timeUpDownVideoPosition.TabIndex = 12;
|
||||
//
|
||||
// buttonGotoSub
|
||||
//
|
||||
this.buttonGotoSub.Location = new System.Drawing.Point(6, 58);
|
||||
@ -2676,16 +2637,6 @@
|
||||
this.tabPageAdjust.Text = "Adjust";
|
||||
this.tabPageAdjust.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// timeUpDownVideoPositionAdjust
|
||||
//
|
||||
this.timeUpDownVideoPositionAdjust.AutoSize = true;
|
||||
this.timeUpDownVideoPositionAdjust.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
|
||||
this.timeUpDownVideoPositionAdjust.Location = new System.Drawing.Point(96, 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
|
||||
//
|
||||
this.buttonAdjustSetEndTime.Location = new System.Drawing.Point(6, 84);
|
||||
@ -3178,27 +3129,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.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(806, 28);
|
||||
this.textBoxListViewTextAlternate.Multiline = true;
|
||||
this.textBoxListViewTextAlternate.Name = "textBoxListViewTextAlternate";
|
||||
this.textBoxListViewTextAlternate.Size = new System.Drawing.Size(17, 56);
|
||||
this.textBoxListViewTextAlternate.TabIndex = 33;
|
||||
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.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[] {
|
||||
@ -3425,16 +3355,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(92, 25);
|
||||
this.timeUpDownStartTime.TabIndex = 0;
|
||||
//
|
||||
// labelStartTimeWarning
|
||||
//
|
||||
this.labelStartTimeWarning.AutoSize = true;
|
||||
@ -3508,27 +3428,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.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(570, 56);
|
||||
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.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;
|
||||
@ -3547,31 +3446,6 @@
|
||||
this.labelAutoDuration.TabIndex = 30;
|
||||
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.DisplayExtraFromExtra = false;
|
||||
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(933, 148);
|
||||
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
|
||||
//
|
||||
this.tabPage2.Controls.Add(this.textBoxSource);
|
||||
@ -3616,30 +3490,6 @@
|
||||
this.panelVideoPlayer.Size = new System.Drawing.Size(282, 278);
|
||||
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.ShowStopButton = true;
|
||||
this.mediaPlayer.Size = new System.Drawing.Size(281, 278);
|
||||
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[] {
|
||||
@ -3671,6 +3521,165 @@
|
||||
this.timerAlternateTextUndo.Interval = 700;
|
||||
this.timerAlternateTextUndo.Tick += new System.EventHandler(this.TimerAlternateTextUndoTick);
|
||||
//
|
||||
// toolStripMenuItemMergeDialogue
|
||||
//
|
||||
this.toolStripMenuItemMergeDialogue.Name = "toolStripMenuItemMergeDialogue";
|
||||
this.toolStripMenuItemMergeDialogue.Size = new System.Drawing.Size(284, 22);
|
||||
this.toolStripMenuItemMergeDialogue.Text = "Merge selected lines as dialogue";
|
||||
this.toolStripMenuItemMergeDialogue.Click += new System.EventHandler(this.toolStripMenuItemMergeDialogue_Click);
|
||||
//
|
||||
// textBoxListViewTextAlternate
|
||||
//
|
||||
this.textBoxListViewTextAlternate.AllowDrop = true;
|
||||
this.textBoxListViewTextAlternate.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | 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(806, 28);
|
||||
this.textBoxListViewTextAlternate.Multiline = true;
|
||||
this.textBoxListViewTextAlternate.Name = "textBoxListViewTextAlternate";
|
||||
this.textBoxListViewTextAlternate.Size = new System.Drawing.Size(17, 56);
|
||||
this.textBoxListViewTextAlternate.TabIndex = 33;
|
||||
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.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(92, 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.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(570, 56);
|
||||
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.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);
|
||||
//
|
||||
// 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.DisplayExtraFromExtra = false;
|
||||
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(933, 148);
|
||||
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
|
||||
//
|
||||
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.ShowStopButton = true;
|
||||
this.mediaPlayer.Size = new System.Drawing.Size(281, 278);
|
||||
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.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.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);
|
||||
//
|
||||
// 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(92, 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, 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;
|
||||
//
|
||||
// Main
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
@ -4087,6 +4096,7 @@
|
||||
private System.Windows.Forms.Timer timerTextUndo;
|
||||
private System.Windows.Forms.Timer timerAlternateTextUndo;
|
||||
private System.Windows.Forms.ToolStripMenuItem adobeEncoreFABImageScriptToolStripMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemMergeDialogue;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -77,7 +77,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
long _lastTextKeyDownTicks = 0;
|
||||
long _lastHistoryTicks = 0;
|
||||
double? _audioWaveFormRightClickSeconds = null;
|
||||
|
||||
private System.Windows.Forms.Timer _timerDoSyntaxColoring = new Timer();
|
||||
System.Windows.Forms.Timer _timerAutoSave = new Timer();
|
||||
string _textAutoSave;
|
||||
|
||||
@ -1198,6 +1198,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
|
||||
splitLineToolStripMenuItem.Text = _language.Menu.ContextMenu.Split;
|
||||
toolStripMenuItemMergeLines.Text = _language.Menu.ContextMenu.MergeSelectedLines;
|
||||
toolStripMenuItemMergeDialogue.Text = _language.Menu.ContextMenu.MergeSelectedLinesASDialogue;
|
||||
mergeBeforeToolStripMenuItem.Text = _language.Menu.ContextMenu.MergeWithLineBefore;
|
||||
mergeAfterToolStripMenuItem.Text = _language.Menu.ContextMenu.MergeWithLineAfter;
|
||||
normalToolStripMenuItem.Text = _language.Menu.ContextMenu.Normal;
|
||||
@ -4292,8 +4293,8 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
toolStripMenuItemUnbreakLines.Visible = false;
|
||||
toolStripMenuItemAutoBreakLines.Visible = false;
|
||||
toolStripSeparatorBreakLines.Visible = false;
|
||||
|
||||
toolStripMenuItemGoogleMicrosoftTranslateSelLine.Visible = _subtitleAlternate != null;
|
||||
toolStripMenuItemMergeDialogue.Visible = false;
|
||||
}
|
||||
else if (SubtitleListview1.SelectedItems.Count == 2)
|
||||
{
|
||||
@ -4304,6 +4305,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
mergeBeforeToolStripMenuItem.Visible = false;
|
||||
splitLineToolStripMenuItem.Visible = false;
|
||||
typeEffectToolStripMenuItem.Visible = false;
|
||||
toolStripMenuItemMergeDialogue.Visible = false; //TODO: SE 3.3 - change to true
|
||||
}
|
||||
else if (SubtitleListview1.SelectedItems.Count >= 2)
|
||||
{
|
||||
@ -4318,6 +4320,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
|
||||
if (SubtitleListview1.SelectedItems.Count > 5)
|
||||
toolStripMenuItemMergeLines.Visible = false;
|
||||
toolStripMenuItemMergeDialogue.Visible = false;
|
||||
}
|
||||
|
||||
if (GetCurrentSubtitleFormat().GetType() != typeof(SubRip))
|
||||
@ -4952,7 +4955,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
_listViewTextUndoIndex = _subtitleListViewIndex;
|
||||
labelStatus.Text = string.Empty;
|
||||
|
||||
UpdateListSyntaxColoring();
|
||||
StartUpdateListSyntaxColoring();
|
||||
FixVerticalScrollBars(textBoxListViewText);
|
||||
}
|
||||
}
|
||||
@ -4979,7 +4982,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
labelStatus.Text = string.Empty;
|
||||
|
||||
UpdateListSyntaxColoring();
|
||||
StartUpdateListSyntaxColoring();
|
||||
FixVerticalScrollBars(textBoxListViewTextAlternate);
|
||||
}
|
||||
|
||||
@ -5587,10 +5590,16 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
p.CalculateTimeCodesFromFrameNumbers(CurrentFrameRate);
|
||||
}
|
||||
|
||||
UpdateListSyntaxColoring();
|
||||
StartUpdateListSyntaxColoring();
|
||||
}
|
||||
}
|
||||
|
||||
private void StartUpdateListSyntaxColoring()
|
||||
{
|
||||
if (!_timerDoSyntaxColoring.Enabled)
|
||||
_timerDoSyntaxColoring.Start();
|
||||
}
|
||||
|
||||
private void UpdateListSyntaxColoring()
|
||||
{
|
||||
if (_loading)
|
||||
@ -5677,7 +5686,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
}
|
||||
|
||||
UpdateListSyntaxColoring();
|
||||
StartUpdateListSyntaxColoring();
|
||||
|
||||
if (GetCurrentSubtitleFormat().IsFrameBased)
|
||||
{
|
||||
@ -5737,7 +5746,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
if (_subtitle != null && _subtitle.Paragraphs.Count > 0)
|
||||
textBoxListViewText.Enabled = true;
|
||||
|
||||
UpdateListSyntaxColoring();
|
||||
StartUpdateListSyntaxColoring();
|
||||
}
|
||||
|
||||
void MaskedTextBox_TextChanged(object sender, EventArgs e)
|
||||
@ -7953,9 +7962,9 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
if (Clipboard.ContainsText())
|
||||
{
|
||||
string text = Clipboard.GetText();
|
||||
Subtitle tmp = new Subtitle();
|
||||
SubRip format = new SubRip();
|
||||
List<string> list = new List<string>();
|
||||
var tmp = new Subtitle();
|
||||
var format = new SubRip();
|
||||
var list = new List<string>();
|
||||
foreach (string line in text.Replace(Environment.NewLine, "|").Split("|".ToCharArray(), StringSplitOptions.None))
|
||||
list.Add(line);
|
||||
format.LoadSubtitle(tmp, list, null);
|
||||
@ -7977,12 +7986,23 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
lastTempParagraph = p;
|
||||
}
|
||||
}
|
||||
else if (SubtitleListview1.Items.Count == 0 && tmp.Paragraphs.Count > 0)
|
||||
{ // insert into empty subtitle
|
||||
foreach (Paragraph p in tmp.Paragraphs)
|
||||
{
|
||||
_subtitle.Paragraphs.Add(p);
|
||||
}
|
||||
SubtitleListview1.Fill(_subtitle, _subtitleAlternate);
|
||||
SubtitleListview1.SelectIndexAndEnsureVisible(0);
|
||||
_change = true;
|
||||
}
|
||||
|
||||
}
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
else if (e.KeyCode == Keys.X && e.Modifiers == Keys.Control) //Ctrl+X = Cut to clipboard
|
||||
{
|
||||
Subtitle tmp = new Subtitle();
|
||||
var tmp = new Subtitle();
|
||||
foreach (int i in SubtitleListview1.SelectedIndices)
|
||||
{
|
||||
Paragraph p = _subtitle.GetParagraphOrDefault(i);
|
||||
@ -8682,6 +8702,10 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
|
||||
SubtitleListview1.Fill(_subtitle, _subtitleAlternate);
|
||||
RestoreSubtitleListviewIndexes();
|
||||
|
||||
Configuration.Settings.RecentFiles.Add(_fileName, FirstVisibleIndex, FirstSelectedIndex, _videoFileName, _subtitleAlternateFileName);
|
||||
Configuration.Settings.Save();
|
||||
UpdateRecentFilesUI();
|
||||
}
|
||||
}
|
||||
|
||||
@ -10056,7 +10080,16 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
numericUpDownSecAdjust1.Width = numericUpDownSecAdjust1.Width + 10;
|
||||
numericUpDownSecAdjust2.Width = numericUpDownSecAdjust2.Width + 10;
|
||||
labelDuration.Left = numericUpDownDuration.Left;
|
||||
}
|
||||
}
|
||||
|
||||
_timerDoSyntaxColoring.Interval = 100;
|
||||
_timerDoSyntaxColoring.Tick +=_timerDoSyntaxColoring_Tick;
|
||||
}
|
||||
|
||||
void _timerDoSyntaxColoring_Tick(object sender, EventArgs e)
|
||||
{
|
||||
UpdateListSyntaxColoring();
|
||||
_timerDoSyntaxColoring.Stop();
|
||||
}
|
||||
|
||||
private void SetPositionFromXYString(string positionAndSize, string name)
|
||||
@ -11938,6 +11971,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
{
|
||||
_subtitleAlternateFileName = saveFileDialog1.FileName;
|
||||
SaveOriginalSubtitle(GetCurrentSubtitleFormat());
|
||||
Configuration.Settings.RecentFiles.Add(_fileName, FirstVisibleIndex, FirstSelectedIndex, _videoFileName, _subtitleAlternateFileName);
|
||||
}
|
||||
}
|
||||
|
||||
@ -11975,6 +12009,10 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
SubtitleListview1.AutoSizeAllColumns(this);
|
||||
_subtitleAlternate = new Subtitle();
|
||||
_subtitleAlternateFileName = null;
|
||||
|
||||
Configuration.Settings.RecentFiles.Add(_fileName, FirstVisibleIndex, FirstSelectedIndex, _videoFileName, _subtitleAlternateFileName);
|
||||
Configuration.Settings.Save();
|
||||
UpdateRecentFilesUI();
|
||||
}
|
||||
|
||||
buttonUnBreak.Visible = true;
|
||||
@ -12768,6 +12806,11 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
var exportBdnXmlPng = new ExportPngXml();
|
||||
exportBdnXmlPng.Initialize(_subtitle, "FAB", _fileName);
|
||||
exportBdnXmlPng.ShowDialog(this);
|
||||
}
|
||||
|
||||
private void toolStripMenuItemMergeDialogue_Click(object sender, EventArgs e)
|
||||
{
|
||||
MergeDialogues();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -681,7 +681,7 @@
|
||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD0
|
||||
CAAAAk1TRnQBSQFMAgEBAgEAAWABEAFgAhABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
|
||||
CAAAAk1TRnQBSQFMAgEBAgEAAXgBEAF4AhABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
|
||||
AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA
|
||||
AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA
|
||||
AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm
|
||||
|
||||
@ -1813,7 +1813,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
string waveFormsFolder = Configuration.WaveFormsFolder.TrimEnd(Path.DirectorySeparatorChar);
|
||||
if (Directory.Exists(waveFormsFolder))
|
||||
{
|
||||
DirectoryInfo di = new DirectoryInfo(waveFormsFolder);
|
||||
var di = new DirectoryInfo(waveFormsFolder);
|
||||
|
||||
foreach (FileInfo fileName in di.GetFiles("*.wav"))
|
||||
{
|
||||
@ -1831,11 +1831,11 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
string spectrogramsFolder = Configuration.SpectrogramsFolder.TrimEnd(Path.DirectorySeparatorChar);
|
||||
if (Directory.Exists(spectrogramsFolder))
|
||||
{
|
||||
DirectoryInfo di = new DirectoryInfo(spectrogramsFolder);
|
||||
var di = new DirectoryInfo(spectrogramsFolder);
|
||||
|
||||
foreach (DirectoryInfo dir in di.GetDirectories())
|
||||
{
|
||||
DirectoryInfo spectrogramDir = new DirectoryInfo(dir.FullName);
|
||||
var spectrogramDir = new DirectoryInfo(dir.FullName);
|
||||
foreach (FileInfo fileName in spectrogramDir.GetFiles("*.gif"))
|
||||
{
|
||||
File.Delete(fileName.FullName);
|
||||
@ -1896,7 +1896,6 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
comboBoxShortcutKey.SelectedIndex = 0;
|
||||
comboBoxShortcutKey.Enabled = false;
|
||||
buttonUpdateShortcut.Enabled = false;
|
||||
|
||||
}
|
||||
else if (e.Node != null || e.Node.Nodes.Count == 0)
|
||||
{
|
||||
@ -1913,7 +1912,6 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
comboBoxShortcutKey.Enabled = true;
|
||||
buttonUpdateShortcut.Enabled = true;
|
||||
|
||||
|
||||
string shortcut = GetShortcut(e.Node.Text);
|
||||
|
||||
string[] parts = shortcut.ToLower().Split("+".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
|
||||
@ -1944,10 +1942,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -1955,6 +1950,8 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
{
|
||||
string shortcut = text.Substring(text.IndexOf("["));
|
||||
shortcut = shortcut.TrimEnd(']').TrimStart('[');
|
||||
if (shortcut == Configuration.Settings.Language.General.None)
|
||||
return string.Empty;
|
||||
return shortcut;
|
||||
}
|
||||
|
||||
@ -1970,7 +1967,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
return;
|
||||
}
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
var sb = new StringBuilder();
|
||||
sb.Append("[");
|
||||
if (checkBoxShortcutsControl.Checked)
|
||||
sb.Append("Control+");
|
||||
@ -1983,19 +1980,14 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
|
||||
if (sb.Length < 4 || sb.ToString().EndsWith("+]"))
|
||||
{
|
||||
MessageBox.Show(string.Format(Configuration.Settings.Language.Settings.ShortcutIsNotValid, sb.ToString()));
|
||||
MessageBox.Show(string.Format(Configuration.Settings.Language.Settings.ShortcutIsNotValid, sb));
|
||||
return;
|
||||
}
|
||||
|
||||
treeViewShortcuts.SelectedNode.Text = text + " " + sb.ToString();
|
||||
treeViewShortcuts.SelectedNode.Text = text + " " + sb;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private void buttonSpectrogramsFolderEmpty_Click(object sender, EventArgs e)
|
||||
{
|
||||
InitializeWaveformsAndSpectrogramsFolderEmpty(Configuration.Settings.Language.Settings);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -936,6 +936,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
CopyToClipboard = "Copy as text to clipboard",
|
||||
Split = "Split",
|
||||
MergeSelectedLines = "Merge selected lines",
|
||||
MergeSelectedLinesASDialogue = "Merge selected lines as dialogue",
|
||||
MergeWithLineBefore = "Merge with line before",
|
||||
MergeWithLineAfter = "Merge with line after",
|
||||
Normal = "Normal",
|
||||
|
||||
@ -851,6 +851,7 @@
|
||||
public string CopyToClipboard { get; set; }
|
||||
public string Split { get; set; }
|
||||
public string MergeSelectedLines { get; set; }
|
||||
public string MergeSelectedLinesASDialogue { get; set; }
|
||||
public string MergeWithLineBefore { get; set; }
|
||||
public string MergeWithLineAfter { get; set; }
|
||||
public string Normal { get; set; }
|
||||
|
||||
@ -273,8 +273,14 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers
|
||||
|
||||
if (_quartzFilgraphManager != null)
|
||||
{
|
||||
_quartzFilgraphManager.Stop();
|
||||
Marshal.ReleaseComObject(_quartzFilgraphManager);
|
||||
try
|
||||
{
|
||||
_quartzFilgraphManager.Stop();
|
||||
Marshal.ReleaseComObject(_quartzFilgraphManager);
|
||||
}
|
||||
catch
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
_quartzFilgraphManager = null;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user