From a3cbb6d0ce38bbfc4e733a7d06d0c3a1419dce02 Mon Sep 17 00:00:00 2001 From: Nikolaj Olsson Date: Sun, 10 May 2020 15:16:34 +0200 Subject: [PATCH] Show language in FCE step 2 --- src/Forms/FixCommonErrors.Designer.cs | 112 +++++++++++++++----------- src/Forms/FixCommonErrors.cs | 2 + 2 files changed, 65 insertions(+), 49 deletions(-) diff --git a/src/Forms/FixCommonErrors.Designer.cs b/src/Forms/FixCommonErrors.Designer.cs index c7328c5d4..fa58a30a3 100644 --- a/src/Forms/FixCommonErrors.Designer.cs +++ b/src/Forms/FixCommonErrors.Designer.cs @@ -66,7 +66,6 @@ namespace Nikse.SubtitleEdit.Forms this.buttonRefreshFixes = new System.Windows.Forms.Button(); this.buttonFixesSelectAll = new System.Windows.Forms.Button(); this.buttonFixesInverse = new System.Windows.Forms.Button(); - this.subtitleListView1 = new Nikse.SubtitleEdit.Controls.SubtitleListView(); this.contextMenuStripListview = new System.Windows.Forms.ContextMenuStrip(this.components); this.toolStripMenuItemDelete = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); @@ -78,7 +77,6 @@ namespace Nikse.SubtitleEdit.Forms this.buttonAutoBreak = new System.Windows.Forms.Button(); this.labelStartTimeWarning = new System.Windows.Forms.Label(); this.labelDurationWarning = new System.Windows.Forms.Label(); - this.timeUpDownStartTime = new Nikse.SubtitleEdit.Controls.TimeUpDown(); this.numericUpDownDuration = new System.Windows.Forms.NumericUpDown(); this.labelDuration = new System.Windows.Forms.Label(); this.labelStartTime = new System.Windows.Forms.Label(); @@ -88,6 +86,9 @@ namespace Nikse.SubtitleEdit.Forms this.tabPageLog = new System.Windows.Forms.TabPage(); this.textBoxFixedIssues = new System.Windows.Forms.TextBox(); this.labelNumberOfImportantLogMessages = new System.Windows.Forms.Label(); + this.labelLanguage2 = new System.Windows.Forms.Label(); + this.subtitleListView1 = new Nikse.SubtitleEdit.Controls.SubtitleListView(); + this.timeUpDownStartTime = new Nikse.SubtitleEdit.Controls.TimeUpDown(); this.groupBoxStep1.SuspendLayout(); this.contextMenuStripRules.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -290,6 +291,7 @@ namespace Nikse.SubtitleEdit.Forms this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.groupBox2.Controls.Add(this.labelLanguage2); this.groupBox2.Controls.Add(this.tabControl1); this.groupBox2.Location = new System.Drawing.Point(12, 12); this.groupBox2.Name = "groupBox2"; @@ -465,33 +467,6 @@ namespace Nikse.SubtitleEdit.Forms this.buttonFixesInverse.UseVisualStyleBackColor = true; this.buttonFixesInverse.Click += new System.EventHandler(this.ButtonFixesInverseClick); // - // subtitleListView1 - // - this.subtitleListView1.AllowColumnReorder = true; - this.subtitleListView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.subtitleListView1.ContextMenuStrip = this.contextMenuStripListview; - this.subtitleListView1.FirstVisibleIndex = -1; - this.subtitleListView1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.subtitleListView1.FullRowSelect = true; - this.subtitleListView1.GridLines = true; - this.subtitleListView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; - this.subtitleListView1.HideSelection = false; - this.subtitleListView1.Location = new System.Drawing.Point(3, 5); - this.subtitleListView1.Name = "subtitleListView1"; - this.subtitleListView1.OwnerDraw = true; - this.subtitleListView1.Size = new System.Drawing.Size(785, 158); - this.subtitleListView1.SubtitleFontBold = false; - this.subtitleListView1.SubtitleFontName = "Tahoma"; - this.subtitleListView1.SubtitleFontSize = 8; - this.subtitleListView1.TabIndex = 110; - this.subtitleListView1.UseCompatibleStateImageBehavior = false; - this.subtitleListView1.UseSyntaxColoring = true; - this.subtitleListView1.View = System.Windows.Forms.View.Details; - this.subtitleListView1.SelectedIndexChanged += new System.EventHandler(this.SubtitleListView1SelectedIndexChanged); - this.subtitleListView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.subtitleListView1_KeyDown); - // // contextMenuStripListview // this.contextMenuStripListview.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -607,26 +582,6 @@ namespace Nikse.SubtitleEdit.Forms this.labelDurationWarning.TabIndex = 31; this.labelDurationWarning.Text = "labelDurationWarning"; // - // timeUpDownStartTime - // - 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(8, 27); - 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 = 112; - 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; - // // numericUpDownDuration // this.numericUpDownDuration.DecimalPlaces = 3; @@ -738,6 +693,64 @@ namespace Nikse.SubtitleEdit.Forms this.labelNumberOfImportantLogMessages.TabIndex = 11; this.labelNumberOfImportantLogMessages.Text = "labelNumberOfImportantLogMessages"; // + // labelLanguage2 + // + this.labelLanguage2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.labelLanguage2.ForeColor = System.Drawing.SystemColors.GrayText; + this.labelLanguage2.Location = new System.Drawing.Point(650, 14); + this.labelLanguage2.Name = "labelLanguage2"; + this.labelLanguage2.Size = new System.Drawing.Size(160, 13); + this.labelLanguage2.TabIndex = 12; + this.labelLanguage2.Text = "Lang"; + this.labelLanguage2.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // subtitleListView1 + // + this.subtitleListView1.AllowColumnReorder = true; + this.subtitleListView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.subtitleListView1.ContextMenuStrip = this.contextMenuStripListview; + this.subtitleListView1.FirstVisibleIndex = -1; + this.subtitleListView1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.subtitleListView1.FullRowSelect = true; + this.subtitleListView1.GridLines = true; + this.subtitleListView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; + this.subtitleListView1.HideSelection = false; + this.subtitleListView1.Location = new System.Drawing.Point(3, 5); + this.subtitleListView1.Name = "subtitleListView1"; + this.subtitleListView1.OwnerDraw = true; + this.subtitleListView1.Size = new System.Drawing.Size(785, 158); + this.subtitleListView1.SubtitleFontBold = false; + this.subtitleListView1.SubtitleFontName = "Tahoma"; + this.subtitleListView1.SubtitleFontSize = 8; + this.subtitleListView1.TabIndex = 110; + this.subtitleListView1.UseCompatibleStateImageBehavior = false; + this.subtitleListView1.UseSyntaxColoring = true; + this.subtitleListView1.View = System.Windows.Forms.View.Details; + this.subtitleListView1.SelectedIndexChanged += new System.EventHandler(this.SubtitleListView1SelectedIndexChanged); + this.subtitleListView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.subtitleListView1_KeyDown); + // + // timeUpDownStartTime + // + 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(8, 27); + 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 = 112; + 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; + // // FixCommonErrors // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -843,5 +856,6 @@ namespace Nikse.SubtitleEdit.Forms private System.Windows.Forms.ContextMenuStrip contextMenuStripRules; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemSelectAllRules; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemInverseRules; + private System.Windows.Forms.Label labelLanguage2; } } \ No newline at end of file diff --git a/src/Forms/FixCommonErrors.cs b/src/Forms/FixCommonErrors.cs index bc8975f03..c11e78cd4 100644 --- a/src/Forms/FixCommonErrors.cs +++ b/src/Forms/FixCommonErrors.cs @@ -466,6 +466,7 @@ namespace Nikse.SubtitleEdit.Forms labelStartTimeWarning.Text = string.Empty; labelDurationWarning.Text = string.Empty; labelNumberOfImportantLogMessages.Text = string.Empty; + labelLanguage2.Text = string.Empty; Encoding = Encoding.UTF8; _language = Configuration.Settings.Language.FixCommonErrors; _languageGeneral = Configuration.Settings.Language.General; @@ -1872,6 +1873,7 @@ namespace Nikse.SubtitleEdit.Forms AddFixActions(ci.Code.GetThreeLetterIsoLanguageName()); } } + labelLanguage2.Text = comboBoxLanguage.Text; } private void comboBoxLanguage_Enter(object sender, EventArgs e)