diff --git a/src/Forms/Main.Designer.cs b/src/Forms/Main.Designer.cs index d2b6a7cdb..dd34613cc 100644 --- a/src/Forms/Main.Designer.cs +++ b/src/Forms/Main.Designer.cs @@ -221,6 +221,11 @@ this.toolStripButtonWaveFormPause = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonWaveFormPlay = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonLockCenter = new System.Windows.Forms.ToolStripButton(); + this.toolStripSplitButtonPlayRate = new System.Windows.Forms.ToolStripSplitButton(); + this.toolStripMenuItemPlayRateSlow = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItemPlayRateNormal = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItemPlayRateFast = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItemPlayRateVeryFast = new System.Windows.Forms.ToolStripMenuItem(); this.tabControlButtons = new System.Windows.Forms.TabControl(); this.tabPageTranslate = new System.Windows.Forms.TabPage(); this.labelTranslateTip = new System.Windows.Forms.Label(); @@ -324,10 +329,6 @@ this.panelVideoPlayer = new System.Windows.Forms.Panel(); this.contextMenuStripEmpty = new System.Windows.Forms.ContextMenuStrip(this.components); this.insertLineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSplitButtonPlayRate = new System.Windows.Forms.ToolStripSplitButton(); - this.toolStripMenuItemPlayRateNormal = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItemPlayRateFast = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItemPlayRateSlow = new System.Windows.Forms.ToolStripMenuItem(); this.imageListPlayRate = new System.Windows.Forms.ImageList(this.components); this.timeUpDownStartTime = new Nikse.SubtitleEdit.Controls.TimeUpDown(); this.SubtitleListview1 = new Nikse.SubtitleEdit.Controls.SubtitleListView(); @@ -335,7 +336,6 @@ this.AudioWaveForm = new Nikse.SubtitleEdit.Controls.WaveForm(); this.timeUpDownVideoPosition = new Nikse.SubtitleEdit.Controls.TimeUpDown(); this.timeUpDownVideoPositionAdjust = new Nikse.SubtitleEdit.Controls.TimeUpDown(); - this.toolStripMenuItemPlayRateVeryFast = new System.Windows.Forms.ToolStripMenuItem(); this.statusStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -1851,7 +1851,9 @@ this.groupBoxVideo.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBoxVideo.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.groupBoxVideo.Location = new System.Drawing.Point(0, 0); + this.groupBoxVideo.Margin = new System.Windows.Forms.Padding(0); this.groupBoxVideo.Name = "groupBoxVideo"; + this.groupBoxVideo.Padding = new System.Windows.Forms.Padding(0); this.groupBoxVideo.Size = new System.Drawing.Size(1244, 305); this.groupBoxVideo.TabIndex = 1; this.groupBoxVideo.TabStop = false; @@ -1859,7 +1861,7 @@ // checkBoxSyncListViewWithVideoWhilePlaying // this.checkBoxSyncListViewWithVideoWhilePlaying.AutoSize = true; - this.checkBoxSyncListViewWithVideoWhilePlaying.Location = new System.Drawing.Point(561, 11); + this.checkBoxSyncListViewWithVideoWhilePlaying.Location = new System.Drawing.Point(558, 11); this.checkBoxSyncListViewWithVideoWhilePlaying.Name = "checkBoxSyncListViewWithVideoWhilePlaying"; this.checkBoxSyncListViewWithVideoWhilePlaying.Size = new System.Drawing.Size(207, 17); this.checkBoxSyncListViewWithVideoWhilePlaying.TabIndex = 1; @@ -1869,7 +1871,7 @@ // labelVideoInfo // this.labelVideoInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.labelVideoInfo.Location = new System.Drawing.Point(869, 12); + this.labelVideoInfo.Location = new System.Drawing.Point(872, 12); this.labelVideoInfo.Name = "labelVideoInfo"; this.labelVideoInfo.Size = new System.Drawing.Size(369, 19); this.labelVideoInfo.TabIndex = 12; @@ -1881,10 +1883,10 @@ 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(687, 264); + this.trackBarWaveFormPosition.Location = new System.Drawing.Point(674, 267); this.trackBarWaveFormPosition.Maximum = 1000; this.trackBarWaveFormPosition.Name = "trackBarWaveFormPosition"; - this.trackBarWaveFormPosition.Size = new System.Drawing.Size(550, 20); + this.trackBarWaveFormPosition.Size = new System.Drawing.Size(566, 20); this.trackBarWaveFormPosition.TabIndex = 11; this.trackBarWaveFormPosition.TickStyle = System.Windows.Forms.TickStyle.None; this.trackBarWaveFormPosition.ValueChanged += new System.EventHandler(this.trackBarWaveFormPosition_ValueChanged); @@ -1893,9 +1895,9 @@ // this.panelWaveFormControls.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.panelWaveFormControls.Controls.Add(this.toolStripWaveControls); - this.panelWaveFormControls.Location = new System.Drawing.Point(477, 262); + this.panelWaveFormControls.Location = new System.Drawing.Point(474, 265); this.panelWaveFormControls.Name = "panelWaveFormControls"; - this.panelWaveFormControls.Size = new System.Drawing.Size(252, 30); + this.panelWaveFormControls.Size = new System.Drawing.Size(205, 30); this.panelWaveFormControls.TabIndex = 10; // // toolStripWaveControls @@ -1914,7 +1916,7 @@ this.toolStripSplitButtonPlayRate}); this.toolStripWaveControls.Location = new System.Drawing.Point(0, 3); this.toolStripWaveControls.Name = "toolStripWaveControls"; - this.toolStripWaveControls.Size = new System.Drawing.Size(235, 25); + this.toolStripWaveControls.Size = new System.Drawing.Size(197, 25); this.toolStripWaveControls.TabIndex = 0; this.toolStripWaveControls.Text = "toolStrip2"; // @@ -1983,6 +1985,50 @@ this.toolStripButtonLockCenter.Text = "Center"; this.toolStripButtonLockCenter.Click += new System.EventHandler(this.toolStripButtonLockCenter_Click); // + // toolStripSplitButtonPlayRate + // + this.toolStripSplitButtonPlayRate.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripSplitButtonPlayRate.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripMenuItemPlayRateSlow, + this.toolStripMenuItemPlayRateNormal, + this.toolStripMenuItemPlayRateFast, + this.toolStripMenuItemPlayRateVeryFast}); + this.toolStripSplitButtonPlayRate.Image = ((System.Drawing.Image)(resources.GetObject("toolStripSplitButtonPlayRate.Image"))); + this.toolStripSplitButtonPlayRate.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripSplitButtonPlayRate.Name = "toolStripSplitButtonPlayRate"; + this.toolStripSplitButtonPlayRate.Size = new System.Drawing.Size(32, 22); + this.toolStripSplitButtonPlayRate.Text = "Play rate (speed)"; + // + // toolStripMenuItemPlayRateSlow + // + this.toolStripMenuItemPlayRateSlow.Name = "toolStripMenuItemPlayRateSlow"; + this.toolStripMenuItemPlayRateSlow.Size = new System.Drawing.Size(148, 22); + this.toolStripMenuItemPlayRateSlow.Text = "Slow"; + this.toolStripMenuItemPlayRateSlow.Click += new System.EventHandler(this.toolStripMenuItemPlayRateSlow_Click); + // + // toolStripMenuItemPlayRateNormal + // + this.toolStripMenuItemPlayRateNormal.Checked = true; + this.toolStripMenuItemPlayRateNormal.CheckState = System.Windows.Forms.CheckState.Checked; + this.toolStripMenuItemPlayRateNormal.Name = "toolStripMenuItemPlayRateNormal"; + this.toolStripMenuItemPlayRateNormal.Size = new System.Drawing.Size(148, 22); + this.toolStripMenuItemPlayRateNormal.Text = "Normal speed"; + this.toolStripMenuItemPlayRateNormal.Click += new System.EventHandler(this.toolStripMenuItemPlayRateNormal_Click); + // + // toolStripMenuItemPlayRateFast + // + this.toolStripMenuItemPlayRateFast.Name = "toolStripMenuItemPlayRateFast"; + this.toolStripMenuItemPlayRateFast.Size = new System.Drawing.Size(148, 22); + this.toolStripMenuItemPlayRateFast.Text = "Fast "; + this.toolStripMenuItemPlayRateFast.Click += new System.EventHandler(this.toolStripMenuItemPlayRateFast_Click); + // + // toolStripMenuItemPlayRateVeryFast + // + this.toolStripMenuItemPlayRateVeryFast.Name = "toolStripMenuItemPlayRateVeryFast"; + this.toolStripMenuItemPlayRateVeryFast.Size = new System.Drawing.Size(148, 22); + this.toolStripMenuItemPlayRateVeryFast.Text = "Very fast"; + this.toolStripMenuItemPlayRateVeryFast.Click += new System.EventHandler(this.veryFastToolStripMenuItem_Click); + // // tabControlButtons // this.tabControlButtons.Controls.Add(this.tabPageTranslate); @@ -3177,42 +3223,6 @@ this.insertLineToolStripMenuItem.Text = "Insert line"; this.insertLineToolStripMenuItem.Click += new System.EventHandler(this.insertLineToolStripMenuItem_Click); // - // toolStripSplitButtonPlayRate - // - this.toolStripSplitButtonPlayRate.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripSplitButtonPlayRate.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripMenuItemPlayRateSlow, - this.toolStripMenuItemPlayRateNormal, - this.toolStripMenuItemPlayRateFast, - this.toolStripMenuItemPlayRateVeryFast}); - this.toolStripSplitButtonPlayRate.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripSplitButtonPlayRate.Name = "toolStripSplitButtonPlayRate"; - this.toolStripSplitButtonPlayRate.Size = new System.Drawing.Size(16, 22); - this.toolStripSplitButtonPlayRate.Text = "Play rate (speed)"; - // - // toolStripMenuItemPlayRateNormal - // - this.toolStripMenuItemPlayRateNormal.Checked = true; - this.toolStripMenuItemPlayRateNormal.CheckState = System.Windows.Forms.CheckState.Checked; - this.toolStripMenuItemPlayRateNormal.Name = "toolStripMenuItemPlayRateNormal"; - this.toolStripMenuItemPlayRateNormal.Size = new System.Drawing.Size(152, 22); - this.toolStripMenuItemPlayRateNormal.Text = "Normal speed"; - this.toolStripMenuItemPlayRateNormal.Click += new System.EventHandler(this.toolStripMenuItemPlayRateNormal_Click); - // - // toolStripMenuItemPlayRateFast - // - this.toolStripMenuItemPlayRateFast.Name = "toolStripMenuItemPlayRateFast"; - this.toolStripMenuItemPlayRateFast.Size = new System.Drawing.Size(152, 22); - this.toolStripMenuItemPlayRateFast.Text = "Fast "; - this.toolStripMenuItemPlayRateFast.Click += new System.EventHandler(this.toolStripMenuItemPlayRateFast_Click); - // - // toolStripMenuItemPlayRateSlow - // - this.toolStripMenuItemPlayRateSlow.Name = "toolStripMenuItemPlayRateSlow"; - this.toolStripMenuItemPlayRateSlow.Size = new System.Drawing.Size(152, 22); - this.toolStripMenuItemPlayRateSlow.Text = "Slow"; - this.toolStripMenuItemPlayRateSlow.Click += new System.EventHandler(this.toolStripMenuItemPlayRateSlow_Click); - // // imageListPlayRate // this.imageListPlayRate.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageListPlayRate.ImageStream"))); @@ -3286,12 +3296,12 @@ 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(475, 35); + 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(762, 223); + this.AudioWaveForm.Size = new System.Drawing.Size(768, 229); this.AudioWaveForm.StartPositionSeconds = 0D; this.AudioWaveForm.TabIndex = 6; this.AudioWaveForm.TextColor = System.Drawing.Color.Gray; @@ -3322,13 +3332,6 @@ this.timeUpDownVideoPositionAdjust.Size = new System.Drawing.Size(92, 25); this.timeUpDownVideoPositionAdjust.TabIndex = 13; // - // toolStripMenuItemPlayRateVeryFast - // - this.toolStripMenuItemPlayRateVeryFast.Name = "toolStripMenuItemPlayRateVeryFast"; - this.toolStripMenuItemPlayRateVeryFast.Size = new System.Drawing.Size(152, 22); - this.toolStripMenuItemPlayRateVeryFast.Text = "Very fast"; - this.toolStripMenuItemPlayRateVeryFast.Click += new System.EventHandler(this.veryFastToolStripMenuItem_Click); - // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index c992e1470..4f72ca6c5 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -1744,10 +1744,16 @@ namespace Nikse.SubtitleEdit.Forms private void ToolStripButtonSaveClick(object sender, EventArgs e) { ReloadFromSourceView(); + bool oldChange = _change; SaveSubtitle(GetCurrentSubtitleFormat()); - if (Configuration.Settings.General.AllowEditOfOriginalSubtitle && _subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0) + if (_changeAlternate && Configuration.Settings.General.AllowEditOfOriginalSubtitle && _subtitleAlternate != null && _subtitleAlternate.Paragraphs.Count > 0) + { saveOriginalToolStripMenuItem_Click(null, null); + if (oldChange && !_change && !_changeAlternate) + ShowStatus(string.Format(_language.SavedSubtitleX, Path.GetFileName(_fileName)) + " + " + + string.Format(_language.SavedOriginalSubtitleX, Path.GetFileName(_subtitleAlternateFileName))); + } } private void ToolStripButtonSaveAsClick(object sender, EventArgs e) @@ -3289,7 +3295,10 @@ namespace Nikse.SubtitleEdit.Forms alternateIndexes.Reverse(); foreach (int i in alternateIndexes) - _subtitleAlternate.Paragraphs.RemoveAt(i); + { + if (i <_subtitleAlternate.Paragraphs.Count) + _subtitleAlternate.Paragraphs.RemoveAt(i); + } } var indexes = new List(); diff --git a/src/Forms/Main.resx b/src/Forms/Main.resx index 879bc47ae..cbebf4be7 100644 --- a/src/Forms/Main.resx +++ b/src/Forms/Main.resx @@ -642,6 +642,17 @@ gUc0QLffVHHNpgOC79JUXxBnRsdjhyHyb+R0/oXbReDUwwyGZlX0T8q46SKAVQdUFFAHdMaYgURzzQHF KvcPZPeAk6YMHk/Xcc9XowCruNoC5IsMm+Q/Y7TgCi2LdHcOGHIF3d+J/g2YpxThv3es0gas7zD82Aa+ bxky4N55+nyy/urY/Q0x/33uagfAeKY9iQ4C8In6X/0Bb/or6jCtPhIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAExSURBVDhPY2AYdGDOlgn/l+2f4YHuMFziGB6YvKrzf8v0 + 6v8z1vekIEviEscwoGdh0/8dD5diGIJLnGHRnqn/Qc4D2QBS1DKj5v/upyv+TzveADZk6prOJqD4GXRx + uAtBmk9+3PL/yLt1//e/WvV/55Ml/7c9WPy/52DZ/4ZNuWBDNlyZj1V8+sbeZAaQzcfeb/y/9tHk/4tv + dP+fcbYRonlrzv+SVUn/UyaF/U8vS8ApzgBy9r6XK/+3bS7+X7sq63/JgqT/WdOjwJr9yp3/yyhJ/0/r + iMQqbuJoEsQA8puyttJ/HTPt/6YOxv9tPK3+J/QGwjXrW+k2mdgZn0EXN3Ey8cWaBusnVcA1IyvCJY5h + CEghyNkqeiooNuASx2qArrmuMboEyABs4oMuK5HuIAA9nQy9tlUooQAAAABJRU5ErkJggg== @@ -673,7 +684,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2 - CAAAAk1TRnQBSQFMAgEBAgEAARABAAEQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAWgBAAFoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/src/Resources/da-DK.xml b/src/Resources/da-DK.xml index 5ce877972..f948ca390 100644 --- a/src/Resources/da-DK.xml +++ b/src/Resources/da-DK.xml @@ -355,7 +355,7 @@ Import valgmuligheder Opdeling Auto split tekst - En linje er en undertitel + En linje er en undertekst Flet kort linjer med fortsættelsen Fjern tomme linjer Fjern linjer uden bogstaver @@ -523,7 +523,7 @@ Oversæt Opret Juster - Vælg aktuel undertekst, mens du spiller + Vælg aktuel undertekst, mens video spiller Auto gentag Automatisk gentag aktiv Gentag antal gange @@ -573,7 +573,7 @@ Gem ændringer til unavngivet original? Gem ændringer til den originale undertekst {0}? Gem undertekst som... - Gem original undertitel som... + Gem original undertekst som... Ingen undertekst indlæst Visuel synkroniser - valgte linjer Visual synkroniser @@ -1125,7 +1125,7 @@ Fortsæt? Navn på ny tegn database mappe - Klik for at tilføje audio kurve + Klik for at tilføje audio kurve sekunder Zoom ind Zoom ud diff --git a/src/Resources/da-DK.xml.zip b/src/Resources/da-DK.xml.zip index 1e209281c..3eeb1af9c 100644 Binary files a/src/Resources/da-DK.xml.zip and b/src/Resources/da-DK.xml.zip differ