Work on language tags for assa progress bar

LanguageMaster.xml

@@ -187,6 +187,21 @@ Note: Do check free disk space.</WaveFileMalformed>
     <SelectedLinesX>Selected lines: {0}</SelectedLinesX>
     <AdvancedSelection>Advanced selection</AdvancedSelection>
   </AssaOverrideTags>
+  <AssaProgressBarGenerator>
+    <Title>Generate progress bar</Title>
+    <Progressbar>Progress bar</Progressbar>
+    <Chapters>Chapters</Chapters>
+    <SplitterWidth>Splitter width</SplitterWidth>
+    <SplitterHeight>Splitter height</SplitterHeight>
+    <XAdjustment>X adjustment</XAdjustment>
+    <YAdjustment>Y adjustment</YAdjustment>
+    <Position>Position</Position>
+    <TextAlignment>Text alignment</TextAlignment>
+    <SquareCorners>Square corners</SquareCorners>
+    <RoundedCorners>Rounded corners</RoundedCorners>
+    <Top>Top</Top>
+    <Bottom>Bottom</Bottom>
+  </AssaProgressBarGenerator>
   <AssaSetPosition>
     <SetPosition>Set/get position</SetPosition>
     <VideoResolutionX>Video resolution: {0}</VideoResolutionX>

src/ui/Forms/Assa/AssaProgressBar.Designer.cs

@@ -33,7 +33,6 @@ namespace Nikse.SubtitleEdit.Forms.Assa
             this.groupBoxStyle = new System.Windows.Forms.GroupBox();
             this.comboBoxProgressBarEdge = new System.Windows.Forms.ComboBox();
             this.labelEdgeStyle = new System.Windows.Forms.Label();
-            this.buttonReset = new System.Windows.Forms.Button();
             this.radioButtonPosTop = new System.Windows.Forms.RadioButton();
             this.radioButtonPosBottom = new System.Windows.Forms.RadioButton();
             this.labelHeight = new System.Windows.Forms.Label();
@@ -42,7 +41,8 @@ namespace Nikse.SubtitleEdit.Forms.Assa
             this.buttonSecondaryColor = new System.Windows.Forms.Button();
             this.panelPrimaryColor = new System.Windows.Forms.Panel();
             this.buttonForeColor = new System.Windows.Forms.Button();
-            this.labelStorageCategory = new System.Windows.Forms.Label();
+            this.labelPosition = new System.Windows.Forms.Label();
+            this.buttonReset = new System.Windows.Forms.Button();
             this.buttonPickAttachmentFont = new System.Windows.Forms.Button();
             this.comboBoxFontName = new System.Windows.Forms.ComboBox();
             this.labelFontName = new System.Windows.Forms.Label();
@@ -50,7 +50,7 @@ namespace Nikse.SubtitleEdit.Forms.Assa
             this.labelSplitterWidth = new System.Windows.Forms.Label();
             this.numericUpDownSplitterHeight = new System.Windows.Forms.NumericUpDown();
             this.labelSplitterHeight = new System.Windows.Forms.Label();
-            this.labelRotateX = new System.Windows.Forms.Label();
+            this.labelFontSize = new System.Windows.Forms.Label();
             this.numericUpDownFontSize = new System.Windows.Forms.NumericUpDown();
             this.groupBoxChapters = new System.Windows.Forms.GroupBox();
             this.labelXAdjust = new System.Windows.Forms.Label();
@@ -61,6 +61,7 @@ namespace Nikse.SubtitleEdit.Forms.Assa
             this.numericUpDownYAdjust = new System.Windows.Forms.NumericUpDown();
             this.textBoxChapterText = new System.Windows.Forms.TextBox();
             this.labelText = new System.Windows.Forms.Label();
+            this.timeUpDownStartTime = new Nikse.SubtitleEdit.Controls.TimeUpDown();
             this.labelStartTime = new System.Windows.Forms.Label();
             this.panelTextColor = new System.Windows.Forms.Panel();
             this.buttonTextColor = new System.Windows.Forms.Button();
@@ -73,7 +74,6 @@ namespace Nikse.SubtitleEdit.Forms.Assa
             this.buttonOK = new System.Windows.Forms.Button();
             this.buttonCancel = new System.Windows.Forms.Button();
             this.textBoxSource = new System.Windows.Forms.TextBox();
-            this.timeUpDownStartTime = new Nikse.SubtitleEdit.Controls.TimeUpDown();
             this.groupBoxStyle.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDownHeight)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSplitterWidth)).BeginInit();
@@ -96,7 +96,7 @@ namespace Nikse.SubtitleEdit.Forms.Assa
             this.groupBoxStyle.Controls.Add(this.buttonSecondaryColor);
             this.groupBoxStyle.Controls.Add(this.panelPrimaryColor);
             this.groupBoxStyle.Controls.Add(this.buttonForeColor);
-            this.groupBoxStyle.Controls.Add(this.labelStorageCategory);
+            this.groupBoxStyle.Controls.Add(this.labelPosition);
             this.groupBoxStyle.Location = new System.Drawing.Point(12, 12);
             this.groupBoxStyle.Name = "groupBoxStyle";
             this.groupBoxStyle.Size = new System.Drawing.Size(383, 167);
@@ -125,17 +125,6 @@ namespace Nikse.SubtitleEdit.Forms.Assa
             this.labelEdgeStyle.TabIndex = 9;
             this.labelEdgeStyle.Text = "Style";
             // 
-            // buttonReset
-            // 
-            this.buttonReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonReset.Location = new System.Drawing.Point(1059, 619);
-            this.buttonReset.Name = "buttonReset";
-            this.buttonReset.Size = new System.Drawing.Size(103, 23);
-            this.buttonReset.TabIndex = 2;
-            this.buttonReset.Text = "Reset";
-            this.buttonReset.UseVisualStyleBackColor = true;
-            this.buttonReset.Click += new System.EventHandler(this.buttonReset_Click);
-            // 
             // radioButtonPosTop
             // 
             this.radioButtonPosTop.AutoSize = true;
@@ -227,14 +216,25 @@ namespace Nikse.SubtitleEdit.Forms.Assa
             this.buttonForeColor.UseVisualStyleBackColor = true;
             this.buttonForeColor.Click += new System.EventHandler(this.buttonForeColor_Click);
             // 
-            // labelStorageCategory
+            // labelPosition
             // 
-            this.labelStorageCategory.AutoSize = true;
-            this.labelStorageCategory.Location = new System.Drawing.Point(10, 30);
-            this.labelStorageCategory.Name = "labelStorageCategory";
-            this.labelStorageCategory.Size = new System.Drawing.Size(44, 13);
-            this.labelStorageCategory.TabIndex = 0;
-            this.labelStorageCategory.Text = "Position";
+            this.labelPosition.AutoSize = true;
+            this.labelPosition.Location = new System.Drawing.Point(10, 30);
+            this.labelPosition.Name = "labelPosition";
+            this.labelPosition.Size = new System.Drawing.Size(44, 13);
+            this.labelPosition.TabIndex = 0;
+            this.labelPosition.Text = "Position";
+            // 
+            // buttonReset
+            // 
+            this.buttonReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonReset.Location = new System.Drawing.Point(1059, 619);
+            this.buttonReset.Name = "buttonReset";
+            this.buttonReset.Size = new System.Drawing.Size(103, 23);
+            this.buttonReset.TabIndex = 2;
+            this.buttonReset.Text = "Reset";
+            this.buttonReset.UseVisualStyleBackColor = true;
+            this.buttonReset.Click += new System.EventHandler(this.buttonReset_Click);
             // 
             // buttonPickAttachmentFont
             // 
@@ -317,14 +317,14 @@ namespace Nikse.SubtitleEdit.Forms.Assa
             this.labelSplitterHeight.TabIndex = 2;
             this.labelSplitterHeight.Text = "Splitter height";
             // 
-            // labelRotateX
+            // labelFontSize
             // 
-            this.labelRotateX.AutoSize = true;
-            this.labelRotateX.Location = new System.Drawing.Point(10, 84);
-            this.labelRotateX.Name = "labelRotateX";
-            this.labelRotateX.Size = new System.Drawing.Size(49, 13);
-            this.labelRotateX.TabIndex = 7;
-            this.labelRotateX.Text = "Font size";
+            this.labelFontSize.AutoSize = true;
+            this.labelFontSize.Location = new System.Drawing.Point(10, 84);
+            this.labelFontSize.Name = "labelFontSize";
+            this.labelFontSize.Size = new System.Drawing.Size(49, 13);
+            this.labelFontSize.TabIndex = 7;
+            this.labelFontSize.Text = "Font size";
             // 
             // numericUpDownFontSize
             // 
@@ -374,7 +374,7 @@ namespace Nikse.SubtitleEdit.Forms.Assa
             this.groupBoxChapters.Controls.Add(this.labelSplitterWidth);
             this.groupBoxChapters.Controls.Add(this.numericUpDownFontSize);
             this.groupBoxChapters.Controls.Add(this.numericUpDownSplitterWidth);
-            this.groupBoxChapters.Controls.Add(this.labelRotateX);
+            this.groupBoxChapters.Controls.Add(this.labelFontSize);
             this.groupBoxChapters.Controls.Add(this.labelSplitterHeight);
             this.groupBoxChapters.Controls.Add(this.numericUpDownSplitterHeight);
             this.groupBoxChapters.Location = new System.Drawing.Point(12, 185);
@@ -470,6 +470,27 @@ namespace Nikse.SubtitleEdit.Forms.Assa
             this.labelText.TabIndex = 20;
             this.labelText.Text = "Text";
             // 
+            // timeUpDownStartTime
+            // 
+            this.timeUpDownStartTime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.timeUpDownStartTime.AutoSize = true;
+            this.timeUpDownStartTime.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.timeUpDownStartTime.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
+            this.timeUpDownStartTime.Location = new System.Drawing.Point(63, 290);
+            this.timeUpDownStartTime.Margin = new System.Windows.Forms.Padding(4);
+            this.timeUpDownStartTime.Name = "timeUpDownStartTime";
+            this.timeUpDownStartTime.Size = new System.Drawing.Size(111, 27);
+            this.timeUpDownStartTime.TabIndex = 19;
+            timeCode1.Hours = 0;
+            timeCode1.Milliseconds = 0;
+            timeCode1.Minutes = 0;
+            timeCode1.Seconds = 0;
+            timeCode1.TimeSpan = System.TimeSpan.Parse("00:00:00");
+            timeCode1.TotalMilliseconds = 0D;
+            timeCode1.TotalSeconds = 0D;
+            this.timeUpDownStartTime.TimeCode = timeCode1;
+            this.timeUpDownStartTime.UseVideoOffset = false;
+            // 
             // labelStartTime
             // 
             this.labelStartTime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -554,6 +575,7 @@ namespace Nikse.SubtitleEdit.Forms.Assa
             this.listViewChapters.View = System.Windows.Forms.View.Details;
             this.listViewChapters.SelectedIndexChanged += new System.EventHandler(this.listViewChapters_SelectedIndexChanged);
             this.listViewChapters.DoubleClick += new System.EventHandler(this.listViewChapters_DoubleClick);
+            this.listViewChapters.KeyDown += new System.Windows.Forms.KeyEventHandler(this.listViewChapters_KeyDown);
             // 
             // columnHeaderName
             // 
@@ -599,27 +621,6 @@ namespace Nikse.SubtitleEdit.Forms.Assa
             this.textBoxSource.TabIndex = 9;
             this.textBoxSource.Visible = false;
             // 
-            // timeUpDownStartTime
-            // 
-            this.timeUpDownStartTime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.timeUpDownStartTime.AutoSize = true;
-            this.timeUpDownStartTime.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.timeUpDownStartTime.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
-            this.timeUpDownStartTime.Location = new System.Drawing.Point(63, 290);
-            this.timeUpDownStartTime.Margin = new System.Windows.Forms.Padding(4);
-            this.timeUpDownStartTime.Name = "timeUpDownStartTime";
-            this.timeUpDownStartTime.Size = new System.Drawing.Size(111, 27);
-            this.timeUpDownStartTime.TabIndex = 19;
-            timeCode1.Hours = 0;
-            timeCode1.Milliseconds = 0;
-            timeCode1.Minutes = 0;
-            timeCode1.Seconds = 0;
-            timeCode1.TimeSpan = System.TimeSpan.Parse("00:00:00");
-            timeCode1.TotalMilliseconds = 0D;
-            timeCode1.TotalSeconds = 0D;
-            this.timeUpDownStartTime.TimeCode = timeCode1;
-            this.timeUpDownStartTime.UseVideoOffset = false;
-            // 
             // AssaProgressBar
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -660,9 +661,9 @@ namespace Nikse.SubtitleEdit.Forms.Assa
         private System.Windows.Forms.GroupBox groupBoxChapters;
         private System.Windows.Forms.Button buttonOK;
         private System.Windows.Forms.Button buttonCancel;
-        private System.Windows.Forms.Label labelRotateX;
+        private System.Windows.Forms.Label labelFontSize;
         private System.Windows.Forms.NumericUpDown numericUpDownFontSize;
-        private System.Windows.Forms.Label labelStorageCategory;
+        private System.Windows.Forms.Label labelPosition;
         private System.Windows.Forms.Panel panelSecondaryColor;
         private System.Windows.Forms.Button buttonSecondaryColor;
         private System.Windows.Forms.Panel panelPrimaryColor;

src/ui/Forms/Assa/AssaProgressBar.cs

@@ -28,13 +28,48 @@ namespace Nikse.SubtitleEdit.Forms.Assa
 
         public AssaProgressBar(Subtitle subtitle, string videoFileName, VideoInfo videoInfo)
         {
+            UiUtil.PreInitialize(this);
             InitializeComponent();
+            UiUtil.FixFonts(this);
 
             _subtitle = subtitle;
             _videoFileName = videoFileName;
             _videoInfo = videoInfo;
             _chapters = new Subtitle();
 
+            var l = LanguageSettings.Current.AssaProgressBarGenerator;
+            Text = l.Title;
+            groupBoxStyle.Text = l.Progressbar;
+            labelPosition.Text = l.Position;
+            radioButtonPosBottom.Text = l.Bottom;
+            radioButtonPosTop.Text = l.Top;
+            labelHeight.Text = LanguageSettings.Current.General.Height;
+            buttonForeColor.Text = "Color";
+            buttonSecondaryColor.Text = LanguageSettings.Current.Settings.SubtitleBackgroundColor;
+            labelEdgeStyle.Text = LanguageSettings.Current.General.Style;
+            groupBoxChapters.Text = l.Chapters;
+            labelSplitterWidth.Text = l.SplitterWidth;
+            labelSplitterHeight.Text = l.SplitterHeight;
+            labelFontName.Text = LanguageSettings.Current.ExportPngXml.FontFamily;
+            labelFontSize.Text = LanguageSettings.Current.ExportPngXml.FontSize;
+            labelXAdjust.Text = l.XAdjustment;
+            labelYAdjust.Text = l.YAdjustment;
+            labelTextHorizontalAlignment.Text = l.TextAlignment;
+            labelStartTime.Text = LanguageSettings.Current.General.StartTime;
+            labelText.Text = LanguageSettings.Current.General.Text;
+            buttonAdd.Text = LanguageSettings.Current.SubStationAlphaStyles.New;
+            buttonRemove.Text = LanguageSettings.Current.SubStationAlphaStyles.Remove;
+            buttonRemoveAll.Text = LanguageSettings.Current.SubStationAlphaStyles.RemoveAll;
+            columnHeaderName.Text = LanguageSettings.Current.General.Text;
+            columnHeaderStart.Text = LanguageSettings.Current.General.StartTime;
+            comboBoxProgressBarEdge.Items.Clear();
+            comboBoxProgressBarEdge.Items.Add(l.SquareCorners);
+            comboBoxProgressBarEdge.Items.Add(l.RoundedCorners);
+
+            buttonOK.Text = LanguageSettings.Current.General.Ok;
+            buttonCancel.Text = LanguageSettings.Current.General.Cancel;
+            UiUtil.FixLargeFonts(this, buttonOK);
+
             comboBoxFontName.Items.Clear();
             foreach (var font in FontFamily.Families)
             {
@@ -67,7 +102,7 @@ namespace Nikse.SubtitleEdit.Forms.Assa
 
             listViewChapters_SelectedIndexChanged(null, null);
 
-            var left = labelStorageCategory.Left + Math.Max(labelStorageCategory.Width, labelHeight.Width) + 10;
+            var left = labelPosition.Left + Math.Max(labelPosition.Width, labelHeight.Width) + 10;
             radioButtonPosBottom.Left = left;
             radioButtonPosTop.Left = left + radioButtonPosBottom.Width + 10;
             numericUpDownHeight.Left = left;
@@ -78,7 +113,7 @@ namespace Nikse.SubtitleEdit.Forms.Assa
             comboBoxProgressBarEdge.Left = left;
             comboBoxProgressBarEdge.SelectedIndex = 0;
 
-            left = Math.Max(Math.Max(labelSplitterHeight.Width, labelTextHorizontalAlignment.Width), Math.Max(labelFontName.Width, labelRotateX.Width)) + 12;
+            left = Math.Max(Math.Max(labelSplitterHeight.Width, labelTextHorizontalAlignment.Width), Math.Max(labelFontName.Width, labelFontSize.Width)) + 12;
             numericUpDownSplitterWidth.Left = left;
             labelSplitterHeight.Left = numericUpDownSplitterWidth.Left + numericUpDownSplitterWidth.Width + 15;
             numericUpDownSplitterHeight.Left = labelSplitterHeight.Left + labelSplitterHeight.Width + 4;
@@ -817,5 +852,19 @@ Dialogue: -255,0:00:00.00,0:43:00.00,SE-progress-bar-bg,,0,0,0,,[PB_DRAWING]";
             numericUpDownYAdjust.Value = 0;
             InitializeFromSettings();
         }
+
+        private void listViewChapters_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Delete)
+            {
+                buttonRemove_Click(null, null);
+                e.SuppressKeyPress = true;
+            }
+            else if (e.KeyData == UiUtil.HelpKeys)
+            {
+                UiUtil.OpenUrl("https://www.nikse.dk/SubtitleEdit/AssaOverrideTags#pos");
+                e.SuppressKeyPress = true;
+            }
+        }
     }
 }

src/ui/Logic/Language.cs

@@ -20,6 +20,7 @@ namespace Nikse.SubtitleEdit.Logic
         public LanguageStructure.ApplyDurationLimits ApplyDurationLimits;
         public LanguageStructure.AssaAttachments AssaAttachments;
         public LanguageStructure.AssaOverrideTags AssaOverrideTags;
+        public LanguageStructure.AssaProgressBarGenerator AssaProgressBarGenerator;
         public LanguageStructure.AssaSetPosition AssaSetPosition;
         public LanguageStructure.AudioToText AudioToText;
         public LanguageStructure.AutoBreakUnbreakLines AutoBreakUnbreakLines;
@@ -333,6 +334,23 @@ namespace Nikse.SubtitleEdit.Logic
                 TagsToApply = "Tags to apply",
             };
 
+            AssaProgressBarGenerator = new LanguageStructure.AssaProgressBarGenerator
+            {
+                Title = "Generate progress bar",
+                Chapters = "Chapters",
+                Progressbar = "Progress bar",
+                SplitterHeight = "Splitter height",
+                SplitterWidth = "Splitter width",
+                XAdjustment = "X adjustment",
+                YAdjustment = "Y adjustment",
+                Position = "Position",
+                TextAlignment = "Text alignment",
+                RoundedCorners = "Rounded corners",
+                SquareCorners = "Square corners",
+                Bottom = "Bottom",
+                Top = "Top",
+            };
+
             AssaSetPosition = new LanguageStructure.AssaSetPosition
             {
                 SetPosition = "Set/get position",

src/ui/Logic/LanguageDeserializer.cs

@@ -505,6 +505,45 @@ namespace Nikse.SubtitleEdit.Logic
                 case "AssaOverrideTags/AdvancedSelection":
                     language.AssaOverrideTags.AdvancedSelection = reader.Value;
                     break;
+                case "AssaProgressBarGenerator/Title":
+                    language.AssaProgressBarGenerator.Title = reader.Value;
+                    break;
+                case "AssaProgressBarGenerator/Progressbar":
+                    language.AssaProgressBarGenerator.Progressbar = reader.Value;
+                    break;
+                case "AssaProgressBarGenerator/Chapters":
+                    language.AssaProgressBarGenerator.Chapters = reader.Value;
+                    break;
+                case "AssaProgressBarGenerator/SplitterWidth":
+                    language.AssaProgressBarGenerator.SplitterWidth = reader.Value;
+                    break;
+                case "AssaProgressBarGenerator/SplitterHeight":
+                    language.AssaProgressBarGenerator.SplitterHeight = reader.Value;
+                    break;
+                case "AssaProgressBarGenerator/XAdjustment":
+                    language.AssaProgressBarGenerator.XAdjustment = reader.Value;
+                    break;
+                case "AssaProgressBarGenerator/YAdjustment":
+                    language.AssaProgressBarGenerator.YAdjustment = reader.Value;
+                    break;
+                case "AssaProgressBarGenerator/Position":
+                    language.AssaProgressBarGenerator.Position = reader.Value;
+                    break;
+                case "AssaProgressBarGenerator/TextAlignment":
+                    language.AssaProgressBarGenerator.TextAlignment = reader.Value;
+                    break;
+                case "AssaProgressBarGenerator/SquareCorners":
+                    language.AssaProgressBarGenerator.SquareCorners = reader.Value;
+                    break;
+                case "AssaProgressBarGenerator/RoundedCorners":
+                    language.AssaProgressBarGenerator.RoundedCorners = reader.Value;
+                    break;
+                case "AssaProgressBarGenerator/Top":
+                    language.AssaProgressBarGenerator.Top = reader.Value;
+                    break;
+                case "AssaProgressBarGenerator/Bottom":
+                    language.AssaProgressBarGenerator.Bottom = reader.Value;
+                    break;
                 case "AssaSetPosition/SetPosition":
                     language.AssaSetPosition.SetPosition = reader.Value;
                     break;

src/ui/Logic/LanguageStructure.cs

@@ -196,6 +196,23 @@
             public string AdvancedSelection { get; set; }
         }
 
+        public class AssaProgressBarGenerator
+        {
+            public string Title { get; set; }
+            public string Progressbar { get; set; }
+            public string Chapters { get; set; }
+            public string SplitterWidth { get; set; }
+            public string SplitterHeight { get; set; }
+            public string XAdjustment { get; set; }
+            public string YAdjustment { get; set; }
+            public string Position { get; set; }
+            public string TextAlignment { get; set; }
+            public string SquareCorners { get; set; }
+            public string RoundedCorners { get; set; }
+            public string Top { get; set; }
+            public string Bottom { get; set; }
+        }
+
         public class AssaSetPosition
         {
             public string SetPosition { get; set; }
@@ -2516,7 +2533,7 @@
             public string MainToggleVideoControls { get; set; }
             public string VideoToggleContrast { get; set; }
             public string VideoToggleBrightness { get; set; }
-            public string CustomSearch1 { get; set; } 
+            public string CustomSearch1 { get; set; }
             public string CustomSearch2 { get; set; }
             public string CustomSearch3 { get; set; }
             public string CustomSearch4 { get; set; }