From 5a91c5db141f842dece1e0250d83591db48425b7 Mon Sep 17 00:00:00 2001 From: niksedk Date: Tue, 14 Mar 2023 12:22:38 +0100 Subject: [PATCH] Fix for last commit --- LanguageBaseEnglish.xml | 2 + src/ui/Forms/Options/Settings.Designer.cs | 70 +++++++++++------------ src/ui/Logic/LanguageDeserializer.cs | 6 ++ 3 files changed, 42 insertions(+), 36 deletions(-) diff --git a/LanguageBaseEnglish.xml b/LanguageBaseEnglish.xml index cd15546e1..870b23497 100644 --- a/LanguageBaseEnglish.xml +++ b/LanguageBaseEnglish.xml @@ -2465,6 +2465,7 @@ can edit in same subtitle file (collaboration) Toggle dialog dashes Toggle quotes Toggle HI tags + Toggle custom tags Toggle music symbols Alignment (selected lines) Alignment bottom left - {\an1} @@ -2650,6 +2651,7 @@ Continue? OCR Edit Shortcuts: Allow single letter/number in text box + Shortcut toggle custom start/end Update file type associations File type associations updated Edit custom continuation style diff --git a/src/ui/Forms/Options/Settings.Designer.cs b/src/ui/Forms/Options/Settings.Designer.cs index 8e3590af9..b2b0c1283 100644 --- a/src/ui/Forms/Options/Settings.Designer.cs +++ b/src/ui/Forms/Options/Settings.Designer.cs @@ -252,6 +252,9 @@ this.checkBoxWaveformShowGrid = new System.Windows.Forms.CheckBox(); this.panelTools = new System.Windows.Forms.Panel(); this.groupBoxToolsMisc = new System.Windows.Forms.GroupBox(); + this.comboBoxCustomToggleEnd = new System.Windows.Forms.ComboBox(); + this.comboBoxCustomToggleStart = new System.Windows.Forms.ComboBox(); + this.labelShortcutCustomToggle = new System.Windows.Forms.Label(); this.checkBoxShortcutsAllowLetterOrNumberInTextBox = new System.Windows.Forms.CheckBox(); this.comboBoxBDOpensIn = new System.Windows.Forms.ComboBox(); this.labelBDOpensIn = new System.Windows.Forms.Label(); @@ -416,9 +419,6 @@ this.labelUpdateFileTypeAssociationsStatus = new System.Windows.Forms.Label(); this.imageListFileTypeAssociations = new System.Windows.Forms.ImageList(this.components); this.toolTipDialogStylePreview = new System.Windows.Forms.ToolTip(this.components); - this.labelShortcutCustomToggle = new System.Windows.Forms.Label(); - this.comboBoxCustomToggleStart = new System.Windows.Forms.ComboBox(); - this.comboBoxCustomToggleEnd = new System.Windows.Forms.ComboBox(); this.panelGeneral.SuspendLayout(); this.groupBoxMiscellaneous.SuspendLayout(); this.groupBoxGeneralRules.SuspendLayout(); @@ -3237,6 +3237,37 @@ this.groupBoxToolsMisc.TabStop = false; this.groupBoxToolsMisc.Text = "Misc"; // + // comboBoxCustomToggleEnd + // + this.comboBoxCustomToggleEnd.FormattingEnabled = true; + this.comboBoxCustomToggleEnd.Items.AddRange(new object[] { + ")", + "♪"}); + this.comboBoxCustomToggleEnd.Location = new System.Drawing.Point(230, 76); + this.comboBoxCustomToggleEnd.Name = "comboBoxCustomToggleEnd"; + this.comboBoxCustomToggleEnd.Size = new System.Drawing.Size(42, 21); + this.comboBoxCustomToggleEnd.TabIndex = 64; + // + // comboBoxCustomToggleStart + // + this.comboBoxCustomToggleStart.FormattingEnabled = true; + this.comboBoxCustomToggleStart.Items.AddRange(new object[] { + "(", + "♪"}); + this.comboBoxCustomToggleStart.Location = new System.Drawing.Point(182, 76); + this.comboBoxCustomToggleStart.Name = "comboBoxCustomToggleStart"; + this.comboBoxCustomToggleStart.Size = new System.Drawing.Size(42, 21); + this.comboBoxCustomToggleStart.TabIndex = 63; + // + // labelShortcutCustomToggle + // + this.labelShortcutCustomToggle.AutoSize = true; + this.labelShortcutCustomToggle.Location = new System.Drawing.Point(6, 79); + this.labelShortcutCustomToggle.Name = "labelShortcutCustomToggle"; + this.labelShortcutCustomToggle.Size = new System.Drawing.Size(169, 13); + this.labelShortcutCustomToggle.TabIndex = 62; + this.labelShortcutCustomToggle.Text = "Shortcut toggle custom start/end"; + // // checkBoxShortcutsAllowLetterOrNumberInTextBox // this.checkBoxShortcutsAllowLetterOrNumberInTextBox.AutoSize = true; @@ -4998,39 +5029,6 @@ this.toolTipDialogStylePreview.InitialDelay = 500; this.toolTipDialogStylePreview.ReshowDelay = 100; // - // labelShortcutCustomToggle - // - this.labelShortcutCustomToggle.AutoSize = true; - this.labelShortcutCustomToggle.Location = new System.Drawing.Point(6, 79); - this.labelShortcutCustomToggle.Name = "labelShortcutCustomToggle"; - this.labelShortcutCustomToggle.Size = new System.Drawing.Size(169, 13); - this.labelShortcutCustomToggle.TabIndex = 62; - this.labelShortcutCustomToggle.Text = "Shortcut toggle custom start/end"; - // - // comboBoxCustomToggleStart - // - this.comboBoxCustomToggleStart.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.comboBoxCustomToggleStart.FormattingEnabled = true; - this.comboBoxCustomToggleStart.Items.AddRange(new object[] { - "(", - "♪"}); - this.comboBoxCustomToggleStart.Location = new System.Drawing.Point(182, 76); - this.comboBoxCustomToggleStart.Name = "comboBoxCustomToggleStart"; - this.comboBoxCustomToggleStart.Size = new System.Drawing.Size(42, 21); - this.comboBoxCustomToggleStart.TabIndex = 63; - // - // comboBoxCustomToggleEnd - // - this.comboBoxCustomToggleEnd.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.comboBoxCustomToggleEnd.FormattingEnabled = true; - this.comboBoxCustomToggleEnd.Items.AddRange(new object[] { - ")", - "♪"}); - this.comboBoxCustomToggleEnd.Location = new System.Drawing.Point(230, 76); - this.comboBoxCustomToggleEnd.Name = "comboBoxCustomToggleEnd"; - this.comboBoxCustomToggleEnd.Size = new System.Drawing.Size(42, 21); - this.comboBoxCustomToggleEnd.TabIndex = 64; - // // Settings // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/src/ui/Logic/LanguageDeserializer.cs b/src/ui/Logic/LanguageDeserializer.cs index 3d0fd4c4a..e354566ef 100644 --- a/src/ui/Logic/LanguageDeserializer.cs +++ b/src/ui/Logic/LanguageDeserializer.cs @@ -6736,6 +6736,9 @@ namespace Nikse.SubtitleEdit.Logic case "Settings/ToggleHiTags": language.Settings.ToggleHiTags = reader.Value; break; + case "Settings/ToggleCustomTags": + language.Settings.ToggleCustomTags = reader.Value; + break; case "Settings/ToggleMusicSymbols": language.Settings.ToggleMusicSymbols = reader.Value; break; @@ -7279,6 +7282,9 @@ namespace Nikse.SubtitleEdit.Logic case "Settings/ShortcutsAllowSingleLetterOrNumberInTextBox": language.Settings.ShortcutsAllowSingleLetterOrNumberInTextBox = reader.Value; break; + case "Settings/ShortcutCustomToggle": + language.Settings.ShortcutCustomToggle = reader.Value; + break; case "Settings/UpdateFileTypeAssociations": language.Settings.UpdateFileTypeAssociations = reader.Value; break;