Added "Point sync via other subtitle" - thx ioannis

git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@417 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2011-05-03 19:45:39 +00:00
parent a2fa661448
commit 1b06997c1d
7 changed files with 322 additions and 159 deletions

View File

@ -146,6 +146,7 @@
this.toolStripMenuItemAdjustAllTimes = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemAdjustAllTimes = new System.Windows.Forms.ToolStripMenuItem();
this.visualSyncToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.visualSyncToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItemPointSync = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemPointSync = new System.Windows.Forms.ToolStripMenuItem();
this.pointSyncViaOtherSubtitleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItemChangeFrameRate2 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemChangeFrameRate2 = new System.Windows.Forms.ToolStripMenuItem();
this.transcriptImporterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.transcriptImporterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItemAutoTranslate = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemAutoTranslate = new System.Windows.Forms.ToolStripMenuItem();
@ -219,7 +220,6 @@
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.AudioWaveForm = new Nikse.SubtitleEdit.Controls.WaveForm();
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();
@ -241,7 +241,6 @@
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();
@ -260,7 +259,6 @@
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();
@ -326,7 +324,6 @@
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();
@ -337,14 +334,18 @@
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.AudioWaveForm = new Nikse.SubtitleEdit.Controls.WaveForm();
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();
@ -1363,6 +1364,7 @@
this.toolStripMenuItemAdjustAllTimes, this.toolStripMenuItemAdjustAllTimes,
this.visualSyncToolStripMenuItem, this.visualSyncToolStripMenuItem,
this.toolStripMenuItemPointSync, this.toolStripMenuItemPointSync,
this.pointSyncViaOtherSubtitleToolStripMenuItem,
this.toolStripMenuItemChangeFrameRate2, this.toolStripMenuItemChangeFrameRate2,
this.transcriptImporterToolStripMenuItem}); this.transcriptImporterToolStripMenuItem});
this.toolStripMenuItemSyncronization.Name = "toolStripMenuItemSyncronization"; this.toolStripMenuItemSyncronization.Name = "toolStripMenuItemSyncronization";
@ -1396,6 +1398,13 @@
this.toolStripMenuItemPointSync.Text = "Point sync..."; this.toolStripMenuItemPointSync.Text = "Point sync...";
this.toolStripMenuItemPointSync.Click += new System.EventHandler(this.toolStripMenuItemPointSync_Click); this.toolStripMenuItemPointSync.Click += new System.EventHandler(this.toolStripMenuItemPointSync_Click);
// //
// pointSyncViaOtherSubtitleToolStripMenuItem
//
this.pointSyncViaOtherSubtitleToolStripMenuItem.Name = "pointSyncViaOtherSubtitleToolStripMenuItem";
this.pointSyncViaOtherSubtitleToolStripMenuItem.Size = new System.Drawing.Size(336, 22);
this.pointSyncViaOtherSubtitleToolStripMenuItem.Text = "Point sync via other subtitle...";
this.pointSyncViaOtherSubtitleToolStripMenuItem.Click += new System.EventHandler(this.pointSyncViaOtherSubtitleToolStripMenuItem_Click);
//
// toolStripMenuItemChangeFrameRate2 // toolStripMenuItemChangeFrameRate2
// //
this.toolStripMenuItemChangeFrameRate2.Name = "toolStripMenuItemChangeFrameRate2"; this.toolStripMenuItemChangeFrameRate2.Name = "toolStripMenuItemChangeFrameRate2";
@ -1982,34 +1991,6 @@
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);
// //
// AudioWaveForm
//
this.AudioWaveForm.AllowDrop = true;
this.AudioWaveForm.AllowNewSelection = true;
this.AudioWaveForm.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.AudioWaveForm.BackColor = System.Drawing.Color.Black;
this.AudioWaveForm.BackgroundColor = System.Drawing.Color.Black;
this.AudioWaveForm.Color = System.Drawing.Color.GreenYellow;
this.AudioWaveForm.DrawGridLines = true;
this.AudioWaveForm.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(18)))));
this.AudioWaveForm.Location = new System.Drawing.Point(472, 32);
this.AudioWaveForm.Margin = new System.Windows.Forms.Padding(0);
this.AudioWaveForm.Name = "AudioWaveForm";
this.AudioWaveForm.NewSelectionParagraph = null;
this.AudioWaveForm.SelectedColor = System.Drawing.Color.Red;
this.AudioWaveForm.Size = new System.Drawing.Size(768, 229);
this.AudioWaveForm.StartPositionSeconds = 0D;
this.AudioWaveForm.TabIndex = 6;
this.AudioWaveForm.TextColor = System.Drawing.Color.Gray;
this.AudioWaveForm.WaveFormNotLoadedText = "Click to add wave form";
this.AudioWaveForm.WavePeaks = null;
this.AudioWaveForm.ZoomFactor = 1D;
this.AudioWaveForm.Click += new System.EventHandler(this.AudioWaveForm_Click);
this.AudioWaveForm.DragDrop += new System.Windows.Forms.DragEventHandler(this.AudioWaveForm_DragDrop);
this.AudioWaveForm.DragEnter += new System.Windows.Forms.DragEventHandler(this.AudioWaveForm_DragEnter);
//
// tabControlButtons // tabControlButtons
// //
this.tabControlButtons.Controls.Add(this.tabPageTranslate); this.tabControlButtons.Controls.Add(this.tabPageTranslate);
@ -2285,16 +2266,6 @@
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);
@ -2518,16 +2489,6 @@
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);
@ -3182,16 +3143,6 @@
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)));
@ -3313,31 +3264,6 @@
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);
@ -3382,26 +3308,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;
// //
// 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.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.VideoPlayer = null;
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 // contextMenuStripEmpty
// //
this.contextMenuStripEmpty.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.contextMenuStripEmpty.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -3423,6 +3329,109 @@
this.imageListPlayRate.Images.SetKeyName(0, "FastForward.png"); this.imageListPlayRate.Images.SetKeyName(0, "FastForward.png");
this.imageListPlayRate.Images.SetKeyName(1, "FastForwardHighLight.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
//
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.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.VideoPlayer = null;
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);
//
// AudioWaveForm
//
this.AudioWaveForm.AllowDrop = true;
this.AudioWaveForm.AllowNewSelection = true;
this.AudioWaveForm.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.AudioWaveForm.BackColor = System.Drawing.Color.Black;
this.AudioWaveForm.BackgroundColor = System.Drawing.Color.Black;
this.AudioWaveForm.Color = System.Drawing.Color.GreenYellow;
this.AudioWaveForm.DrawGridLines = true;
this.AudioWaveForm.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(18)))));
this.AudioWaveForm.Location = new System.Drawing.Point(472, 32);
this.AudioWaveForm.Margin = new System.Windows.Forms.Padding(0);
this.AudioWaveForm.Name = "AudioWaveForm";
this.AudioWaveForm.NewSelectionParagraph = null;
this.AudioWaveForm.SelectedColor = System.Drawing.Color.Red;
this.AudioWaveForm.Size = new System.Drawing.Size(768, 229);
this.AudioWaveForm.StartPositionSeconds = 0D;
this.AudioWaveForm.TabIndex = 6;
this.AudioWaveForm.TextColor = System.Drawing.Color.Gray;
this.AudioWaveForm.WaveFormNotLoadedText = "Click to add wave form";
this.AudioWaveForm.WavePeaks = null;
this.AudioWaveForm.ZoomFactor = 1D;
this.AudioWaveForm.Click += new System.EventHandler(this.AudioWaveForm_Click);
this.AudioWaveForm.DragDrop += new System.Windows.Forms.DragEventHandler(this.AudioWaveForm_DragDrop);
this.AudioWaveForm.DragEnter += new System.Windows.Forms.DragEventHandler(this.AudioWaveForm_DragEnter);
//
// 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;
//
// 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;
//
// Main // Main
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -3813,6 +3822,7 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator22; private System.Windows.Forms.ToolStripSeparator toolStripSeparator22;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemExport; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemExport;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemExportPngXml; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemExportPngXml;
private System.Windows.Forms.ToolStripMenuItem pointSyncViaOtherSubtitleToolStripMenuItem;
} }
} }

View File

@ -776,6 +776,7 @@ namespace Nikse.SubtitleEdit.Forms
toolStripMenuItemAdjustAllTimes.Text = _language.Menu.Synchronization.AdjustAllTimes; toolStripMenuItemAdjustAllTimes.Text = _language.Menu.Synchronization.AdjustAllTimes;
visualSyncToolStripMenuItem.Text = _language.Menu.Synchronization.VisualSync; visualSyncToolStripMenuItem.Text = _language.Menu.Synchronization.VisualSync;
toolStripMenuItemPointSync.Text = _language.Menu.Synchronization.PointSync; toolStripMenuItemPointSync.Text = _language.Menu.Synchronization.PointSync;
pointSyncViaOtherSubtitleToolStripMenuItem.Text = _language.Menu.Synchronization.PointSyncViaOtherSubtitle;
toolStripMenuItemAutoTranslate.Text = _language.Menu.AutoTranslate.Title; toolStripMenuItemAutoTranslate.Text = _language.Menu.AutoTranslate.Title;
translateByGoogleToolStripMenuItem.Text = _language.Menu.AutoTranslate.TranslatePoweredByGoogle; translateByGoogleToolStripMenuItem.Text = _language.Menu.AutoTranslate.TranslatePoweredByGoogle;
@ -1171,7 +1172,7 @@ namespace Nikse.SubtitleEdit.Forms
openFileDialog1.Title = _languageGeneral.OpenSubtitle; openFileDialog1.Title = _languageGeneral.OpenSubtitle;
openFileDialog1.FileName = string.Empty; openFileDialog1.FileName = string.Empty;
openFileDialog1.Filter = Utilities.GetOpenDialogFilter(); openFileDialog1.Filter = Utilities.GetOpenDialogFilter();
if (openFileDialog1.ShowDialog(this) == DialogResult.OK) // sometimes crashes... why?? if (openFileDialog1.ShowDialog(this) == DialogResult.OK)
{ {
OpenSubtitle(openFileDialog1.FileName, null); OpenSubtitle(openFileDialog1.FileName, null);
} }
@ -6629,6 +6630,40 @@ namespace Nikse.SubtitleEdit.Forms
_formPositionsAndSizes.SavePositionAndSize(pointSync); _formPositionsAndSizes.SavePositionAndSize(pointSync);
} }
private void pointSyncViaOtherSubtitleToolStripMenuItem_Click(object sender, EventArgs e)
{
SyncPointsSync pointSync = new SyncPointsSync();
openFileDialog1.Title = _language.OpenOtherSubtitle;
openFileDialog1.FileName = string.Empty;
openFileDialog1.Filter = Utilities.GetOpenDialogFilter();
if (openFileDialog1.ShowDialog() == DialogResult.OK)
{
Subtitle sub = new Subtitle();
Encoding enc;
SubtitleFormat f = sub.LoadSubtitle(openFileDialog1.FileName, out enc, null);
if (f == null)
{
ShowUnknownSubtitle();
return;
}
pointSync.Initialize(_subtitle, _fileName, _videoFileName, _videoAudioTrackNumber, openFileDialog1.FileName, sub);
mediaPlayer.Pause();
if (pointSync.ShowDialog(this) == DialogResult.OK)
{
_subtitleListViewIndex = -1;
MakeHistoryForUndo(_language.BeforePointSynchronization);
_subtitle = pointSync.FixedSubtitle;
_subtitle.CalculateFrameNumbersFromTimeCodesNoCheck(CurrentFrameRate);
ShowStatus(_language.PointSynchronizationDone);
ShowSource();
SubtitleListview1.Fill(_subtitle, _subtitleAlternate);
_change = true;
}
_videoFileName = pointSync.VideoFileName;
}
}
private void toolStripMenuItemImportTimeCodes_Click(object sender, EventArgs e) private void toolStripMenuItemImportTimeCodes_Click(object sender, EventArgs e)
{ {
if (_subtitle.Paragraphs.Count < 1) if (_subtitle.Paragraphs.Count < 1)

View File

@ -577,9 +577,6 @@
<metadata name="toolStripWaveControls.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="toolStripWaveControls.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>208, 56</value> <value>208, 56</value>
</metadata> </metadata>
<metadata name="toolStripWaveControls.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>208, 56</value>
</metadata>
<data name="toolStripButtonWaveFormZoomOut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="toolStripButtonWaveFormZoomOut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@ -687,7 +684,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
CAAAAk1TRnQBSQFMAgEBAgEAAYgBBAGIAQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo CAAAAk1TRnQBSQFMAgEBAgEAAdgBBAHYAQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

View File

@ -34,18 +34,24 @@
this.labelSyncInfo = new System.Windows.Forms.Label(); this.labelSyncInfo = new System.Windows.Forms.Label();
this.buttonRemoveSyncPoint = new System.Windows.Forms.Button(); this.buttonRemoveSyncPoint = new System.Windows.Forms.Button();
this.buttonSetSyncPoint = new System.Windows.Forms.Button(); this.buttonSetSyncPoint = new System.Windows.Forms.Button();
this.SubtitleListview1 = new Nikse.SubtitleEdit.Controls.SubtitleListView();
this.buttonApplySync = new System.Windows.Forms.Button(); this.buttonApplySync = new System.Windows.Forms.Button();
this.buttonCancel = new System.Windows.Forms.Button(); this.buttonCancel = new System.Windows.Forms.Button();
this.buttonOK = new System.Windows.Forms.Button(); this.buttonOK = new System.Windows.Forms.Button();
this.labelSubtitleFileName = new System.Windows.Forms.Label();
this.labelOtherSubtitleFileName = new System.Windows.Forms.Label();
this.subtitleListView2 = new Nikse.SubtitleEdit.Controls.SubtitleListView();
this.SubtitleListview1 = new Nikse.SubtitleEdit.Controls.SubtitleListView();
this.groupBoxImportResult.SuspendLayout(); this.groupBoxImportResult.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// groupBoxImportResult // groupBoxImportResult
// //
this.groupBoxImportResult.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBoxImportResult.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.groupBoxImportResult.Controls.Add(this.labelOtherSubtitleFileName);
this.groupBoxImportResult.Controls.Add(this.labelSubtitleFileName);
this.groupBoxImportResult.Controls.Add(this.subtitleListView2);
this.groupBoxImportResult.Controls.Add(this.listBoxSyncPoints); this.groupBoxImportResult.Controls.Add(this.listBoxSyncPoints);
this.groupBoxImportResult.Controls.Add(this.labelNoOfSyncPoints); this.groupBoxImportResult.Controls.Add(this.labelNoOfSyncPoints);
this.groupBoxImportResult.Controls.Add(this.labelSyncInfo); this.groupBoxImportResult.Controls.Add(this.labelSyncInfo);
@ -54,7 +60,7 @@
this.groupBoxImportResult.Controls.Add(this.SubtitleListview1); this.groupBoxImportResult.Controls.Add(this.SubtitleListview1);
this.groupBoxImportResult.Location = new System.Drawing.Point(12, 12); this.groupBoxImportResult.Location = new System.Drawing.Point(12, 12);
this.groupBoxImportResult.Name = "groupBoxImportResult"; this.groupBoxImportResult.Name = "groupBoxImportResult";
this.groupBoxImportResult.Size = new System.Drawing.Size(812, 395); this.groupBoxImportResult.Size = new System.Drawing.Size(1081, 434);
this.groupBoxImportResult.TabIndex = 16; this.groupBoxImportResult.TabIndex = 16;
this.groupBoxImportResult.TabStop = false; this.groupBoxImportResult.TabStop = false;
// //
@ -62,7 +68,7 @@
// //
this.listBoxSyncPoints.Anchor = System.Windows.Forms.AnchorStyles.Right; this.listBoxSyncPoints.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.listBoxSyncPoints.FormattingEnabled = true; this.listBoxSyncPoints.FormattingEnabled = true;
this.listBoxSyncPoints.Location = new System.Drawing.Point(654, 242); this.listBoxSyncPoints.Location = new System.Drawing.Point(467, 211);
this.listBoxSyncPoints.Name = "listBoxSyncPoints"; this.listBoxSyncPoints.Name = "listBoxSyncPoints";
this.listBoxSyncPoints.Size = new System.Drawing.Size(140, 82); this.listBoxSyncPoints.Size = new System.Drawing.Size(140, 82);
this.listBoxSyncPoints.TabIndex = 18; this.listBoxSyncPoints.TabIndex = 18;
@ -72,7 +78,7 @@
// //
this.labelNoOfSyncPoints.Anchor = System.Windows.Forms.AnchorStyles.Right; this.labelNoOfSyncPoints.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.labelNoOfSyncPoints.AutoSize = true; this.labelNoOfSyncPoints.AutoSize = true;
this.labelNoOfSyncPoints.Location = new System.Drawing.Point(653, 225); this.labelNoOfSyncPoints.Location = new System.Drawing.Point(466, 194);
this.labelNoOfSyncPoints.Name = "labelNoOfSyncPoints"; this.labelNoOfSyncPoints.Name = "labelNoOfSyncPoints";
this.labelNoOfSyncPoints.Size = new System.Drawing.Size(75, 13); this.labelNoOfSyncPoints.Size = new System.Drawing.Size(75, 13);
this.labelNoOfSyncPoints.TabIndex = 16; this.labelNoOfSyncPoints.TabIndex = 16;
@ -82,7 +88,7 @@
// //
this.labelSyncInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.labelSyncInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.labelSyncInfo.AutoSize = true; this.labelSyncInfo.AutoSize = true;
this.labelSyncInfo.Location = new System.Drawing.Point(6, 376); this.labelSyncInfo.Location = new System.Drawing.Point(6, 415);
this.labelSyncInfo.Name = "labelSyncInfo"; this.labelSyncInfo.Name = "labelSyncInfo";
this.labelSyncInfo.Size = new System.Drawing.Size(284, 13); this.labelSyncInfo.Size = new System.Drawing.Size(284, 13);
this.labelSyncInfo.TabIndex = 17; this.labelSyncInfo.TabIndex = 17;
@ -91,7 +97,7 @@
// buttonRemoveSyncPoint // buttonRemoveSyncPoint
// //
this.buttonRemoveSyncPoint.Anchor = System.Windows.Forms.AnchorStyles.Right; this.buttonRemoveSyncPoint.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.buttonRemoveSyncPoint.Location = new System.Drawing.Point(656, 201); this.buttonRemoveSyncPoint.Location = new System.Drawing.Point(469, 170);
this.buttonRemoveSyncPoint.Name = "buttonRemoveSyncPoint"; this.buttonRemoveSyncPoint.Name = "buttonRemoveSyncPoint";
this.buttonRemoveSyncPoint.Size = new System.Drawing.Size(138, 21); this.buttonRemoveSyncPoint.Size = new System.Drawing.Size(138, 21);
this.buttonRemoveSyncPoint.TabIndex = 14; this.buttonRemoveSyncPoint.TabIndex = 14;
@ -102,7 +108,7 @@
// buttonSetSyncPoint // buttonSetSyncPoint
// //
this.buttonSetSyncPoint.Anchor = System.Windows.Forms.AnchorStyles.Right; this.buttonSetSyncPoint.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.buttonSetSyncPoint.Location = new System.Drawing.Point(656, 174); this.buttonSetSyncPoint.Location = new System.Drawing.Point(469, 143);
this.buttonSetSyncPoint.Name = "buttonSetSyncPoint"; this.buttonSetSyncPoint.Name = "buttonSetSyncPoint";
this.buttonSetSyncPoint.Size = new System.Drawing.Size(138, 21); this.buttonSetSyncPoint.Size = new System.Drawing.Size(138, 21);
this.buttonSetSyncPoint.TabIndex = 13; this.buttonSetSyncPoint.TabIndex = 13;
@ -110,31 +116,11 @@
this.buttonSetSyncPoint.UseVisualStyleBackColor = true; this.buttonSetSyncPoint.UseVisualStyleBackColor = true;
this.buttonSetSyncPoint.Click += new System.EventHandler(this.buttonSetSyncPoint_Click); this.buttonSetSyncPoint.Click += new System.EventHandler(this.buttonSetSyncPoint_Click);
// //
// 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.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(6, 19);
this.SubtitleListview1.MultiSelect = false;
this.SubtitleListview1.Name = "SubtitleListview1";
this.SubtitleListview1.Size = new System.Drawing.Size(641, 354);
this.SubtitleListview1.TabIndex = 12;
this.SubtitleListview1.UseCompatibleStateImageBehavior = false;
this.SubtitleListview1.View = System.Windows.Forms.View.Details;
this.SubtitleListview1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.SubtitleListview1_MouseDoubleClick);
//
// buttonApplySync // buttonApplySync
// //
this.buttonApplySync.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonApplySync.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonApplySync.Enabled = false; this.buttonApplySync.Enabled = false;
this.buttonApplySync.Location = new System.Drawing.Point(745, 413); this.buttonApplySync.Location = new System.Drawing.Point(1014, 452);
this.buttonApplySync.Name = "buttonApplySync"; this.buttonApplySync.Name = "buttonApplySync";
this.buttonApplySync.Size = new System.Drawing.Size(80, 21); this.buttonApplySync.Size = new System.Drawing.Size(80, 21);
this.buttonApplySync.TabIndex = 15; this.buttonApplySync.TabIndex = 15;
@ -146,7 +132,7 @@
// //
this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonCancel.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.buttonCancel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.buttonCancel.Location = new System.Drawing.Point(664, 413); this.buttonCancel.Location = new System.Drawing.Point(933, 452);
this.buttonCancel.Name = "buttonCancel"; this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(75, 21); this.buttonCancel.Size = new System.Drawing.Size(75, 21);
this.buttonCancel.TabIndex = 19; this.buttonCancel.TabIndex = 19;
@ -158,7 +144,7 @@
// //
this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonOK.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.buttonOK.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.buttonOK.Location = new System.Drawing.Point(583, 413); this.buttonOK.Location = new System.Drawing.Point(852, 452);
this.buttonOK.Name = "buttonOK"; this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(75, 21); this.buttonOK.Size = new System.Drawing.Size(75, 21);
this.buttonOK.TabIndex = 18; this.buttonOK.TabIndex = 18;
@ -166,11 +152,66 @@
this.buttonOK.UseVisualStyleBackColor = true; this.buttonOK.UseVisualStyleBackColor = true;
this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click); this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
// //
// labelSubtitleFileName
//
this.labelSubtitleFileName.AutoSize = true;
this.labelSubtitleFileName.Location = new System.Drawing.Point(6, 17);
this.labelSubtitleFileName.Name = "labelSubtitleFileName";
this.labelSubtitleFileName.Size = new System.Drawing.Size(108, 13);
this.labelSubtitleFileName.TabIndex = 20;
this.labelSubtitleFileName.Text = "labelSubtitleFileName";
//
// labelOtherSubtitleFileName
//
this.labelOtherSubtitleFileName.AutoSize = true;
this.labelOtherSubtitleFileName.Location = new System.Drawing.Point(610, 17);
this.labelOtherSubtitleFileName.Name = "labelOtherSubtitleFileName";
this.labelOtherSubtitleFileName.Size = new System.Drawing.Size(136, 13);
this.labelOtherSubtitleFileName.TabIndex = 21;
this.labelOtherSubtitleFileName.Text = "labelOtherSubtitleFileName";
//
// subtitleListView2
//
this.subtitleListView2.AllowDrop = true;
this.subtitleListView2.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.subtitleListView2.FirstVisibleIndex = -1;
this.subtitleListView2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.subtitleListView2.FullRowSelect = true;
this.subtitleListView2.GridLines = true;
this.subtitleListView2.HideSelection = false;
this.subtitleListView2.Location = new System.Drawing.Point(613, 33);
this.subtitleListView2.MultiSelect = false;
this.subtitleListView2.Name = "subtitleListView2";
this.subtitleListView2.Size = new System.Drawing.Size(453, 379);
this.subtitleListView2.TabIndex = 19;
this.subtitleListView2.UseCompatibleStateImageBehavior = false;
this.subtitleListView2.View = System.Windows.Forms.View.Details;
//
// 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.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(9, 33);
this.SubtitleListview1.MultiSelect = false;
this.SubtitleListview1.Name = "SubtitleListview1";
this.SubtitleListview1.Size = new System.Drawing.Size(451, 379);
this.SubtitleListview1.TabIndex = 12;
this.SubtitleListview1.UseCompatibleStateImageBehavior = false;
this.SubtitleListview1.View = System.Windows.Forms.View.Details;
this.SubtitleListview1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.SubtitleListview1_MouseDoubleClick);
//
// SyncPointsSync // SyncPointsSync
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(836, 446); this.ClientSize = new System.Drawing.Size(1105, 485);
this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.buttonOK); this.Controls.Add(this.buttonOK);
this.Controls.Add(this.buttonApplySync); this.Controls.Add(this.buttonApplySync);
@ -202,5 +243,8 @@
private System.Windows.Forms.Button buttonCancel; private System.Windows.Forms.Button buttonCancel;
private System.Windows.Forms.Button buttonOK; private System.Windows.Forms.Button buttonOK;
private System.Windows.Forms.ListBox listBoxSyncPoints; private System.Windows.Forms.ListBox listBoxSyncPoints;
private System.Windows.Forms.Label labelOtherSubtitleFileName;
private System.Windows.Forms.Label labelSubtitleFileName;
private Controls.SubtitleListView subtitleListView2;
} }
} }

View File

@ -24,6 +24,7 @@ namespace Nikse.SubtitleEdit.Forms
int _audioTrackNumber; int _audioTrackNumber;
Subtitle _subtitle; Subtitle _subtitle;
Subtitle _originalSubtitle; Subtitle _originalSubtitle;
Subtitle _otherSubtitle;
System.Collections.Generic.SortedDictionary<int, TimeSpan> _syncronizationPoints = new SortedDictionary<int, TimeSpan>(); System.Collections.Generic.SortedDictionary<int, TimeSpan> _syncronizationPoints = new SortedDictionary<int, TimeSpan>();
public string VideoFileName public string VideoFileName
@ -49,9 +50,13 @@ namespace Nikse.SubtitleEdit.Forms
labelNoOfSyncPoints.Text = string.Format(Configuration.Settings.Language.PointSync.SyncPointsX, 0); labelNoOfSyncPoints.Text = string.Format(Configuration.Settings.Language.PointSync.SyncPointsX, 0);
labelSyncInfo.Text = Configuration.Settings.Language.PointSync.Info; labelSyncInfo.Text = Configuration.Settings.Language.PointSync.Info;
SubtitleListview1.InitializeLanguage(Configuration.Settings.Language.General, Configuration.Settings); SubtitleListview1.InitializeLanguage(Configuration.Settings.Language.General, Configuration.Settings);
subtitleListView2.InitializeLanguage(Configuration.Settings.Language.General, Configuration.Settings);
SubtitleListview1.InitializeTimeStampColumWidths(this); SubtitleListview1.InitializeTimeStampColumWidths(this);
subtitleListView2.InitializeTimeStampColumWidths(this);
Utilities.InitializeSubtitleFont(SubtitleListview1); Utilities.InitializeSubtitleFont(SubtitleListview1);
Utilities.InitializeSubtitleFont(subtitleListView2);
SubtitleListview1.AutoSizeAllColumns(this); SubtitleListview1.AutoSizeAllColumns(this);
subtitleListView2.AutoSizeAllColumns(this);
FixLargeFonts(); FixLargeFonts();
} }
@ -68,6 +73,7 @@ namespace Nikse.SubtitleEdit.Forms
public void Initialize(Subtitle subtitle, string subtitleFileName, string videoFileName, int audioTrackNumber) public void Initialize(Subtitle subtitle, string subtitleFileName, string videoFileName, int audioTrackNumber)
{ {
labelSubtitleFileName.Text = subtitleFileName;
_subtitle = new Subtitle(subtitle); _subtitle = new Subtitle(subtitle);
_originalSubtitle = subtitle; _originalSubtitle = subtitle;
_subtitleFileName = subtitleFileName; _subtitleFileName = subtitleFileName;
@ -76,6 +82,51 @@ namespace Nikse.SubtitleEdit.Forms
SubtitleListview1.Fill(subtitle); SubtitleListview1.Fill(subtitle);
if (SubtitleListview1.Items.Count > 0) if (SubtitleListview1.Items.Count > 0)
SubtitleListview1.Items[0].Selected = true; SubtitleListview1.Items[0].Selected = true;
SubtitleListview1.Anchor = AnchorStyles.Left;
buttonSetSyncPoint.Anchor = AnchorStyles.Left;
buttonRemoveSyncPoint.Anchor = AnchorStyles.Left;
labelNoOfSyncPoints.Anchor = AnchorStyles.Left;
listBoxSyncPoints.Anchor = AnchorStyles.Left;
groupBoxImportResult.Anchor = AnchorStyles.Left;
labelOtherSubtitleFileName.Visible = false;
subtitleListView2.Visible = false;
groupBoxImportResult.Width = listBoxSyncPoints.Left + listBoxSyncPoints.Width + 20;
Width = groupBoxImportResult.Left + groupBoxImportResult.Width + 15;
SubtitleListview1.Anchor = AnchorStyles.Left | AnchorStyles.Bottom | AnchorStyles.Top | AnchorStyles.Right;
buttonSetSyncPoint.Anchor = AnchorStyles.Right;
buttonRemoveSyncPoint.Anchor = AnchorStyles.Right;
labelNoOfSyncPoints.Anchor = AnchorStyles.Right;
listBoxSyncPoints.Anchor = AnchorStyles.Right;
groupBoxImportResult.Anchor = AnchorStyles.Left | AnchorStyles.Bottom | AnchorStyles.Top | AnchorStyles.Right;
}
public void Initialize(Subtitle subtitle, string subtitleFileName, string videoFileName, int audioTrackNumber, string OtherSubtitleFileName, Subtitle otherSubtitle)
{
labelSubtitleFileName.Text = subtitleFileName;
_subtitle = new Subtitle(subtitle);
_otherSubtitle = otherSubtitle;
_originalSubtitle = subtitle;
_subtitleFileName = subtitleFileName;
_videoFileName = videoFileName;
_audioTrackNumber = audioTrackNumber;
SubtitleListview1.Fill(subtitle);
if (SubtitleListview1.Items.Count > 0)
SubtitleListview1.Items[0].Selected = true;
labelOtherSubtitleFileName.Text = OtherSubtitleFileName;
subtitleListView2.Fill(otherSubtitle);
SubtitleListview1.Anchor = AnchorStyles.Left;
buttonSetSyncPoint.Anchor = AnchorStyles.Left;
buttonRemoveSyncPoint.Anchor = AnchorStyles.Left;
labelNoOfSyncPoints.Anchor = AnchorStyles.Left;
listBoxSyncPoints.Anchor = AnchorStyles.Left;
groupBoxImportResult.Anchor = AnchorStyles.Left;
labelOtherSubtitleFileName.Visible = true;
subtitleListView2.Visible = true;
groupBoxImportResult.Width = subtitleListView2.Left + subtitleListView2.Width + 20;
Width = groupBoxImportResult.Left + groupBoxImportResult.Width + 15;
FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
} }
private void RefreshSyncronizationPointsUI() private void RefreshSyncronizationPointsUI()
@ -110,21 +161,43 @@ namespace Nikse.SubtitleEdit.Forms
private void buttonSetSyncPoint_Click(object sender, EventArgs e) private void buttonSetSyncPoint_Click(object sender, EventArgs e)
{ {
if (SubtitleListview1.SelectedItems.Count == 1 && _subtitle != null) if (subtitleListView2.Visible)
{ {
SetSyncPoint getTime = new SetSyncPoint(); SetSyncPointViaOthersubtitle();
int index = SubtitleListview1.SelectedItems[0].Index; }
getTime.Initialize(_subtitle, _subtitleFileName, index, _videoFileName, _audioTrackNumber); else
if (getTime.ShowDialog() == System.Windows.Forms.DialogResult.OK) {
if (SubtitleListview1.SelectedItems.Count == 1 && _subtitle != null)
{ {
if (_syncronizationPoints.ContainsKey(index)) SetSyncPoint getTime = new SetSyncPoint();
_syncronizationPoints[index] = getTime.SyncronizationPoint; int index = SubtitleListview1.SelectedItems[0].Index;
else getTime.Initialize(_subtitle, _subtitleFileName, index, _videoFileName, _audioTrackNumber);
_syncronizationPoints.Add(index, getTime.SyncronizationPoint); if (getTime.ShowDialog() == System.Windows.Forms.DialogResult.OK)
RefreshSyncronizationPointsUI(); {
if (_syncronizationPoints.ContainsKey(index))
_syncronizationPoints[index] = getTime.SyncronizationPoint;
else
_syncronizationPoints.Add(index, getTime.SyncronizationPoint);
RefreshSyncronizationPointsUI();
_videoFileName = getTime.VideoFileName;
}
_videoFileName = getTime.VideoFileName; _videoFileName = getTime.VideoFileName;
} }
_videoFileName = getTime.VideoFileName; }
}
private void SetSyncPointViaOthersubtitle()
{
if (_otherSubtitle != null && subtitleListView2.SelectedItems.Count == 1)
{
int index = SubtitleListview1.SelectedItems[0].Index;
int indexOther = subtitleListView2.SelectedItems[0].Index;
if (_syncronizationPoints.ContainsKey(index))
_syncronizationPoints[index] = TimeSpan.FromMilliseconds(_otherSubtitle.Paragraphs[indexOther].StartTime.TotalMilliseconds);
else
_syncronizationPoints.Add(index, TimeSpan.FromMilliseconds(_otherSubtitle.Paragraphs[indexOther].StartTime.TotalMilliseconds));
RefreshSyncronizationPointsUI();
} }
} }

View File

@ -706,6 +706,7 @@ namespace Nikse.SubtitleEdit.Logic
UnableToStartWord = "Unable to start Microsoft Word", UnableToStartWord = "Unable to start Microsoft Word",
SpellCheckAbortedXCorrections = "Spell check aborted. {0} lines was modified.", SpellCheckAbortedXCorrections = "Spell check aborted. {0} lines was modified.",
SpellCheckCompletedXCorrections = "Spell check completed. {0} lines was modified.", SpellCheckCompletedXCorrections = "Spell check completed. {0} lines was modified.",
OpenOtherSubtitle = "Open other subtitle",
Menu = new LanguageStructure.Main.MainMenu Menu = new LanguageStructure.Main.MainMenu
{ {
@ -792,6 +793,7 @@ namespace Nikse.SubtitleEdit.Logic
AdjustAllTimes = "Adjust all times (show earlier/later)...", AdjustAllTimes = "Adjust all times (show earlier/later)...",
VisualSync = "&Visual sync...", VisualSync = "&Visual sync...",
PointSync = "Point sync...", PointSync = "Point sync...",
PointSyncViaOtherSubtitle = "Point sync via other subtitle...",
}, },
AutoTranslate = new LanguageStructure.Main.MainMenu.AutoTranslateMenu AutoTranslate = new LanguageStructure.Main.MainMenu.AutoTranslateMenu

View File

@ -634,6 +634,7 @@
public string UnableToStartWord { get; set; } public string UnableToStartWord { get; set; }
public string SpellCheckAbortedXCorrections { get; set; } public string SpellCheckAbortedXCorrections { get; set; }
public string SpellCheckCompletedXCorrections { get; set; } public string SpellCheckCompletedXCorrections { get; set; }
public string OpenOtherSubtitle { get; set; }
public class MainMenu public class MainMenu
{ {
@ -715,6 +716,7 @@
public string AdjustAllTimes { get; set; } public string AdjustAllTimes { get; set; }
public string VisualSync { get; set; } public string VisualSync { get; set; }
public string PointSync { get; set; } public string PointSync { get; set; }
public string PointSyncViaOtherSubtitle { get; set; }
} }
public class AutoTranslateMenu public class AutoTranslateMenu
{ {