From bf3eb6557d93ad2b37f71a1bef7e0168cc825414 Mon Sep 17 00:00:00 2001 From: niksedk Date: Sat, 19 Mar 2011 17:59:37 +0000 Subject: [PATCH] fixed issue 16 - microdvd show earlier/later - http://code.google.com/p/subtitleedit/issues/detail?id=16 git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@365 99eadd0c-20b8-1223-b5c4-2a2b2df33de2 --- src/Forms/Main.Designer.cs | 100 ++++++++++++++++++------------------- src/Forms/Main.cs | 2 +- src/Forms/Main.resx | 2 +- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/Forms/Main.Designer.cs b/src/Forms/Main.Designer.cs index af5f58250..bb4761d25 100644 --- a/src/Forms/Main.Designer.cs +++ b/src/Forms/Main.Designer.cs @@ -1041,8 +1041,8 @@ // fixToolStripMenuItem // this.fixToolStripMenuItem.Name = "fixToolStripMenuItem"; - this.fixToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.F))); + this.fixToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.F))); this.fixToolStripMenuItem.Size = new System.Drawing.Size(343, 22); this.fixToolStripMenuItem.Text = "Fix common errors..."; this.fixToolStripMenuItem.Click += new System.EventHandler(this.FixToolStripMenuItemClick); @@ -1050,8 +1050,8 @@ // startNumberingFromToolStripMenuItem // this.startNumberingFromToolStripMenuItem.Name = "startNumberingFromToolStripMenuItem"; - this.startNumberingFromToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.N))); + this.startNumberingFromToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.N))); this.startNumberingFromToolStripMenuItem.Size = new System.Drawing.Size(343, 22); this.startNumberingFromToolStripMenuItem.Text = "Start numbering from..."; this.startNumberingFromToolStripMenuItem.Click += new System.EventHandler(this.StartNumberingFromToolStripMenuItemClick); @@ -1059,8 +1059,8 @@ // removeTextForHearImparedToolStripMenuItem // this.removeTextForHearImparedToolStripMenuItem.Name = "removeTextForHearImparedToolStripMenuItem"; - this.removeTextForHearImparedToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.H))); + this.removeTextForHearImparedToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.H))); this.removeTextForHearImparedToolStripMenuItem.Size = new System.Drawing.Size(343, 22); this.removeTextForHearImparedToolStripMenuItem.Text = "Remove text for hearing impaired..."; this.removeTextForHearImparedToolStripMenuItem.Click += new System.EventHandler(this.RemoveTextForHearImparedToolStripMenuItemClick); @@ -1068,8 +1068,8 @@ // ChangeCasingToolStripMenuItem // this.ChangeCasingToolStripMenuItem.Name = "ChangeCasingToolStripMenuItem"; - this.ChangeCasingToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.C))); + this.ChangeCasingToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.C))); this.ChangeCasingToolStripMenuItem.Size = new System.Drawing.Size(343, 22); this.ChangeCasingToolStripMenuItem.Text = "Change casing..."; this.ChangeCasingToolStripMenuItem.Click += new System.EventHandler(this.ChangeCasingToolStripMenuItem_Click); @@ -1277,8 +1277,8 @@ // spellCheckToolStripMenuItem // this.spellCheckToolStripMenuItem.Name = "spellCheckToolStripMenuItem"; - this.spellCheckToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.S))); + this.spellCheckToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.S))); this.spellCheckToolStripMenuItem.Size = new System.Drawing.Size(296, 22); this.spellCheckToolStripMenuItem.Text = "Spell check..."; this.spellCheckToolStripMenuItem.Click += new System.EventHandler(this.SpellCheckToolStripMenuItemClick); @@ -1286,8 +1286,8 @@ // findDoubleWordsToolStripMenuItem // this.findDoubleWordsToolStripMenuItem.Name = "findDoubleWordsToolStripMenuItem"; - this.findDoubleWordsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.D))); + this.findDoubleWordsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.D))); this.findDoubleWordsToolStripMenuItem.Size = new System.Drawing.Size(296, 22); this.findDoubleWordsToolStripMenuItem.Text = "Find double words"; this.findDoubleWordsToolStripMenuItem.Click += new System.EventHandler(this.FindDoubleWordsToolStripMenuItemClick); @@ -1307,8 +1307,8 @@ // addWordToNamesetcListToolStripMenuItem // this.addWordToNamesetcListToolStripMenuItem.Name = "addWordToNamesetcListToolStripMenuItem"; - this.addWordToNamesetcListToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.L))); + this.addWordToNamesetcListToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.L))); this.addWordToNamesetcListToolStripMenuItem.Size = new System.Drawing.Size(296, 22); this.addWordToNamesetcListToolStripMenuItem.Text = "Add word to names/ect list"; this.addWordToNamesetcListToolStripMenuItem.Click += new System.EventHandler(this.AddWordToNamesetcListToolStripMenuItemClick); @@ -1327,8 +1327,8 @@ // toolStripMenuItemAdjustAllTimes // this.toolStripMenuItemAdjustAllTimes.Name = "toolStripMenuItemAdjustAllTimes"; - this.toolStripMenuItemAdjustAllTimes.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.A))); + this.toolStripMenuItemAdjustAllTimes.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.A))); this.toolStripMenuItemAdjustAllTimes.Size = new System.Drawing.Size(336, 22); this.toolStripMenuItemAdjustAllTimes.Text = "Adjust times (show earlier/later)..."; this.toolStripMenuItemAdjustAllTimes.Click += new System.EventHandler(this.toolStripMenuItemAdjustAllTimes_Click); @@ -1336,8 +1336,8 @@ // visualSyncToolStripMenuItem // this.visualSyncToolStripMenuItem.Name = "visualSyncToolStripMenuItem"; - this.visualSyncToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.V))); + this.visualSyncToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.V))); this.visualSyncToolStripMenuItem.Size = new System.Drawing.Size(336, 22); this.visualSyncToolStripMenuItem.Text = "Visual sync..."; this.visualSyncToolStripMenuItem.Click += new System.EventHandler(this.VisualSyncToolStripMenuItemClick); @@ -1345,8 +1345,8 @@ // toolStripMenuItemPointSync // this.toolStripMenuItemPointSync.Name = "toolStripMenuItemPointSync"; - this.toolStripMenuItemPointSync.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.P))); + this.toolStripMenuItemPointSync.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.P))); this.toolStripMenuItemPointSync.Size = new System.Drawing.Size(336, 22); this.toolStripMenuItemPointSync.Text = "Point sync..."; this.toolStripMenuItemPointSync.Click += new System.EventHandler(this.toolStripMenuItemPointSync_Click); @@ -1371,8 +1371,8 @@ // translateByGoogleToolStripMenuItem // this.translateByGoogleToolStripMenuItem.Name = "translateByGoogleToolStripMenuItem"; - this.translateByGoogleToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.G))); + this.translateByGoogleToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.G))); this.translateByGoogleToolStripMenuItem.Size = new System.Drawing.Size(414, 22); this.translateByGoogleToolStripMenuItem.Text = "Translate (powered by Google)..."; this.translateByGoogleToolStripMenuItem.Click += new System.EventHandler(this.TranslateByGoogleToolStripMenuItemClick); @@ -1676,8 +1676,8 @@ // toolStripMenuItemMergeLines // this.toolStripMenuItemMergeLines.Name = "toolStripMenuItemMergeLines"; - this.toolStripMenuItemMergeLines.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.M))); + this.toolStripMenuItemMergeLines.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.M))); this.toolStripMenuItemMergeLines.Size = new System.Drawing.Size(275, 22); this.toolStripMenuItemMergeLines.Text = "Merge selected lines"; this.toolStripMenuItemMergeLines.Click += new System.EventHandler(this.ToolStripMenuItemMergeLinesClick); @@ -1884,8 +1884,8 @@ // // trackBarWaveFormPosition // - this.trackBarWaveFormPosition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.trackBarWaveFormPosition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.trackBarWaveFormPosition.AutoSize = false; this.trackBarWaveFormPosition.Location = new System.Drawing.Point(674, 267); this.trackBarWaveFormPosition.Maximum = 1000; @@ -2037,9 +2037,9 @@ // 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.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; @@ -2907,9 +2907,9 @@ // // tabControlSubtitle // - this.tabControlSubtitle.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.tabControlSubtitle.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.tabControlSubtitle.Controls.Add(this.tabPage1); this.tabControlSubtitle.Controls.Add(this.tabPage2); this.tabControlSubtitle.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -2934,8 +2934,8 @@ // // groupBoxEdit // - this.groupBoxEdit.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.groupBoxEdit.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.groupBoxEdit.Controls.Add(this.buttonSplitLine); this.groupBoxEdit.Controls.Add(this.labelAlternateCharactersPerSecond); this.groupBoxEdit.Controls.Add(this.labelTextAlternateLineTotal); @@ -3039,8 +3039,8 @@ // // textBoxListViewTextAlternate // - this.textBoxListViewTextAlternate.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + 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; @@ -3209,8 +3209,8 @@ // // textBoxListViewText // - this.textBoxListViewText.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + 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; @@ -3246,9 +3246,9 @@ // 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.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))); @@ -3282,9 +3282,9 @@ // textBoxSource // this.textBoxSource.AllowDrop = true; - this.textBoxSource.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.textBoxSource.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.textBoxSource.HideSelection = false; this.textBoxSource.Location = new System.Drawing.Point(1, 3); this.textBoxSource.MaxLength = 327670; @@ -3303,9 +3303,9 @@ // // panelVideoPlayer // - this.panelVideoPlayer.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.panelVideoPlayer.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.panelVideoPlayer.Controls.Add(this.mediaPlayer); this.panelVideoPlayer.Location = new System.Drawing.Point(1, 1); this.panelVideoPlayer.Name = "panelVideoPlayer"; @@ -3315,9 +3315,9 @@ // 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.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); diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index 28f2bab86..1cf8eb6cf 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -7185,7 +7185,7 @@ namespace Nikse.SubtitleEdit.Forms _change = true; SubtitleListview1.EndUpdate(); if (_subtitle.WasLoadedWithFrameNumbers) - _subtitle.CalculateFrameNumbersFromTimeCodes(frameRate); + _subtitle.CalculateFrameNumbersFromTimeCodesNoCheck(frameRate); RefreshSelectedParagraph(); UpdateSourceView(); } diff --git a/src/Forms/Main.resx b/src/Forms/Main.resx index 262dcd0fc..a291e3b95 100644 --- a/src/Forms/Main.resx +++ b/src/Forms/Main.resx @@ -684,7 +684,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2 - CAAAAk1TRnQBSQFMAgEBAgEAAaABAwGgAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAagBAwGoAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA