Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-22 11:12:36 +01:00
Code Issues Projects Releases Wiki Activity

Fix for last commit

Browse Source
This commit is contained in:
niksedk 2023-03-14 12:22:38 +01:00
parent a56932f4ef
commit 5a91c5db14
3 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LanguageBaseEnglish.xml
View File

@ -2465,6 +2465,7 @@ can edit in same subtitle file (collaboration)</Information>
<ToggleDialogDashes>Toggle dialog dashes</ToggleDialogDashes>
<ToggleQuotes>Toggle quotes</ToggleQuotes>
<ToggleHiTags>Toggle HI tags</ToggleHiTags>
<ToggleCustomTags>Toggle custom tags</ToggleCustomTags>
<ToggleMusicSymbols>Toggle music symbols</ToggleMusicSymbols>
<Alignment>Alignment (selected lines)</Alignment>
<AlignmentN1>Alignment bottom left - {\an1}</AlignmentN1>
@ -2650,6 +2651,7 @@ Continue?</RestoreDefaultSettingsMsg>
<BDOpensInOcr>OCR</BDOpensInOcr>
<BDOpensInEdit>Edit</BDOpensInEdit>
<ShortcutsAllowSingleLetterOrNumberInTextBox>Shortcuts: Allow single letter/number in text box</ShortcutsAllowSingleLetterOrNumberInTextBox>
<ShortcutCustomToggle>Shortcut toggle custom start/end</ShortcutCustomToggle>
<UpdateFileTypeAssociations>Update file type associations</UpdateFileTypeAssociations>
<FileTypeAssociationsUpdated>File type associations updated</FileTypeAssociationsUpdated>
<CustomContinuationStyle>Edit custom continuation style</CustomContinuationStyle>

70
src/ui/Forms/Options/Settings.Designer.cs generated
View File

@ -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);

6
src/ui/Logic/LanguageDeserializer.cs
View File

@ -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;