From 365a32345433973f37228b1df73041dcbd3eab7c Mon Sep 17 00:00:00 2001 From: Nikolaj Olsson Date: Sun, 22 Mar 2020 10:20:50 +0100 Subject: [PATCH] Remove hardcoded shortcuts F9-F12 --- Changelog.txt | 5 ++ src/Forms/Main.Designer.cs | 158 +++++++------------------------------ src/Forms/Main.cs | 45 ++--------- src/Forms/Main.resx | 62 +++++++-------- 4 files changed, 68 insertions(+), 202 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 251b13829..6dbc002ff 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -18,6 +18,8 @@ * Do not change end time in split - thx OmrSi * Update Serbian spell check dictionary - thx arslan * Display version in VLC player name + * Add text edit box to remove text for HI - thx Raistlin + * Improve English OCR fixes slightly - thx tormento * FIXED: * Fix extraction from MKV via drag-n-drop - thx ryvec/Symos404/uckthis * Fix issues with CheetahCaption - thx Tom @@ -28,6 +30,9 @@ * Fix keeping settings in "OCR image pre-processing" * Fix "Remove text for HI" issues - thx Zezslav * Fix shortcut crash - thx MaOz63 + * Do not auto-detect video if video is already loaded on startup + * Fix "Join" append issues - thx Henrique + * Fix "Duplicate line" shortcut in translator mode - thx OmrSi 3.5.14 (8th March 2020) diff --git a/src/Forms/Main.Designer.cs b/src/Forms/Main.Designer.cs index 5f707bb98..16952ebf4 100644 --- a/src/Forms/Main.Designer.cs +++ b/src/Forms/Main.Designer.cs @@ -38,9 +38,9 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main)); - Nikse.SubtitleEdit.Core.TimeCode timeCode4 = new Nikse.SubtitleEdit.Core.TimeCode(); - Nikse.SubtitleEdit.Core.TimeCode timeCode5 = new Nikse.SubtitleEdit.Core.TimeCode(); - Nikse.SubtitleEdit.Core.TimeCode timeCode6 = new Nikse.SubtitleEdit.Core.TimeCode(); + Nikse.SubtitleEdit.Core.TimeCode timeCode13 = new Nikse.SubtitleEdit.Core.TimeCode(); + Nikse.SubtitleEdit.Core.TimeCode timeCode14 = new Nikse.SubtitleEdit.Core.TimeCode(); + Nikse.SubtitleEdit.Core.TimeCode timeCode15 = new Nikse.SubtitleEdit.Core.TimeCode(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.labelStatus = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripSelected = new System.Windows.Forms.ToolStripStatusLabel(); @@ -367,10 +367,6 @@ this.buttonSetEnd = new System.Windows.Forms.Button(); this.buttonInsertNewText = new System.Windows.Forms.Button(); this.buttonSetStartTime = new System.Windows.Forms.Button(); - this.labelCreateF12 = new System.Windows.Forms.Label(); - this.labelCreateF11 = new System.Windows.Forms.Label(); - this.labelCreateF10 = new System.Windows.Forms.Label(); - this.labelCreateF9 = new System.Windows.Forms.Label(); this.buttonForward2 = new System.Windows.Forms.Button(); this.numericUpDownSec2 = new System.Windows.Forms.NumericUpDown(); this.buttonSecBack2 = new System.Windows.Forms.Button(); @@ -384,10 +380,6 @@ this.buttonSetEndAndGoToNext = new System.Windows.Forms.Button(); this.buttonSetStartAndOffsetRest = new System.Windows.Forms.Button(); this.buttonAdjustSetStartTime = new System.Windows.Forms.Button(); - this.labelAdjustF12 = new System.Windows.Forms.Label(); - this.labelAdjustF11 = new System.Windows.Forms.Label(); - this.labelAdjustF10 = new System.Windows.Forms.Label(); - this.labelAdjustF9 = new System.Windows.Forms.Label(); this.buttonAdjustSecForward2 = new System.Windows.Forms.Button(); this.numericUpDownSecAdjust2 = new System.Windows.Forms.NumericUpDown(); this.buttonAdjustSecBack2 = new System.Windows.Forms.Button(); @@ -3366,10 +3358,6 @@ this.tabPageCreate.Controls.Add(this.buttonSetEnd); this.tabPageCreate.Controls.Add(this.buttonInsertNewText); this.tabPageCreate.Controls.Add(this.buttonSetStartTime); - this.tabPageCreate.Controls.Add(this.labelCreateF12); - this.tabPageCreate.Controls.Add(this.labelCreateF11); - this.tabPageCreate.Controls.Add(this.labelCreateF10); - this.tabPageCreate.Controls.Add(this.labelCreateF9); this.tabPageCreate.Controls.Add(this.buttonForward2); this.tabPageCreate.Controls.Add(this.numericUpDownSec2); this.tabPageCreate.Controls.Add(this.buttonSecBack2); @@ -3395,14 +3383,14 @@ this.timeUpDownVideoPosition.Name = "timeUpDownVideoPosition"; this.timeUpDownVideoPosition.Size = new System.Drawing.Size(111, 27); this.timeUpDownVideoPosition.TabIndex = 12; - timeCode4.Hours = 0; - timeCode4.Milliseconds = 0; - timeCode4.Minutes = 0; - timeCode4.Seconds = 0; - timeCode4.TimeSpan = System.TimeSpan.Parse("00:00:00"); - timeCode4.TotalMilliseconds = 0D; - timeCode4.TotalSeconds = 0D; - this.timeUpDownVideoPosition.TimeCode = timeCode4; + timeCode13.Hours = 0; + timeCode13.Milliseconds = 0; + timeCode13.Minutes = 0; + timeCode13.Seconds = 0; + timeCode13.TimeSpan = System.TimeSpan.Parse("00:00:00"); + timeCode13.TotalMilliseconds = 0D; + timeCode13.TotalSeconds = 0D; + this.timeUpDownVideoPosition.TimeCode = timeCode13; this.timeUpDownVideoPosition.UseVideoOffset = false; // // buttonGotoSub @@ -3455,46 +3443,6 @@ this.buttonSetStartTime.UseVisualStyleBackColor = true; this.buttonSetStartTime.Click += new System.EventHandler(this.buttonSetStartTime_Click); // - // labelCreateF12 - // - this.labelCreateF12.AutoSize = true; - this.labelCreateF12.ForeColor = System.Drawing.Color.Gray; - this.labelCreateF12.Location = new System.Drawing.Point(188, 114); - this.labelCreateF12.Name = "labelCreateF12"; - this.labelCreateF12.Size = new System.Drawing.Size(25, 13); - this.labelCreateF12.TabIndex = 65; - this.labelCreateF12.Text = "F12"; - // - // labelCreateF11 - // - this.labelCreateF11.AutoSize = true; - this.labelCreateF11.ForeColor = System.Drawing.Color.Gray; - this.labelCreateF11.Location = new System.Drawing.Point(188, 88); - this.labelCreateF11.Name = "labelCreateF11"; - this.labelCreateF11.Size = new System.Drawing.Size(25, 13); - this.labelCreateF11.TabIndex = 64; - this.labelCreateF11.Text = "F11"; - // - // labelCreateF10 - // - this.labelCreateF10.AutoSize = true; - this.labelCreateF10.ForeColor = System.Drawing.Color.Gray; - this.labelCreateF10.Location = new System.Drawing.Point(188, 36); - this.labelCreateF10.Name = "labelCreateF10"; - this.labelCreateF10.Size = new System.Drawing.Size(25, 13); - this.labelCreateF10.TabIndex = 63; - this.labelCreateF10.Text = "F10"; - // - // labelCreateF9 - // - this.labelCreateF9.AutoSize = true; - this.labelCreateF9.ForeColor = System.Drawing.Color.Gray; - this.labelCreateF9.Location = new System.Drawing.Point(188, 10); - this.labelCreateF9.Name = "labelCreateF9"; - this.labelCreateF9.Size = new System.Drawing.Size(19, 13); - this.labelCreateF9.TabIndex = 62; - this.labelCreateF9.Text = "F9"; - // // buttonForward2 // this.buttonForward2.Location = new System.Drawing.Point(130, 163); @@ -3600,10 +3548,6 @@ this.tabPageAdjust.Controls.Add(this.buttonSetEndAndGoToNext); this.tabPageAdjust.Controls.Add(this.buttonSetStartAndOffsetRest); this.tabPageAdjust.Controls.Add(this.buttonAdjustSetStartTime); - this.tabPageAdjust.Controls.Add(this.labelAdjustF12); - this.tabPageAdjust.Controls.Add(this.labelAdjustF11); - this.tabPageAdjust.Controls.Add(this.labelAdjustF10); - this.tabPageAdjust.Controls.Add(this.labelAdjustF9); this.tabPageAdjust.Controls.Add(this.buttonAdjustSecForward2); this.tabPageAdjust.Controls.Add(this.numericUpDownSecAdjust2); this.tabPageAdjust.Controls.Add(this.buttonAdjustSecBack2); @@ -3630,14 +3574,14 @@ this.timeUpDownVideoPositionAdjust.Name = "timeUpDownVideoPositionAdjust"; this.timeUpDownVideoPositionAdjust.Size = new System.Drawing.Size(111, 27); this.timeUpDownVideoPositionAdjust.TabIndex = 13; - timeCode5.Hours = 0; - timeCode5.Milliseconds = 0; - timeCode5.Minutes = 0; - timeCode5.Seconds = 0; - timeCode5.TimeSpan = System.TimeSpan.Parse("00:00:00"); - timeCode5.TotalMilliseconds = 0D; - timeCode5.TotalSeconds = 0D; - this.timeUpDownVideoPositionAdjust.TimeCode = timeCode5; + timeCode14.Hours = 0; + timeCode14.Milliseconds = 0; + timeCode14.Minutes = 0; + timeCode14.Seconds = 0; + timeCode14.TimeSpan = System.TimeSpan.Parse("00:00:00"); + timeCode14.TotalMilliseconds = 0D; + timeCode14.TotalSeconds = 0D; + this.timeUpDownVideoPositionAdjust.TimeCode = timeCode14; this.timeUpDownVideoPositionAdjust.UseVideoOffset = false; // // buttonAdjustSetEndTime @@ -3680,46 +3624,6 @@ this.buttonAdjustSetStartTime.UseVisualStyleBackColor = true; this.buttonAdjustSetStartTime.Click += new System.EventHandler(this.buttonSetStartTime_Click); // - // labelAdjustF12 - // - this.labelAdjustF12.AutoSize = true; - this.labelAdjustF12.ForeColor = System.Drawing.Color.Gray; - this.labelAdjustF12.Location = new System.Drawing.Point(188, 88); - this.labelAdjustF12.Name = "labelAdjustF12"; - this.labelAdjustF12.Size = new System.Drawing.Size(25, 13); - this.labelAdjustF12.TabIndex = 64; - this.labelAdjustF12.Text = "F12"; - // - // labelAdjustF11 - // - this.labelAdjustF11.AutoSize = true; - this.labelAdjustF11.ForeColor = System.Drawing.Color.Gray; - this.labelAdjustF11.Location = new System.Drawing.Point(188, 62); - this.labelAdjustF11.Name = "labelAdjustF11"; - this.labelAdjustF11.Size = new System.Drawing.Size(25, 13); - this.labelAdjustF11.TabIndex = 63; - this.labelAdjustF11.Text = "F11"; - // - // labelAdjustF10 - // - this.labelAdjustF10.AutoSize = true; - this.labelAdjustF10.ForeColor = System.Drawing.Color.Gray; - this.labelAdjustF10.Location = new System.Drawing.Point(188, 36); - this.labelAdjustF10.Name = "labelAdjustF10"; - this.labelAdjustF10.Size = new System.Drawing.Size(25, 13); - this.labelAdjustF10.TabIndex = 62; - this.labelAdjustF10.Text = "F10"; - // - // labelAdjustF9 - // - this.labelAdjustF9.AutoSize = true; - this.labelAdjustF9.ForeColor = System.Drawing.Color.Gray; - this.labelAdjustF9.Location = new System.Drawing.Point(188, 10); - this.labelAdjustF9.Name = "labelAdjustF9"; - this.labelAdjustF9.Size = new System.Drawing.Size(19, 13); - this.labelAdjustF9.TabIndex = 61; - this.labelAdjustF9.Text = "F9"; - // // buttonAdjustSecForward2 // this.buttonAdjustSecForward2.Location = new System.Drawing.Point(130, 188); @@ -4732,14 +4636,14 @@ this.timeUpDownStartTime.Name = "timeUpDownStartTime"; this.timeUpDownStartTime.Size = new System.Drawing.Size(111, 27); this.timeUpDownStartTime.TabIndex = 0; - timeCode6.Hours = 0; - timeCode6.Milliseconds = 0; - timeCode6.Minutes = 0; - timeCode6.Seconds = 0; - timeCode6.TimeSpan = System.TimeSpan.Parse("00:00:00"); - timeCode6.TotalMilliseconds = 0D; - timeCode6.TotalSeconds = 0D; - this.timeUpDownStartTime.TimeCode = timeCode6; + timeCode15.Hours = 0; + timeCode15.Milliseconds = 0; + timeCode15.Minutes = 0; + timeCode15.Seconds = 0; + timeCode15.TimeSpan = System.TimeSpan.Parse("00:00:00"); + timeCode15.TotalMilliseconds = 0D; + timeCode15.TotalSeconds = 0D; + this.timeUpDownStartTime.TimeCode = timeCode15; this.timeUpDownStartTime.UseVideoOffset = false; // // numericUpDownDuration @@ -5231,14 +5135,6 @@ private System.Windows.Forms.NumericUpDown numericUpDownSecAdjust2; private System.Windows.Forms.Button buttonAdjustSecBack2; private System.Windows.Forms.CheckBox checkBoxSyncListViewWithVideoWhilePlaying; - private System.Windows.Forms.Label labelAdjustF10; - private System.Windows.Forms.Label labelAdjustF9; - private System.Windows.Forms.Label labelAdjustF11; - private System.Windows.Forms.Label labelAdjustF12; - private System.Windows.Forms.Label labelCreateF12; - private System.Windows.Forms.Label labelCreateF11; - private System.Windows.Forms.Label labelCreateF10; - private System.Windows.Forms.Label labelCreateF9; private System.Windows.Forms.ToolStripMenuItem translatepoweredByMicrosoftToolStripMenuItem; private System.Windows.Forms.ToolStripButton toolStripButtonToggleWaveform; private Controls.VideoPlayerContainer mediaPlayer; diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index 06a23f7ea..fa572ed99 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -14384,11 +14384,6 @@ namespace Nikse.SubtitleEdit.Forms //TABS: Create / adjust / translate // create - else if (tabControlButtons.SelectedTab == tabPageCreate && e.Modifiers == Keys.Control && e.KeyCode == Keys.F9) - { - InsertNewTextAtVideoPosition(); - e.SuppressKeyPress = true; - } else if (_shortcuts.MainCreateInsertSubAtVideoPos == e.KeyData) { var p = InsertNewTextAtVideoPosition(); @@ -14403,22 +14398,12 @@ namespace Nikse.SubtitleEdit.Forms ButtonSetEndClick(null, null); e.SuppressKeyPress = true; } - else if (tabControlButtons.SelectedTab == tabPageCreate && e.Modifiers == Keys.None && e.KeyCode == Keys.F9) - { - ButtonInsertNewTextClick(null, null); - e.SuppressKeyPress = true; - } - else if (tabControlButtons.SelectedTab == tabPageCreate && e.Modifiers == Keys.None && e.KeyCode == Keys.F10) - { - buttonBeforeText_Click(null, null); - e.SuppressKeyPress = true; - } - else if (e.Modifiers == Keys.None && e.KeyCode == Keys.F11 || _shortcuts.MainCreateSetStart == e.KeyData) + else if (_shortcuts.MainCreateSetStart == e.KeyData) { buttonSetStartTime_Click(null, null); e.SuppressKeyPress = true; } - else if (e.Modifiers == Keys.None && e.KeyCode == Keys.F12 || _shortcuts.MainCreateSetEnd == e.KeyData) + else if (_shortcuts.MainCreateSetEnd == e.KeyData) { StopAutoDuration(); ButtonSetEndClick(null, null); @@ -14530,17 +14515,6 @@ namespace Nikse.SubtitleEdit.Forms ButtonSetEndAndGoToNextClick(null, null); e.SuppressKeyPress = true; } - else if (mediaPlayer.VideoPlayer != null && tabControlButtons.SelectedTab == tabPageAdjust && e.Modifiers == Keys.None && e.KeyCode == Keys.F9) - { - ButtonSetStartAndOffsetRestClick(null, null); - e.SuppressKeyPress = true; - } - else if (mediaPlayer.VideoPlayer != null && tabControlButtons.SelectedTab == tabPageAdjust && e.Modifiers == Keys.None && e.KeyCode == Keys.F10) - { - ShowNextSubtitleLabel(); - ButtonSetEndAndGoToNextClick(null, null); - e.SuppressKeyPress = true; - } else if (mediaPlayer.VideoPlayer != null && _shortcuts.MainAdjustSetStartKeepDuration == e.KeyData) { SetStartTime(true); @@ -17774,7 +17748,7 @@ namespace Nikse.SubtitleEdit.Forms var textSize = graphics.MeasureString(buttonPlayPrevious.Text, Font); if (textSize.Height > buttonPlayPrevious.Height - 4) { - int newButtonHeight = 22; + int newButtonHeight = 23; UiUtil.SetButtonHeight(this, newButtonHeight, -4); // List view @@ -17796,11 +17770,6 @@ namespace Nikse.SubtitleEdit.Forms buttonGotoSub.Width = buttonWidth; buttonSetStartTime.Width = buttonWidth; buttonSetEnd.Width = buttonWidth; - int FKeyLeft = buttonInsertNewText.Left + buttonInsertNewText.Width; - labelCreateF9.Left = FKeyLeft; - labelCreateF10.Left = FKeyLeft; - labelCreateF11.Left = FKeyLeft; - labelCreateF12.Left = FKeyLeft; buttonForward1.Left = buttonInsertNewText.Left + buttonInsertNewText.Width - buttonForward1.Width; numericUpDownSec1.Width = buttonInsertNewText.Width - (numericUpDownSec1.Left + buttonForward1.Width); buttonForward2.Left = buttonInsertNewText.Left + buttonInsertNewText.Width - buttonForward2.Width; @@ -17814,10 +17783,6 @@ namespace Nikse.SubtitleEdit.Forms buttonAdjustSetEndTime.Width = buttonWidth; buttonAdjustPlayBefore.Width = buttonWidth; buttonAdjustGoToPosAndPause.Width = buttonWidth; - labelAdjustF9.Left = FKeyLeft; - labelAdjustF10.Left = FKeyLeft; - labelAdjustF11.Left = FKeyLeft; - labelAdjustF12.Left = FKeyLeft; buttonAdjustSecForward1.Left = buttonInsertNewText.Left + buttonInsertNewText.Width - buttonAdjustSecForward1.Width; numericUpDownSecAdjust1.Width = buttonInsertNewText.Width - (numericUpDownSecAdjust2.Left + buttonAdjustSecForward1.Width); buttonAdjustSecForward2.Left = buttonInsertNewText.Left + buttonInsertNewText.Width - buttonAdjustSecForward2.Width; @@ -18943,12 +18908,12 @@ namespace Nikse.SubtitleEdit.Forms } else if (tabControlButtons.SelectedIndex == 1) { - tabControlButtons.Width = buttonInsertNewText.Left + buttonInsertNewText.Width + 35; + tabControlButtons.Width = buttonInsertNewText.Left + buttonInsertNewText.Width + 25; Configuration.Settings.VideoControls.LastActiveTab = "Create"; } else if (tabControlButtons.SelectedIndex == 2) { - tabControlButtons.Width = buttonInsertNewText.Left + buttonInsertNewText.Width + 35; + tabControlButtons.Width = buttonInsertNewText.Left + buttonInsertNewText.Width + 25; Configuration.Settings.VideoControls.LastActiveTab = "Adjust"; } diff --git a/src/Forms/Main.resx b/src/Forms/Main.resx index 01b07e4e6..1a5ba30bf 100644 --- a/src/Forms/Main.resx +++ b/src/Forms/Main.resx @@ -338,36 +338,36 @@ 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 @@ -708,7 +708,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2 - CAAAAk1TRnQBSQFMAgEBAgEAAfABJgHwASYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAfgBJgH4ASYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA