From deeae0eafc9e07cb7de6887d35e015b97c9a3e9f Mon Sep 17 00:00:00 2001 From: Nikolaj Olsson Date: Sat, 5 Oct 2019 10:10:20 +0200 Subject: [PATCH] More work on #3633 --- LanguageMaster.xml | 4 ++++ libse/Language.cs | 8 ++++++-- libse/LanguageDeserializer.cs | 12 +++++++++++ libse/LanguageStructure.cs | 4 ++++ src/Forms/BatchConvertTsSettings.Designer.cs | 12 +++++------ src/Forms/BatchConvertTsSettings.cs | 21 +++++++++++++++----- 6 files changed, 48 insertions(+), 13 deletions(-) diff --git a/LanguageMaster.xml b/LanguageMaster.xml index 2da84f620..76fcf7a98 100644 --- a/LanguageMaster.xml +++ b/LanguageMaster.xml @@ -79,6 +79,8 @@ Size Search Delete current line + Width + Height About Subtitle Edit @@ -212,6 +214,8 @@ Note: Do check free disk space. Auto balance: {0} Offset time codes Transport Stream settings + Override original position + Override original video size Beamer diff --git a/libse/Language.cs b/libse/Language.cs index b6be85ef9..f6afdaa4a 100644 --- a/libse/Language.cs +++ b/libse/Language.cs @@ -196,7 +196,9 @@ namespace Nikse.SubtitleEdit.Core After = "After", Size = "Size", Search = "Search", - DeleteCurrentLine = "Delete current line" + DeleteCurrentLine = "Delete current line", + Width = "Width", + Height = "Height" }; About = new LanguageStructure.About @@ -351,7 +353,9 @@ namespace Nikse.SubtitleEdit.Core MultipleReplaceErrorX = "Multiple replace: {0}", AutoBalanceErrorX = "Auto balance: {0}", OffsetTimeCodes = "Offset time codes", - TransportStreamSettings = "Transport Stream settings" + TransportStreamSettings = "Transport Stream settings", + TransportStreamOverridePosition = "Override original position", + TransportStreamOverrideVideoSize = "Override original video size" }; Beamer = new LanguageStructure.Beamer diff --git a/libse/LanguageDeserializer.cs b/libse/LanguageDeserializer.cs index dff1fb07e..570e6d045 100644 --- a/libse/LanguageDeserializer.cs +++ b/libse/LanguageDeserializer.cs @@ -292,6 +292,12 @@ namespace Nikse.SubtitleEdit.Core case "General/DeleteCurrentLine": language.General.DeleteCurrentLine = reader.Value; break; + case "General/Width": + language.General.Width = reader.Value; + break; + case "General/Height": + language.General.Height = reader.Value; + break; case "About/Title": language.About.Title = reader.Value; break; @@ -577,6 +583,12 @@ namespace Nikse.SubtitleEdit.Core case "BatchConvert/TransportStreamSettings": language.BatchConvert.TransportStreamSettings = reader.Value; break; + case "BatchConvert/TransportStreamOverridePosition": + language.BatchConvert.TransportStreamOverridePosition = reader.Value; + break; + case "BatchConvert/TransportStreamOverrideVideoSize": + language.BatchConvert.TransportStreamOverrideVideoSize = reader.Value; + break; case "Beamer/Title": language.Beamer.Title = reader.Value; break; diff --git a/libse/LanguageStructure.cs b/libse/LanguageStructure.cs index 3c72e2f0d..cd4515715 100644 --- a/libse/LanguageStructure.cs +++ b/libse/LanguageStructure.cs @@ -83,6 +83,8 @@ public string Size { get; set; } public string Search { get; set; } public string DeleteCurrentLine { get; set; } + public string Width { get; set; } + public string Height { get; set; } } public class About @@ -222,6 +224,8 @@ public string AutoBalanceErrorX { get; set; } public string OffsetTimeCodes { get; set; } public string TransportStreamSettings { get; set; } + public string TransportStreamOverridePosition { get; set; } + public string TransportStreamOverrideVideoSize { get; set; } } public class Beamer diff --git a/src/Forms/BatchConvertTsSettings.Designer.cs b/src/Forms/BatchConvertTsSettings.Designer.cs index 0bbbdf8cc..398df8ff4 100644 --- a/src/Forms/BatchConvertTsSettings.Designer.cs +++ b/src/Forms/BatchConvertTsSettings.Designer.cs @@ -47,7 +47,7 @@ // this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonOK.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.buttonOK.Location = new System.Drawing.Point(231, 145); + this.buttonOK.Location = new System.Drawing.Point(287, 145); this.buttonOK.Name = "buttonOK"; this.buttonOK.Size = new System.Drawing.Size(75, 21); this.buttonOK.TabIndex = 8; @@ -60,7 +60,7 @@ this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.buttonCancel.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.buttonCancel.Location = new System.Drawing.Point(312, 145); + this.buttonCancel.Location = new System.Drawing.Point(368, 145); this.buttonCancel.Name = "buttonCancel"; this.buttonCancel.Size = new System.Drawing.Size(75, 21); this.buttonCancel.TabIndex = 9; @@ -114,7 +114,7 @@ 0}); this.numericUpDownWidth.Name = "numericUpDownWidth"; this.numericUpDownWidth.Size = new System.Drawing.Size(62, 20); - this.numericUpDownWidth.TabIndex = 15; + this.numericUpDownWidth.TabIndex = 16; this.numericUpDownWidth.Value = new decimal(new int[] { 1920, 0, @@ -136,7 +136,7 @@ this.checkBoxOverrideVideoSize.Location = new System.Drawing.Point(244, 24); this.checkBoxOverrideVideoSize.Name = "checkBoxOverrideVideoSize"; this.checkBoxOverrideVideoSize.Size = new System.Drawing.Size(116, 17); - this.checkBoxOverrideVideoSize.TabIndex = 16; + this.checkBoxOverrideVideoSize.TabIndex = 15; this.checkBoxOverrideVideoSize.Text = "Override video size"; this.checkBoxOverrideVideoSize.UseVisualStyleBackColor = true; this.checkBoxOverrideVideoSize.CheckedChanged += new System.EventHandler(this.CheckBoxOverrideVideoSize_CheckedChanged); @@ -156,7 +156,7 @@ 0}); this.numericUpDownHeight.Name = "numericUpDownHeight"; this.numericUpDownHeight.Size = new System.Drawing.Size(62, 20); - this.numericUpDownHeight.TabIndex = 18; + this.numericUpDownHeight.TabIndex = 17; this.numericUpDownHeight.Value = new decimal(new int[] { 1080, 0, @@ -176,7 +176,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(399, 178); + this.ClientSize = new System.Drawing.Size(455, 178); this.Controls.Add(this.numericUpDownHeight); this.Controls.Add(this.labelHeight); this.Controls.Add(this.checkBoxOverrideVideoSize); diff --git a/src/Forms/BatchConvertTsSettings.cs b/src/Forms/BatchConvertTsSettings.cs index a9ae5669b..13d338df5 100644 --- a/src/Forms/BatchConvertTsSettings.cs +++ b/src/Forms/BatchConvertTsSettings.cs @@ -1,4 +1,5 @@ -using System.Windows.Forms; +using System; +using System.Windows.Forms; using Nikse.SubtitleEdit.Core; using Nikse.SubtitleEdit.Logic; @@ -12,10 +13,20 @@ namespace Nikse.SubtitleEdit.Forms InitializeComponent(); UiUtil.FixFonts(this); Text = Configuration.Settings.Language.BatchConvert.TransportStreamSettings; + checkBoxOverrideOriginalPosition.Text = Configuration.Settings.Language.BatchConvert.TransportStreamOverridePosition; + checkBoxOverrideVideoSize.Text = Configuration.Settings.Language.BatchConvert.TransportStreamOverrideVideoSize; + labelBottomMargin.Text = Configuration.Settings.Language.ExportPngXml.BottomMargin; + labelWidth.Text = Configuration.Settings.Language.General.Width; + labelHeight.Text = Configuration.Settings.Language.General.Height; buttonCancel.Text = Configuration.Settings.Language.General.Cancel; buttonOK.Text = Configuration.Settings.Language.General.Ok; UiUtil.FixLargeFonts(this, buttonOK); + numericUpDownBottomMargin.Left = labelBottomMargin.Left + labelBottomMargin.Width + 5; + var widthAndHeightLeft = Math.Max(labelWidth.Left + labelWidth.Width, labelHeight.Left + labelHeight.Width) + 5; + numericUpDownWidth.Left = widthAndHeightLeft; + numericUpDownHeight.Left = widthAndHeightLeft; + checkBoxOverrideOriginalPosition.Checked = Configuration.Settings.Tools.BatchConvertTsOverridePosition; numericUpDownBottomMargin.Value = Configuration.Settings.Tools.BatchConvertTsOverrideBottomMargin; checkBoxOverrideVideoSize.Checked = Configuration.Settings.Tools.BatchConvertTsOverrideScreenSize; @@ -26,13 +37,13 @@ namespace Nikse.SubtitleEdit.Forms CheckBoxOverrideVideoSize_CheckedChanged(null, null); } - private void CheckBoxOverrideOriginalPosition_CheckedChanged(object sender, System.EventArgs e) + private void CheckBoxOverrideOriginalPosition_CheckedChanged(object sender, EventArgs e) { labelBottomMargin.Enabled = checkBoxOverrideOriginalPosition.Checked; numericUpDownBottomMargin.Enabled = checkBoxOverrideOriginalPosition.Checked; } - private void CheckBoxOverrideVideoSize_CheckedChanged(object sender, System.EventArgs e) + private void CheckBoxOverrideVideoSize_CheckedChanged(object sender, EventArgs e) { labelWidth.Enabled = checkBoxOverrideVideoSize.Checked; numericUpDownWidth.Enabled = checkBoxOverrideVideoSize.Checked; @@ -55,11 +66,11 @@ namespace Nikse.SubtitleEdit.Forms } } - private void ButtonOK_Click(object sender, System.EventArgs e) + private void ButtonOK_Click(object sender, EventArgs e) { Configuration.Settings.Tools.BatchConvertTsOverridePosition = checkBoxOverrideOriginalPosition.Checked; Configuration.Settings.Tools.BatchConvertTsOverrideBottomMargin = (int)numericUpDownBottomMargin.Value; - Configuration.Settings.Tools.BatchConvertTsOverrideScreenSize= checkBoxOverrideVideoSize.Checked; + Configuration.Settings.Tools.BatchConvertTsOverrideScreenSize = checkBoxOverrideVideoSize.Checked; Configuration.Settings.Tools.BatchConvertTsScreenWidth = (int)numericUpDownWidth.Value; Configuration.Settings.Tools.BatchConvertTsScreenHeight = (int)numericUpDownHeight.Value; DialogResult = DialogResult.OK;