From 9c3a97ec7f14a197ef9776d8c635c56a6f5705b7 Mon Sep 17 00:00:00 2001 From: niksedk Date: Sat, 8 Jan 2011 22:29:32 +0000 Subject: [PATCH] At bit more work with larger fonts/heigher dpi git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@231 99eadd0c-20b8-1223-b5c4-2a2b2df33de2 --- src/Controls/VideoPlayerContainer.cs | 7 +- src/Forms/AddToNames.Designer.cs | 8 +- src/Forms/AddToNames.cs | 3 + src/Forms/AdjustDisplayDuration.Designer.cs | 42 +++++----- src/Forms/AdjustDisplayDuration.cs | 3 + src/Forms/ChangeCasing.Designer.cs | 19 +++-- src/Forms/ChangeCasing.cs | 3 + src/Forms/ChangeFrameRate.Designer.cs | 14 ++-- src/Forms/FindDialog.Designer.cs | 2 +- src/Forms/FindDialog.cs | 3 + src/Forms/FixCommonErrors.Designer.cs | 48 +++++------ src/Forms/FixCommonErrors.cs | 23 +++++ src/Forms/GetDictionaries.Designer.cs | 32 +++---- src/Forms/GetDictionaries.cs | 3 + src/Forms/Main.Designer.cs | 36 ++++---- src/Forms/Main.cs | 3 + src/Forms/MergeShortLines.Designer.cs | 18 ++-- src/Forms/MultipleReplace.Designer.cs | 84 +++++++++---------- .../RemoveTextFromHearImpaired.Designer.cs | 44 +++++----- src/Forms/ReplaceDialog.cs | 4 + src/Forms/ShowEarlierLater.Designer.cs | 22 ++--- src/Forms/SpellCheck.Designer.cs | 42 +++++----- src/Forms/SplitSubtitle.Designer.cs | 18 ++-- src/Forms/SplitSubtitle.cs | 5 ++ src/Forms/StartNumberingFrom.Designer.cs | 10 +-- src/Forms/VisualSync.Designer.cs | 14 ++-- src/Properties/Manifest.manifest | 44 ++++++++++ src/SubtitleEdit.csproj | 5 ++ 28 files changed, 333 insertions(+), 226 deletions(-) create mode 100644 src/Properties/Manifest.manifest diff --git a/src/Controls/VideoPlayerContainer.cs b/src/Controls/VideoPlayerContainer.cs index e248c2c18..d4a19f56a 100644 --- a/src/Controls/VideoPlayerContainer.cs +++ b/src/Controls/VideoPlayerContainer.cs @@ -1,9 +1,8 @@ using System; using System.Drawing; +using System.Text; using System.Windows.Forms; using Nikse.SubtitleEdit.Logic.VideoPlayers; -using System.Text; -using System.Runtime.InteropServices; namespace Nikse.SubtitleEdit.Controls { @@ -22,7 +21,6 @@ namespace Nikse.SubtitleEdit.Controls base.MouseEnter += delegate(object sender, EventArgs e) { this.Cursor = Cursors.Default; }; base.ScrollBars = RichTextBoxScrollBars.None; base.Margin = new System.Windows.Forms.Padding(0); - base.TabStop = false; } protected override void WndProc(ref Message m) @@ -519,9 +517,8 @@ namespace Nikse.SubtitleEdit.Controls _panelcontrols.Controls.Add(_pictureBoxFastForwardDown); _labelTimeCode.Location = new Point(280, 28); - _labelTimeCode.ForeColor = Color.Gray; // Color.FromArgb(100, 200, 200); + _labelTimeCode.ForeColor = Color.Gray; _labelTimeCode.Font = new Font(_labelTimeCode.Font.FontFamily, 7); -// _labelTimeCode.BackColor = Color.Transparent; _labelTimeCode.AutoSize = true; _panelcontrols.Controls.Add(_labelTimeCode); diff --git a/src/Forms/AddToNames.Designer.cs b/src/Forms/AddToNames.Designer.cs index e1388ccc4..76564742d 100644 --- a/src/Forms/AddToNames.Designer.cs +++ b/src/Forms/AddToNames.Designer.cs @@ -51,22 +51,22 @@ // this.textBoxAddName.Location = new System.Drawing.Point(15, 26); this.textBoxAddName.Name = "textBoxAddName"; - this.textBoxAddName.Size = new System.Drawing.Size(221, 24); + this.textBoxAddName.Size = new System.Drawing.Size(221, 27); this.textBoxAddName.TabIndex = 15; // // labelDescription // this.labelDescription.AutoSize = true; - this.labelDescription.Location = new System.Drawing.Point(12, 9); + this.labelDescription.Location = new System.Drawing.Point(12, 8); this.labelDescription.Name = "labelDescription"; - this.labelDescription.Size = new System.Drawing.Size(244, 17); + this.labelDescription.Size = new System.Drawing.Size(309, 21); this.labelDescription.TabIndex = 14; this.labelDescription.Text = "Add to names/noise list (case sensitive)"; // // AddToNamesList // this.AcceptButton = this.buttonOK; - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.buttonCancel; this.ClientSize = new System.Drawing.Size(268, 88); diff --git a/src/Forms/AddToNames.cs b/src/Forms/AddToNames.cs index e2c74fda5..521f9157e 100644 --- a/src/Forms/AddToNames.cs +++ b/src/Forms/AddToNames.cs @@ -25,6 +25,9 @@ namespace Nikse.SubtitleEdit.Forms private void FixLargeFonts() { + if (labelDescription.Left + labelDescription.Width + 5 > Width) + Width = labelDescription.Left + labelDescription.Width + 5; + Graphics graphics = this.CreateGraphics(); SizeF textSize = graphics.MeasureString(buttonOK.Text, this.Font); if (textSize.Height > buttonOK.Height - 4) diff --git a/src/Forms/AdjustDisplayDuration.Designer.cs b/src/Forms/AdjustDisplayDuration.Designer.cs index be5f8d68f..8aff2f864 100644 --- a/src/Forms/AdjustDisplayDuration.Designer.cs +++ b/src/Forms/AdjustDisplayDuration.Designer.cs @@ -45,9 +45,9 @@ // radioButtonPercent // this.radioButtonPercent.AutoSize = true; - this.radioButtonPercent.Location = new System.Drawing.Point(171, 22); + this.radioButtonPercent.Location = new System.Drawing.Point(171, 21); this.radioButtonPercent.Name = "radioButtonPercent"; - this.radioButtonPercent.Size = new System.Drawing.Size(78, 21); + this.radioButtonPercent.Size = new System.Drawing.Size(89, 24); this.radioButtonPercent.TabIndex = 0; this.radioButtonPercent.Text = "Percent"; this.radioButtonPercent.UseVisualStyleBackColor = true; @@ -57,9 +57,9 @@ // this.radioButtonSeconds.AutoSize = true; this.radioButtonSeconds.Checked = true; - this.radioButtonSeconds.Location = new System.Drawing.Point(11, 22); + this.radioButtonSeconds.Location = new System.Drawing.Point(11, 21); this.radioButtonSeconds.Name = "radioButtonSeconds"; - this.radioButtonSeconds.Size = new System.Drawing.Size(84, 21); + this.radioButtonSeconds.Size = new System.Drawing.Size(97, 24); this.radioButtonSeconds.TabIndex = 1; this.radioButtonSeconds.TabStop = true; this.radioButtonSeconds.Text = "Seconds"; @@ -72,7 +72,7 @@ this.groupBoxAdjustVia.Controls.Add(this.radioButtonSeconds); this.groupBoxAdjustVia.Location = new System.Drawing.Point(13, 13); this.groupBoxAdjustVia.Name = "groupBoxAdjustVia"; - this.groupBoxAdjustVia.Size = new System.Drawing.Size(351, 45); + this.groupBoxAdjustVia.Size = new System.Drawing.Size(365, 47); this.groupBoxAdjustVia.TabIndex = 2; this.groupBoxAdjustVia.TabStop = false; this.groupBoxAdjustVia.Text = "Adjust via"; @@ -119,9 +119,9 @@ "123", "124", "125"}); - this.comboBoxPercent.Location = new System.Drawing.Point(182, 86); + this.comboBoxPercent.Location = new System.Drawing.Point(182, 89); this.comboBoxPercent.Name = "comboBoxPercent"; - this.comboBoxPercent.Size = new System.Drawing.Size(141, 25); + this.comboBoxPercent.Size = new System.Drawing.Size(141, 29); this.comboBoxPercent.TabIndex = 3; // // comboBoxSeconds @@ -145,9 +145,9 @@ "+0.8", "+0.9", "+1.0"}); - this.comboBoxSeconds.Location = new System.Drawing.Point(13, 86); + this.comboBoxSeconds.Location = new System.Drawing.Point(13, 89); this.comboBoxSeconds.Name = "comboBoxSeconds"; - this.comboBoxSeconds.Size = new System.Drawing.Size(141, 25); + this.comboBoxSeconds.Size = new System.Drawing.Size(141, 29); this.comboBoxSeconds.TabIndex = 4; // // labelNote @@ -155,33 +155,34 @@ this.labelNote.AutoSize = true; this.labelNote.Location = new System.Drawing.Point(10, 135); this.labelNote.Name = "labelNote"; - this.labelNote.Size = new System.Drawing.Size(352, 17); + this.labelNote.Size = new System.Drawing.Size(434, 21); this.labelNote.TabIndex = 5; this.labelNote.Text = "Note: Display time will not overlap start time of next text"; // // labelAddInPercent // this.labelAddInPercent.AutoSize = true; - this.labelAddInPercent.Location = new System.Drawing.Point(179, 69); + this.labelAddInPercent.Location = new System.Drawing.Point(179, 70); this.labelAddInPercent.Name = "labelAddInPercent"; - this.labelAddInPercent.Size = new System.Drawing.Size(112, 17); + this.labelAddInPercent.Size = new System.Drawing.Size(137, 21); this.labelAddInPercent.TabIndex = 6; this.labelAddInPercent.Text = "Adjust in percent"; // // labelAddSeconds // this.labelAddSeconds.AutoSize = true; - this.labelAddSeconds.Location = new System.Drawing.Point(10, 69); + this.labelAddSeconds.Location = new System.Drawing.Point(10, 70); this.labelAddSeconds.Name = "labelAddSeconds"; - this.labelAddSeconds.Size = new System.Drawing.Size(86, 17); + this.labelAddSeconds.Size = new System.Drawing.Size(104, 21); this.labelAddSeconds.TabIndex = 7; this.labelAddSeconds.Text = "Add seconds"; // // buttonCancel // + 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(294, 169); + this.buttonCancel.Location = new System.Drawing.Point(303, 169); this.buttonCancel.Name = "buttonCancel"; this.buttonCancel.Size = new System.Drawing.Size(75, 21); this.buttonCancel.TabIndex = 9; @@ -190,8 +191,9 @@ // // buttonOK // + 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(213, 169); + this.buttonOK.Location = new System.Drawing.Point(222, 169); this.buttonOK.Name = "buttonOK"; this.buttonOK.Size = new System.Drawing.Size(75, 21); this.buttonOK.TabIndex = 8; @@ -201,16 +203,16 @@ // // AdjustDisplayDuration // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(385, 206); + this.ClientSize = new System.Drawing.Size(390, 206); + this.Controls.Add(this.comboBoxSeconds); + this.Controls.Add(this.comboBoxPercent); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonOK); this.Controls.Add(this.labelAddSeconds); this.Controls.Add(this.labelAddInPercent); this.Controls.Add(this.labelNote); - this.Controls.Add(this.comboBoxSeconds); - this.Controls.Add(this.comboBoxPercent); this.Controls.Add(this.groupBoxAdjustVia); this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; diff --git a/src/Forms/AdjustDisplayDuration.cs b/src/Forms/AdjustDisplayDuration.cs index 54ee6c3fa..cecef593d 100644 --- a/src/Forms/AdjustDisplayDuration.cs +++ b/src/Forms/AdjustDisplayDuration.cs @@ -57,6 +57,9 @@ namespace Nikse.SubtitleEdit.Forms private void FixLargeFonts() { + if (labelNote.Left + labelNote.Width + 5 > Width) + Width = labelNote.Left + labelNote.Width + 5; + Graphics graphics = this.CreateGraphics(); SizeF textSize = graphics.MeasureString(buttonOK.Text, this.Font); if (textSize.Height > buttonOK.Height - 4) diff --git a/src/Forms/ChangeCasing.Designer.cs b/src/Forms/ChangeCasing.Designer.cs index 8410704b8..8a58c887d 100644 --- a/src/Forms/ChangeCasing.Designer.cs +++ b/src/Forms/ChangeCasing.Designer.cs @@ -42,6 +42,7 @@ // // buttonCancel // + 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(317, 195); @@ -53,6 +54,7 @@ // // buttonOK // + this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK; this.buttonOK.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.buttonOK.Location = new System.Drawing.Point(236, 195); @@ -64,6 +66,9 @@ // // groupBoxChangeCasing // + this.groupBoxChangeCasing.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.groupBoxChangeCasing.Controls.Add(this.radioButtonFixOnlyNames); this.groupBoxChangeCasing.Controls.Add(this.checkBoxFixNames); this.groupBoxChangeCasing.Controls.Add(this.checkBoxOnlyAllUpper); @@ -82,7 +87,7 @@ this.radioButtonFixOnlyNames.AutoSize = true; this.radioButtonFixOnlyNames.Location = new System.Drawing.Point(11, 88); this.radioButtonFixOnlyNames.Name = "radioButtonFixOnlyNames"; - this.radioButtonFixOnlyNames.Size = new System.Drawing.Size(358, 21); + this.radioButtonFixOnlyNames.Size = new System.Drawing.Size(413, 24); this.radioButtonFixOnlyNames.TabIndex = 6; this.radioButtonFixOnlyNames.Text = "Fix only names casing (via Dictionaries\\NamesEtc.xml)"; this.radioButtonFixOnlyNames.UseVisualStyleBackColor = true; @@ -94,7 +99,7 @@ this.checkBoxFixNames.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxFixNames.Location = new System.Drawing.Point(23, 39); this.checkBoxFixNames.Name = "checkBoxFixNames"; - this.checkBoxFixNames.Size = new System.Drawing.Size(329, 21); + this.checkBoxFixNames.Size = new System.Drawing.Size(382, 24); this.checkBoxFixNames.TabIndex = 2; this.checkBoxFixNames.Text = "Fix names casing (via Dictionaries\\NamesEtc.xml)"; this.checkBoxFixNames.UseVisualStyleBackColor = true; @@ -104,7 +109,7 @@ this.checkBoxOnlyAllUpper.AutoSize = true; this.checkBoxOnlyAllUpper.Location = new System.Drawing.Point(23, 62); this.checkBoxOnlyAllUpper.Name = "checkBoxOnlyAllUpper"; - this.checkBoxOnlyAllUpper.Size = new System.Drawing.Size(226, 21); + this.checkBoxOnlyAllUpper.Size = new System.Drawing.Size(265, 24); this.checkBoxOnlyAllUpper.TabIndex = 4; this.checkBoxOnlyAllUpper.Text = "Only change all upper case lines."; this.checkBoxOnlyAllUpper.UseVisualStyleBackColor = true; @@ -114,7 +119,7 @@ this.radioButtonLowercase.AutoSize = true; this.radioButtonLowercase.Location = new System.Drawing.Point(11, 142); this.radioButtonLowercase.Name = "radioButtonLowercase"; - this.radioButtonLowercase.Size = new System.Drawing.Size(103, 21); + this.radioButtonLowercase.Size = new System.Drawing.Size(124, 24); this.radioButtonLowercase.TabIndex = 10; this.radioButtonLowercase.Text = "all lowercase"; this.radioButtonLowercase.UseVisualStyleBackColor = true; @@ -124,7 +129,7 @@ this.radioButtonUppercase.AutoSize = true; this.radioButtonUppercase.Location = new System.Drawing.Point(11, 116); this.radioButtonUppercase.Name = "radioButtonUppercase"; - this.radioButtonUppercase.Size = new System.Drawing.Size(130, 21); + this.radioButtonUppercase.Size = new System.Drawing.Size(166, 24); this.radioButtonUppercase.TabIndex = 8; this.radioButtonUppercase.Text = "ALL UPPERCASE"; this.radioButtonUppercase.UseVisualStyleBackColor = true; @@ -135,7 +140,7 @@ this.radioButtonNormal.Checked = true; this.radioButtonNormal.Location = new System.Drawing.Point(11, 18); this.radioButtonNormal.Name = "radioButtonNormal"; - this.radioButtonNormal.Size = new System.Drawing.Size(357, 21); + this.radioButtonNormal.Size = new System.Drawing.Size(417, 24); this.radioButtonNormal.TabIndex = 0; this.radioButtonNormal.TabStop = true; this.radioButtonNormal.Text = "Normal casing. Sentences begin with uppercase letter."; @@ -143,7 +148,7 @@ // // ChangeCasing // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(404, 228); this.Controls.Add(this.groupBoxChangeCasing); diff --git a/src/Forms/ChangeCasing.cs b/src/Forms/ChangeCasing.cs index b1a3e6e0c..bda84a8b2 100644 --- a/src/Forms/ChangeCasing.cs +++ b/src/Forms/ChangeCasing.cs @@ -31,6 +31,9 @@ namespace Nikse.SubtitleEdit.Forms private void FixLargeFonts() { + if (radioButtonNormal.Left + radioButtonNormal.Width + 40 > Width) + Width = radioButtonNormal.Left + radioButtonNormal.Width + 40; + Graphics graphics = this.CreateGraphics(); SizeF textSize = graphics.MeasureString(buttonOK.Text, this.Font); if (textSize.Height > buttonOK.Height - 4) diff --git a/src/Forms/ChangeFrameRate.Designer.cs b/src/Forms/ChangeFrameRate.Designer.cs index 0ca0770f7..ace5d68fc 100644 --- a/src/Forms/ChangeFrameRate.Designer.cs +++ b/src/Forms/ChangeFrameRate.Designer.cs @@ -68,21 +68,21 @@ this.labelInfo.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.labelInfo.Location = new System.Drawing.Point(37, 9); this.labelInfo.Name = "labelInfo"; - this.labelInfo.Size = new System.Drawing.Size(188, 17); + this.labelInfo.Size = new System.Drawing.Size(229, 21); this.labelInfo.TabIndex = 3; this.labelInfo.Text = "Convert frame rate of subtitle"; // // comboBoxFrameRateFrom // this.comboBoxFrameRateFrom.FormattingEnabled = true; - this.comboBoxFrameRateFrom.Location = new System.Drawing.Point(119, 46); + this.comboBoxFrameRateFrom.Location = new System.Drawing.Point(119, 45); this.comboBoxFrameRateFrom.Name = "comboBoxFrameRateFrom"; - this.comboBoxFrameRateFrom.Size = new System.Drawing.Size(121, 25); + this.comboBoxFrameRateFrom.Size = new System.Drawing.Size(121, 29); this.comboBoxFrameRateFrom.TabIndex = 7; // // labelFromFrameRate // - this.labelFromFrameRate.Location = new System.Drawing.Point(4, 49); + this.labelFromFrameRate.Location = new System.Drawing.Point(4, 48); this.labelFromFrameRate.Name = "labelFromFrameRate"; this.labelFromFrameRate.Size = new System.Drawing.Size(112, 19); this.labelFromFrameRate.TabIndex = 6; @@ -94,7 +94,7 @@ this.comboBoxFrameRateTo.FormattingEnabled = true; this.comboBoxFrameRateTo.Location = new System.Drawing.Point(119, 74); this.comboBoxFrameRateTo.Name = "comboBoxFrameRateTo"; - this.comboBoxFrameRateTo.Size = new System.Drawing.Size(121, 25); + this.comboBoxFrameRateTo.Size = new System.Drawing.Size(121, 29); this.comboBoxFrameRateTo.TabIndex = 9; // // labelToFrameRate @@ -108,7 +108,7 @@ // // buttonGetFrameRateFrom // - this.buttonGetFrameRateFrom.Location = new System.Drawing.Point(246, 46); + this.buttonGetFrameRateFrom.Location = new System.Drawing.Point(246, 45); this.buttonGetFrameRateFrom.Name = "buttonGetFrameRateFrom"; this.buttonGetFrameRateFrom.Size = new System.Drawing.Size(24, 22); this.buttonGetFrameRateFrom.TabIndex = 10; @@ -132,7 +132,7 @@ // // ChangeFrameRate // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(295, 148); this.Controls.Add(this.buttonGetFrameRateTo); diff --git a/src/Forms/FindDialog.Designer.cs b/src/Forms/FindDialog.Designer.cs index 07346daff..1f2245c8f 100644 --- a/src/Forms/FindDialog.Designer.cs +++ b/src/Forms/FindDialog.Designer.cs @@ -103,7 +103,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(320, 89); + this.ClientSize = new System.Drawing.Size(298, 89); this.Controls.Add(this.radioButtonRegEx); this.Controls.Add(this.radioButtonCaseSensitive); this.Controls.Add(this.radioButtonNormal); diff --git a/src/Forms/FindDialog.cs b/src/Forms/FindDialog.cs index 1aa8ffbfd..2181f3c5b 100644 --- a/src/Forms/FindDialog.cs +++ b/src/Forms/FindDialog.cs @@ -26,6 +26,9 @@ namespace Nikse.SubtitleEdit.Forms private void FixLargeFonts() { + if (radioButtonRegEx.Left + radioButtonRegEx.Width + 5 > Width) + Width = radioButtonRegEx.Left + radioButtonRegEx.Width + 5; + Graphics graphics = this.CreateGraphics(); SizeF textSize = graphics.MeasureString(buttonCancel.Text, this.Font); if (textSize.Height > buttonCancel.Height - 4) diff --git a/src/Forms/FixCommonErrors.Designer.cs b/src/Forms/FixCommonErrors.Designer.cs index 96facc85b..2c4e57ce5 100644 --- a/src/Forms/FixCommonErrors.Designer.cs +++ b/src/Forms/FixCommonErrors.Designer.cs @@ -121,7 +121,7 @@ namespace Nikse.SubtitleEdit.Forms this.labelStatus.AutoSize = true; this.labelStatus.Location = new System.Drawing.Point(12, 542); this.labelStatus.Name = "labelStatus"; - this.labelStatus.Size = new System.Drawing.Size(73, 17); + this.labelStatus.Size = new System.Drawing.Size(92, 21); this.labelStatus.TabIndex = 5; this.labelStatus.Text = "labelStatus"; // @@ -239,10 +239,10 @@ namespace Nikse.SubtitleEdit.Forms // tabPageFixes // this.tabPageFixes.Controls.Add(this.splitContainerStep2); - this.tabPageFixes.Location = new System.Drawing.Point(4, 26); + this.tabPageFixes.Location = new System.Drawing.Point(4, 30); this.tabPageFixes.Name = "tabPageFixes"; this.tabPageFixes.Padding = new System.Windows.Forms.Padding(3); - this.tabPageFixes.Size = new System.Drawing.Size(802, 467); + this.tabPageFixes.Size = new System.Drawing.Size(802, 463); this.tabPageFixes.TabIndex = 1; this.tabPageFixes.Text = "Fixes"; this.tabPageFixes.UseVisualStyleBackColor = true; @@ -266,8 +266,8 @@ namespace Nikse.SubtitleEdit.Forms // this.splitContainerStep2.Panel2.Controls.Add(this.subtitleListView1); this.splitContainerStep2.Panel2.Controls.Add(this.groupBoxEditPanel); - this.splitContainerStep2.Size = new System.Drawing.Size(796, 461); - this.splitContainerStep2.SplitterDistance = 216; + this.splitContainerStep2.Size = new System.Drawing.Size(796, 457); + this.splitContainerStep2.SplitterDistance = 214; this.splitContainerStep2.TabIndex = 112; // // listViewFixes @@ -286,7 +286,7 @@ namespace Nikse.SubtitleEdit.Forms this.listViewFixes.HideSelection = false; this.listViewFixes.Location = new System.Drawing.Point(3, 3); this.listViewFixes.Name = "listViewFixes"; - this.listViewFixes.Size = new System.Drawing.Size(790, 183); + this.listViewFixes.Size = new System.Drawing.Size(790, 181); this.listViewFixes.TabIndex = 100; this.listViewFixes.UseCompatibleStateImageBehavior = false; this.listViewFixes.View = System.Windows.Forms.View.Details; @@ -323,7 +323,7 @@ namespace Nikse.SubtitleEdit.Forms this.buttonFixesApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonFixesApply.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonFixesApply.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.buttonFixesApply.Location = new System.Drawing.Point(628, 192); + this.buttonFixesApply.Location = new System.Drawing.Point(628, 189); this.buttonFixesApply.Name = "buttonFixesApply"; this.buttonFixesApply.Size = new System.Drawing.Size(165, 21); this.buttonFixesApply.TabIndex = 108; @@ -335,7 +335,7 @@ namespace Nikse.SubtitleEdit.Forms // this.buttonRefreshFixes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonRefreshFixes.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.buttonRefreshFixes.Location = new System.Drawing.Point(457, 192); + this.buttonRefreshFixes.Location = new System.Drawing.Point(457, 189); this.buttonRefreshFixes.Name = "buttonRefreshFixes"; this.buttonRefreshFixes.Size = new System.Drawing.Size(165, 21); this.buttonRefreshFixes.TabIndex = 106; @@ -347,7 +347,7 @@ namespace Nikse.SubtitleEdit.Forms // this.buttonFixesSelectAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.buttonFixesSelectAll.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.buttonFixesSelectAll.Location = new System.Drawing.Point(3, 192); + this.buttonFixesSelectAll.Location = new System.Drawing.Point(3, 189); this.buttonFixesSelectAll.Name = "buttonFixesSelectAll"; this.buttonFixesSelectAll.Size = new System.Drawing.Size(75, 21); this.buttonFixesSelectAll.TabIndex = 102; @@ -359,7 +359,7 @@ namespace Nikse.SubtitleEdit.Forms // this.buttonFixesInverse.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.buttonFixesInverse.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.buttonFixesInverse.Location = new System.Drawing.Point(84, 192); + this.buttonFixesInverse.Location = new System.Drawing.Point(84, 189); this.buttonFixesInverse.Name = "buttonFixesInverse"; this.buttonFixesInverse.Size = new System.Drawing.Size(100, 21); this.buttonFixesInverse.TabIndex = 104; @@ -380,7 +380,7 @@ namespace Nikse.SubtitleEdit.Forms this.subtitleListView1.HideSelection = false; this.subtitleListView1.Location = new System.Drawing.Point(3, 5); this.subtitleListView1.Name = "subtitleListView1"; - this.subtitleListView1.Size = new System.Drawing.Size(785, 142); + this.subtitleListView1.Size = new System.Drawing.Size(785, 140); this.subtitleListView1.TabIndex = 110; this.subtitleListView1.UseCompatibleStateImageBehavior = false; this.subtitleListView1.View = System.Windows.Forms.View.Details; @@ -431,7 +431,7 @@ namespace Nikse.SubtitleEdit.Forms this.groupBoxEditPanel.Controls.Add(this.labelTextLineTotal); this.groupBoxEditPanel.Controls.Add(this.labelTextLineLengths); this.groupBoxEditPanel.Controls.Add(this.textBoxListViewText); - this.groupBoxEditPanel.Location = new System.Drawing.Point(8, 146); + this.groupBoxEditPanel.Location = new System.Drawing.Point(8, 144); this.groupBoxEditPanel.Name = "groupBoxEditPanel"; this.groupBoxEditPanel.Size = new System.Drawing.Size(732, 85); this.groupBoxEditPanel.TabIndex = 111; @@ -473,7 +473,7 @@ namespace Nikse.SubtitleEdit.Forms this.labelStartTimeWarning.ForeColor = System.Drawing.Color.Red; this.labelStartTimeWarning.Location = new System.Drawing.Point(6, 51); this.labelStartTimeWarning.Name = "labelStartTimeWarning"; - this.labelStartTimeWarning.Size = new System.Drawing.Size(145, 17); + this.labelStartTimeWarning.Size = new System.Drawing.Size(179, 21); this.labelStartTimeWarning.TabIndex = 32; this.labelStartTimeWarning.Text = "labelStartTimeWarning"; // @@ -483,7 +483,7 @@ namespace Nikse.SubtitleEdit.Forms this.labelDurationWarning.ForeColor = System.Drawing.Color.Red; this.labelDurationWarning.Location = new System.Drawing.Point(57, 64); this.labelDurationWarning.Name = "labelDurationWarning"; - this.labelDurationWarning.Size = new System.Drawing.Size(139, 17); + this.labelDurationWarning.Size = new System.Drawing.Size(170, 21); this.labelDurationWarning.TabIndex = 31; this.labelDurationWarning.Text = "labelDurationWarning"; // @@ -492,9 +492,9 @@ namespace Nikse.SubtitleEdit.Forms this.timeUpDownStartTime.AutoSize = true; this.timeUpDownStartTime.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.timeUpDownStartTime.Location = new System.Drawing.Point(8, 27); - this.timeUpDownStartTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.timeUpDownStartTime.Margin = new System.Windows.Forms.Padding(4); this.timeUpDownStartTime.Name = "timeUpDownStartTime"; - this.timeUpDownStartTime.Size = new System.Drawing.Size(123, 29); + this.timeUpDownStartTime.Size = new System.Drawing.Size(137, 34); this.timeUpDownStartTime.TabIndex = 112; // // numericUpDownDuration @@ -517,7 +517,7 @@ namespace Nikse.SubtitleEdit.Forms 0, -2147483648}); this.numericUpDownDuration.Name = "numericUpDownDuration"; - this.numericUpDownDuration.Size = new System.Drawing.Size(54, 24); + this.numericUpDownDuration.Size = new System.Drawing.Size(54, 27); this.numericUpDownDuration.TabIndex = 114; this.numericUpDownDuration.ValueChanged += new System.EventHandler(this.NumericUpDownDurationValueChanged); // @@ -526,7 +526,7 @@ namespace Nikse.SubtitleEdit.Forms this.labelDuration.AutoSize = true; this.labelDuration.Location = new System.Drawing.Point(97, 12); this.labelDuration.Name = "labelDuration"; - this.labelDuration.Size = new System.Drawing.Size(61, 17); + this.labelDuration.Size = new System.Drawing.Size(74, 21); this.labelDuration.TabIndex = 28; this.labelDuration.Text = "Duration"; // @@ -535,7 +535,7 @@ namespace Nikse.SubtitleEdit.Forms this.labelStartTime.AutoSize = true; this.labelStartTime.Location = new System.Drawing.Point(6, 12); this.labelStartTime.Name = "labelStartTime"; - this.labelStartTime.Size = new System.Drawing.Size(68, 17); + this.labelStartTime.Size = new System.Drawing.Size(84, 21); this.labelStartTime.TabIndex = 27; this.labelStartTime.Text = "Start time"; // @@ -554,7 +554,7 @@ namespace Nikse.SubtitleEdit.Forms this.labelTextLineLengths.AutoSize = true; this.labelTextLineLengths.Location = new System.Drawing.Point(191, 65); this.labelTextLineLengths.Name = "labelTextLineLengths"; - this.labelTextLineLengths.Size = new System.Drawing.Size(135, 17); + this.labelTextLineLengths.Size = new System.Drawing.Size(166, 21); this.labelTextLineLengths.TabIndex = 25; this.labelTextLineLengths.Text = "labelTextLineLengths"; // @@ -573,9 +573,9 @@ namespace Nikse.SubtitleEdit.Forms // tabPageLog // this.tabPageLog.Controls.Add(this.textBoxFixedIssues); - this.tabPageLog.Location = new System.Drawing.Point(4, 26); + this.tabPageLog.Location = new System.Drawing.Point(4, 30); this.tabPageLog.Name = "tabPageLog"; - this.tabPageLog.Size = new System.Drawing.Size(802, 467); + this.tabPageLog.Size = new System.Drawing.Size(802, 463); this.tabPageLog.TabIndex = 2; this.tabPageLog.Text = "Log"; this.tabPageLog.UseVisualStyleBackColor = true; @@ -602,13 +602,13 @@ namespace Nikse.SubtitleEdit.Forms this.labelNumberOfImportantLogMessages.ForeColor = System.Drawing.Color.Red; this.labelNumberOfImportantLogMessages.Location = new System.Drawing.Point(12, 558); this.labelNumberOfImportantLogMessages.Name = "labelNumberOfImportantLogMessages"; - this.labelNumberOfImportantLogMessages.Size = new System.Drawing.Size(239, 17); + this.labelNumberOfImportantLogMessages.Size = new System.Drawing.Size(293, 21); this.labelNumberOfImportantLogMessages.TabIndex = 11; this.labelNumberOfImportantLogMessages.Text = "labelNumberOfImportantLogMessages"; // // FixCommonErrors // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.buttonCancel; this.ClientSize = new System.Drawing.Size(846, 573); diff --git a/src/Forms/FixCommonErrors.cs b/src/Forms/FixCommonErrors.cs index 5a22f8450..a0c311ab8 100644 --- a/src/Forms/FixCommonErrors.cs +++ b/src/Forms/FixCommonErrors.cs @@ -1069,6 +1069,29 @@ namespace Nikse.SubtitleEdit.Forms match = match.NextMatch(); } } + + string[] arr = p.Text.Split(Environment.NewLine.ToCharArray(), StringSplitOptions.RemoveEmptyEntries); + if (arr.Length == 2 && arr[0].Length > 1 && arr[1].Length > 1) + { + if (arr[0].StartsWith("-") && arr[1].StartsWith("-")) + { + if (arr[0][1] != ' ') + arr[0] = arr[0].Insert(1, " "); + if (arr[1][1] != ' ') + arr[1] = arr[1].Insert(1, " "); + string newText = arr[0] + Environment.NewLine + arr[1]; + if (newText != p.Text && AllowFix(i + 1, fixAction)) + { + _totalFixes++; + missingSpaces++; + + string oldText = p.Text; + p.Text = newText; + AddFixToListView(p, i + 1, fixAction, oldText, p.Text); + } + } + } + } if (missingSpaces > 0) LogStatus(_language.FixMissingSpaces, string.Format(_language.XMissingSpacesAdded, missingSpaces)); diff --git a/src/Forms/GetDictionaries.Designer.cs b/src/Forms/GetDictionaries.Designer.cs index 839b0887b..3fcae8010 100644 --- a/src/Forms/GetDictionaries.Designer.cs +++ b/src/Forms/GetDictionaries.Designer.cs @@ -40,10 +40,11 @@ // // buttonOK // + this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK; this.buttonOK.Location = new System.Drawing.Point(356, 159); this.buttonOK.Name = "buttonOK"; - this.buttonOK.Size = new System.Drawing.Size(87, 23); + this.buttonOK.Size = new System.Drawing.Size(104, 23); this.buttonOK.TabIndex = 20; this.buttonOK.Text = "&OK"; this.buttonOK.UseVisualStyleBackColor = true; @@ -53,7 +54,7 @@ this.labelDescription2.AutoSize = true; this.labelDescription2.Location = new System.Drawing.Point(30, 34); this.labelDescription2.Name = "labelDescription2"; - this.labelDescription2.Size = new System.Drawing.Size(329, 17); + this.labelDescription2.Size = new System.Drawing.Size(263, 13); this.labelDescription2.TabIndex = 1; this.labelDescription2.Text = "uses the spell checking dictionaries from Open Office."; // @@ -62,7 +63,7 @@ this.linkLabelOpenDictionaryFolder.AutoSize = true; this.linkLabelOpenDictionaryFolder.Location = new System.Drawing.Point(30, 164); this.linkLabelOpenDictionaryFolder.Name = "linkLabelOpenDictionaryFolder"; - this.linkLabelOpenDictionaryFolder.Size = new System.Drawing.Size(158, 17); + this.linkLabelOpenDictionaryFolder.Size = new System.Drawing.Size(126, 13); this.linkLabelOpenDictionaryFolder.TabIndex = 15; this.linkLabelOpenDictionaryFolder.TabStop = true; this.linkLabelOpenDictionaryFolder.Text = "Open \'Dictionaries\' folder"; @@ -73,25 +74,28 @@ this.labelDescription1.AutoSize = true; this.labelDescription1.Location = new System.Drawing.Point(30, 16); this.labelDescription1.Name = "labelDescription1"; - this.labelDescription1.Size = new System.Drawing.Size(400, 17); + this.labelDescription1.Size = new System.Drawing.Size(316, 13); this.labelDescription1.TabIndex = 8; this.labelDescription1.Text = "Subtitle Edit\'s spell check is based on the NHunspell engine which"; // // comboBoxDictionaries // + this.comboBoxDictionaries.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.comboBoxDictionaries.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDictionaries.FormattingEnabled = true; this.comboBoxDictionaries.Location = new System.Drawing.Point(33, 98); this.comboBoxDictionaries.Name = "comboBoxDictionaries"; - this.comboBoxDictionaries.Size = new System.Drawing.Size(317, 25); + this.comboBoxDictionaries.Size = new System.Drawing.Size(317, 21); this.comboBoxDictionaries.TabIndex = 0; this.comboBoxDictionaries.SelectedIndexChanged += new System.EventHandler(this.comboBoxDictionaries_SelectedIndexChanged); // // buttonDownload // - this.buttonDownload.Location = new System.Drawing.Point(356, 98); + this.buttonDownload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDownload.Location = new System.Drawing.Point(356, 97); this.buttonDownload.Name = "buttonDownload"; - this.buttonDownload.Size = new System.Drawing.Size(87, 25); + this.buttonDownload.Size = new System.Drawing.Size(104, 25); this.buttonDownload.TabIndex = 10; this.buttonDownload.Text = "&Download"; this.buttonDownload.UseVisualStyleBackColor = true; @@ -100,30 +104,30 @@ // labelChooseLanguageAndClickDownload // this.labelChooseLanguageAndClickDownload.AutoSize = true; - this.labelChooseLanguageAndClickDownload.Location = new System.Drawing.Point(30, 80); + this.labelChooseLanguageAndClickDownload.Location = new System.Drawing.Point(30, 79); this.labelChooseLanguageAndClickDownload.Name = "labelChooseLanguageAndClickDownload"; - this.labelChooseLanguageAndClickDownload.Size = new System.Drawing.Size(258, 17); + this.labelChooseLanguageAndClickDownload.Size = new System.Drawing.Size(201, 13); this.labelChooseLanguageAndClickDownload.TabIndex = 11; this.labelChooseLanguageAndClickDownload.Text = "Choose your languge and click download"; // // labelPleaseWait // this.labelPleaseWait.AutoSize = true; - this.labelPleaseWait.Location = new System.Drawing.Point(30, 123); + this.labelPleaseWait.Location = new System.Drawing.Point(30, 126); this.labelPleaseWait.Name = "labelPleaseWait"; - this.labelPleaseWait.Size = new System.Drawing.Size(85, 17); + this.labelPleaseWait.Size = new System.Drawing.Size(73, 13); this.labelPleaseWait.TabIndex = 12; this.labelPleaseWait.Text = "Please wait..."; // // GetDictionaries // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(455, 195); + this.ClientSize = new System.Drawing.Size(472, 195); + this.Controls.Add(this.comboBoxDictionaries); this.Controls.Add(this.labelPleaseWait); this.Controls.Add(this.labelChooseLanguageAndClickDownload); this.Controls.Add(this.buttonDownload); - this.Controls.Add(this.comboBoxDictionaries); this.Controls.Add(this.labelDescription1); this.Controls.Add(this.linkLabelOpenDictionaryFolder); this.Controls.Add(this.labelDescription2); diff --git a/src/Forms/GetDictionaries.cs b/src/Forms/GetDictionaries.cs index 7b254f15b..908a70459 100644 --- a/src/Forms/GetDictionaries.cs +++ b/src/Forms/GetDictionaries.cs @@ -70,6 +70,9 @@ namespace Nikse.SubtitleEdit.Forms private void FixLargeFonts() { + if (labelDescription1.Left + labelDescription1.Width + 5 > Width) + Width = labelDescription1.Left + labelDescription1.Width + 5; + Graphics graphics = this.CreateGraphics(); SizeF textSize = graphics.MeasureString(buttonOK.Text, this.Font); if (textSize.Height > buttonOK.Height - 4) diff --git a/src/Forms/Main.Designer.cs b/src/Forms/Main.Designer.cs index 77ded31e7..8623d1ea4 100644 --- a/src/Forms/Main.Designer.cs +++ b/src/Forms/Main.Designer.cs @@ -358,9 +358,9 @@ this.labelStatus, this.toolStripSelected, this.toolStripStatusNetworking}); - this.statusStrip1.Location = new System.Drawing.Point(0, 658); + this.statusStrip1.Location = new System.Drawing.Point(0, 656); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(1244, 25); + this.statusStrip1.Size = new System.Drawing.Size(1244, 27); this.statusStrip1.TabIndex = 4; this.statusStrip1.Text = "statusStrip1"; // @@ -368,14 +368,14 @@ // this.labelStatus.AutoSize = false; this.labelStatus.Name = "labelStatus"; - this.labelStatus.Size = new System.Drawing.Size(700, 20); + this.labelStatus.Size = new System.Drawing.Size(700, 22); this.labelStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // toolStripSelected // this.toolStripSelected.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; this.toolStripSelected.Name = "toolStripSelected"; - this.toolStripSelected.Size = new System.Drawing.Size(312, 20); + this.toolStripSelected.Size = new System.Drawing.Size(312, 22); this.toolStripSelected.Spring = true; this.toolStripSelected.Text = "toolStripSelected"; this.toolStripSelected.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -385,7 +385,7 @@ this.toolStripStatusNetworking.Image = global::Nikse.SubtitleEdit.Properties.Resources.connect; this.toolStripStatusNetworking.Name = "toolStripStatusNetworking"; this.toolStripStatusNetworking.Padding = new System.Windows.Forms.Padding(50, 0, 0, 0); - this.toolStripStatusNetworking.Size = new System.Drawing.Size(217, 20); + this.toolStripStatusNetworking.Size = new System.Drawing.Size(217, 22); this.toolStripStatusNetworking.Text = "toolStripStatusNetworking"; this.toolStripStatusNetworking.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.toolStripStatusNetworking.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage; @@ -1898,7 +1898,7 @@ this.toolStripButtonWaveFormPlay.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonWaveFormPlay.Image"))); this.toolStripButtonWaveFormPlay.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonWaveFormPlay.Name = "toolStripButtonWaveFormPlay"; - this.toolStripButtonWaveFormPlay.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonWaveFormPlay.Size = new System.Drawing.Size(23, 30); this.toolStripButtonWaveFormPlay.Text = "toolStripButton1"; this.toolStripButtonWaveFormPlay.Visible = false; this.toolStripButtonWaveFormPlay.Click += new System.EventHandler(this.toolStripButtonWaveFormPlay_Click); @@ -2763,8 +2763,8 @@ // splitContainerMain.Panel2 // this.splitContainerMain.Panel2.Controls.Add(this.groupBoxVideo); - this.splitContainerMain.Size = new System.Drawing.Size(1244, 594); - this.splitContainerMain.SplitterDistance = 285; + this.splitContainerMain.Size = new System.Drawing.Size(1244, 592); + this.splitContainerMain.SplitterDistance = 283; this.splitContainerMain.TabIndex = 8; // // splitContainer1 @@ -2780,7 +2780,7 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.panelVideoPlayer); - this.splitContainer1.Size = new System.Drawing.Size(1244, 285); + this.splitContainer1.Size = new System.Drawing.Size(1244, 283); this.splitContainer1.SplitterDistance = 950; this.splitContainer1.TabIndex = 7; // @@ -2795,7 +2795,7 @@ this.tabControlSubtitle.Location = new System.Drawing.Point(3, 3); this.tabControlSubtitle.Name = "tabControlSubtitle"; this.tabControlSubtitle.SelectedIndex = 0; - this.tabControlSubtitle.Size = new System.Drawing.Size(945, 282); + this.tabControlSubtitle.Size = new System.Drawing.Size(945, 280); this.tabControlSubtitle.TabIndex = 0; this.tabControlSubtitle.SelectedIndexChanged += new System.EventHandler(this.TabControlSubtitleSelectedIndexChanged); // @@ -2806,7 +2806,7 @@ this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(937, 256); + this.tabPage1.Size = new System.Drawing.Size(937, 254); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "List view"; this.tabPage1.UseVisualStyleBackColor = true; @@ -2833,7 +2833,7 @@ this.groupBoxEdit.Controls.Add(this.textBoxListViewText); this.groupBoxEdit.Controls.Add(this.labelDuration); this.groupBoxEdit.Controls.Add(this.labelAutoDuration); - this.groupBoxEdit.Location = new System.Drawing.Point(3, 154); + this.groupBoxEdit.Location = new System.Drawing.Point(3, 152); this.groupBoxEdit.Name = "groupBoxEdit"; this.groupBoxEdit.Size = new System.Drawing.Size(926, 102); this.groupBoxEdit.TabIndex = 1; @@ -2863,7 +2863,7 @@ this.labelTextLineTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.labelTextLineTotal.Location = new System.Drawing.Point(625, 86); this.labelTextLineTotal.Name = "labelTextLineTotal"; - this.labelTextLineTotal.Size = new System.Drawing.Size(177, 17); + this.labelTextLineTotal.Size = new System.Drawing.Size(177, 18); this.labelTextLineTotal.TabIndex = 21; this.labelTextLineTotal.Text = "labelTextLineTotal"; this.labelTextLineTotal.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -3051,7 +3051,7 @@ this.SubtitleListview1.HideSelection = false; this.SubtitleListview1.Location = new System.Drawing.Point(1, 3); this.SubtitleListview1.Name = "SubtitleListview1"; - this.SubtitleListview1.Size = new System.Drawing.Size(932, 150); + this.SubtitleListview1.Size = new System.Drawing.Size(932, 148); this.SubtitleListview1.SmallImageList = this.imageList1; this.SubtitleListview1.TabIndex = 0; this.SubtitleListview1.UseCompatibleStateImageBehavior = false; @@ -3068,7 +3068,7 @@ this.tabPage2.Location = new System.Drawing.Point(4, 22); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(937, 256); + this.tabPage2.Size = new System.Drawing.Size(937, 248); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Source view"; this.tabPage2.UseVisualStyleBackColor = true; @@ -3085,7 +3085,7 @@ this.textBoxSource.Multiline = true; this.textBoxSource.Name = "textBoxSource"; this.textBoxSource.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.textBoxSource.Size = new System.Drawing.Size(932, 259); + this.textBoxSource.Size = new System.Drawing.Size(932, 251); this.textBoxSource.TabIndex = 12; this.textBoxSource.WordWrap = false; this.textBoxSource.Click += new System.EventHandler(this.TextBoxSourceClick); @@ -3103,7 +3103,7 @@ this.panelVideoPlayer.Controls.Add(this.mediaPlayer); this.panelVideoPlayer.Location = new System.Drawing.Point(1, 1); this.panelVideoPlayer.Name = "panelVideoPlayer"; - this.panelVideoPlayer.Size = new System.Drawing.Size(282, 280); + this.panelVideoPlayer.Size = new System.Drawing.Size(282, 278); this.panelVideoPlayer.TabIndex = 5; // // mediaPlayer @@ -3117,7 +3117,7 @@ this.mediaPlayer.Margin = new System.Windows.Forms.Padding(0); this.mediaPlayer.Name = "mediaPlayer"; this.mediaPlayer.ShowStopButton = true; - this.mediaPlayer.Size = new System.Drawing.Size(281, 280); + this.mediaPlayer.Size = new System.Drawing.Size(281, 278); this.mediaPlayer.SubtitleText = ""; this.mediaPlayer.TabIndex = 5; this.mediaPlayer.VideoPlayer = null; diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index 795c141f4..e57e35ecc 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -2956,6 +2956,9 @@ namespace Nikse.SubtitleEdit.Forms mergeBeforeToolStripMenuItem.Visible = false; typeEffectToolStripMenuItem.Visible = false; toolStripSeparator7.Visible = false; + + if (SubtitleListview1.SelectedItems.Count > 5) + toolStripMenuItemMergeLines.Visible = false; } if (GetCurrentSubtitleFormat().GetType() != typeof(SubRip)) diff --git a/src/Forms/MergeShortLines.Designer.cs b/src/Forms/MergeShortLines.Designer.cs index 96c1bc707..13ece20f2 100644 --- a/src/Forms/MergeShortLines.Designer.cs +++ b/src/Forms/MergeShortLines.Designer.cs @@ -74,7 +74,7 @@ namespace Nikse.SubtitleEdit.Forms // // numericUpDownMaxCharacters // - this.numericUpDownMaxCharacters.Location = new System.Drawing.Point(236, 26); + this.numericUpDownMaxCharacters.Location = new System.Drawing.Point(190, 27); this.numericUpDownMaxCharacters.Maximum = new decimal(new int[] { 200, 0, @@ -86,7 +86,7 @@ namespace Nikse.SubtitleEdit.Forms 0, 0}); this.numericUpDownMaxCharacters.Name = "numericUpDownMaxCharacters"; - this.numericUpDownMaxCharacters.Size = new System.Drawing.Size(64, 24); + this.numericUpDownMaxCharacters.Size = new System.Drawing.Size(64, 27); this.numericUpDownMaxCharacters.TabIndex = 0; this.numericUpDownMaxCharacters.Value = new decimal(new int[] { 65, @@ -98,9 +98,9 @@ namespace Nikse.SubtitleEdit.Forms // labelMaxCharacters // this.labelMaxCharacters.AutoSize = true; - this.labelMaxCharacters.Location = new System.Drawing.Point(233, 9); + this.labelMaxCharacters.Location = new System.Drawing.Point(187, 9); this.labelMaxCharacters.Name = "labelMaxCharacters"; - this.labelMaxCharacters.Size = new System.Drawing.Size(243, 17); + this.labelMaxCharacters.Size = new System.Drawing.Size(294, 21); this.labelMaxCharacters.TabIndex = 32; this.labelMaxCharacters.Text = "Maximum characters in one paragraph"; // @@ -109,13 +109,13 @@ namespace Nikse.SubtitleEdit.Forms this.labelMaxMillisecondsBetweenLines.AutoSize = true; this.labelMaxMillisecondsBetweenLines.Location = new System.Drawing.Point(483, 9); this.labelMaxMillisecondsBetweenLines.Name = "labelMaxMillisecondsBetweenLines"; - this.labelMaxMillisecondsBetweenLines.Size = new System.Drawing.Size(226, 17); + this.labelMaxMillisecondsBetweenLines.Size = new System.Drawing.Size(284, 21); this.labelMaxMillisecondsBetweenLines.TabIndex = 33; this.labelMaxMillisecondsBetweenLines.Text = "Maximum milliseconds between lines"; // // numericUpDownMaxMillisecondsBetweenLines // - this.numericUpDownMaxMillisecondsBetweenLines.Location = new System.Drawing.Point(486, 25); + this.numericUpDownMaxMillisecondsBetweenLines.Location = new System.Drawing.Point(486, 26); this.numericUpDownMaxMillisecondsBetweenLines.Maximum = new decimal(new int[] { 2000, 0, @@ -127,7 +127,7 @@ namespace Nikse.SubtitleEdit.Forms 0, 0}); this.numericUpDownMaxMillisecondsBetweenLines.Name = "numericUpDownMaxMillisecondsBetweenLines"; - this.numericUpDownMaxMillisecondsBetweenLines.Size = new System.Drawing.Size(64, 24); + this.numericUpDownMaxMillisecondsBetweenLines.Size = new System.Drawing.Size(64, 27); this.numericUpDownMaxMillisecondsBetweenLines.TabIndex = 2; this.numericUpDownMaxMillisecondsBetweenLines.Value = new decimal(new int[] { 250, @@ -201,14 +201,14 @@ namespace Nikse.SubtitleEdit.Forms // // MergeShortLines // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(776, 585); + this.Controls.Add(this.numericUpDownMaxCharacters); this.Controls.Add(this.groupBoxLinesFound); this.Controls.Add(this.numericUpDownMaxMillisecondsBetweenLines); this.Controls.Add(this.labelMaxMillisecondsBetweenLines); this.Controls.Add(this.labelMaxCharacters); - this.Controls.Add(this.numericUpDownMaxCharacters); this.Controls.Add(this.SubtitleListview1); this.Controls.Add(this.buttonOK); this.Controls.Add(this.buttonCancel); diff --git a/src/Forms/MultipleReplace.Designer.cs b/src/Forms/MultipleReplace.Designer.cs index a7f36d75a..1d3483d4d 100644 --- a/src/Forms/MultipleReplace.Designer.cs +++ b/src/Forms/MultipleReplace.Designer.cs @@ -30,14 +30,14 @@ { this.components = new System.ComponentModel.Container(); this.groupBoxLinesFound = new System.Windows.Forms.GroupBox(); + this.buttonReplacesInverseSelection = new System.Windows.Forms.Button(); + this.buttonReplacesSelectAll = new System.Windows.Forms.Button(); this.listViewFixes = new System.Windows.Forms.ListView(); this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader7 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader8 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.groupBoxReplaces = new System.Windows.Forms.GroupBox(); - this.buttonReplacesSelectAll = new System.Windows.Forms.Button(); - this.buttonReplacesInverseSelection = new System.Windows.Forms.Button(); this.buttonUpdate = new System.Windows.Forms.Button(); this.buttonAdd = new System.Windows.Forms.Button(); this.labelFindWhat = new System.Windows.Forms.Label(); @@ -75,11 +75,35 @@ this.groupBoxLinesFound.Controls.Add(this.listViewFixes); this.groupBoxLinesFound.Location = new System.Drawing.Point(4, 3); this.groupBoxLinesFound.Name = "groupBoxLinesFound"; - this.groupBoxLinesFound.Size = new System.Drawing.Size(926, 314); + this.groupBoxLinesFound.Size = new System.Drawing.Size(926, 315); this.groupBoxLinesFound.TabIndex = 8; this.groupBoxLinesFound.TabStop = false; this.groupBoxLinesFound.Text = "Lines found: {0}"; // + // buttonReplacesInverseSelection + // + this.buttonReplacesInverseSelection.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonReplacesInverseSelection.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.buttonReplacesInverseSelection.Location = new System.Drawing.Point(91, 287); + this.buttonReplacesInverseSelection.Name = "buttonReplacesInverseSelection"; + this.buttonReplacesInverseSelection.Size = new System.Drawing.Size(100, 21); + this.buttonReplacesInverseSelection.TabIndex = 106; + this.buttonReplacesInverseSelection.Text = "&Inverse selection"; + this.buttonReplacesInverseSelection.UseVisualStyleBackColor = true; + this.buttonReplacesInverseSelection.Click += new System.EventHandler(this.buttonReplacesInverseSelection_Click); + // + // buttonReplacesSelectAll + // + this.buttonReplacesSelectAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonReplacesSelectAll.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.buttonReplacesSelectAll.Location = new System.Drawing.Point(10, 287); + this.buttonReplacesSelectAll.Name = "buttonReplacesSelectAll"; + this.buttonReplacesSelectAll.Size = new System.Drawing.Size(75, 21); + this.buttonReplacesSelectAll.TabIndex = 105; + this.buttonReplacesSelectAll.Text = "Select &all"; + this.buttonReplacesSelectAll.UseVisualStyleBackColor = true; + this.buttonReplacesSelectAll.Click += new System.EventHandler(this.buttonReplacesSelectAll_Click); + // // listViewFixes // this.listViewFixes.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -125,15 +149,15 @@ this.groupBoxReplaces.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.groupBoxReplaces.Controls.Add(this.textBoxFind); + this.groupBoxReplaces.Controls.Add(this.textBoxReplace); this.groupBoxReplaces.Controls.Add(this.buttonUpdate); this.groupBoxReplaces.Controls.Add(this.buttonAdd); this.groupBoxReplaces.Controls.Add(this.labelFindWhat); this.groupBoxReplaces.Controls.Add(this.labelReplaceWith); - this.groupBoxReplaces.Controls.Add(this.textBoxReplace); this.groupBoxReplaces.Controls.Add(this.radioButtonRegEx); this.groupBoxReplaces.Controls.Add(this.radioButtonCaseSensitive); this.groupBoxReplaces.Controls.Add(this.radioButtonNormal); - this.groupBoxReplaces.Controls.Add(this.textBoxFind); this.groupBoxReplaces.Controls.Add(this.listViewReplaceList); this.groupBoxReplaces.Location = new System.Drawing.Point(8, 3); this.groupBoxReplaces.Name = "groupBoxReplaces"; @@ -141,30 +165,6 @@ this.groupBoxReplaces.TabIndex = 0; this.groupBoxReplaces.TabStop = false; // - // buttonReplacesSelectAll - // - this.buttonReplacesSelectAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonReplacesSelectAll.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.buttonReplacesSelectAll.Location = new System.Drawing.Point(10, 287); - this.buttonReplacesSelectAll.Name = "buttonReplacesSelectAll"; - this.buttonReplacesSelectAll.Size = new System.Drawing.Size(75, 21); - this.buttonReplacesSelectAll.TabIndex = 105; - this.buttonReplacesSelectAll.Text = "Select &all"; - this.buttonReplacesSelectAll.UseVisualStyleBackColor = true; - this.buttonReplacesSelectAll.Click += new System.EventHandler(this.buttonReplacesSelectAll_Click); - // - // buttonReplacesInverseSelection - // - this.buttonReplacesInverseSelection.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonReplacesInverseSelection.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.buttonReplacesInverseSelection.Location = new System.Drawing.Point(91, 287); - this.buttonReplacesInverseSelection.Name = "buttonReplacesInverseSelection"; - this.buttonReplacesInverseSelection.Size = new System.Drawing.Size(100, 21); - this.buttonReplacesInverseSelection.TabIndex = 106; - this.buttonReplacesInverseSelection.Text = "&Inverse selection"; - this.buttonReplacesInverseSelection.UseVisualStyleBackColor = true; - this.buttonReplacesInverseSelection.Click += new System.EventHandler(this.buttonReplacesInverseSelection_Click); - // // buttonUpdate // this.buttonUpdate.Location = new System.Drawing.Point(588, 35); @@ -188,18 +188,18 @@ // labelFindWhat // this.labelFindWhat.AutoSize = true; - this.labelFindWhat.Location = new System.Drawing.Point(17, 18); + this.labelFindWhat.Location = new System.Drawing.Point(17, 16); this.labelFindWhat.Name = "labelFindWhat"; - this.labelFindWhat.Size = new System.Drawing.Size(72, 17); + this.labelFindWhat.Size = new System.Drawing.Size(89, 21); this.labelFindWhat.TabIndex = 22; this.labelFindWhat.Text = "Find what:"; // // labelReplaceWith // this.labelReplaceWith.AutoSize = true; - this.labelReplaceWith.Location = new System.Drawing.Point(247, 18); + this.labelReplaceWith.Location = new System.Drawing.Point(247, 16); this.labelReplaceWith.Name = "labelReplaceWith"; - this.labelReplaceWith.Size = new System.Drawing.Size(89, 17); + this.labelReplaceWith.Size = new System.Drawing.Size(112, 21); this.labelReplaceWith.TabIndex = 21; this.labelReplaceWith.Text = "Replace with:"; // @@ -207,16 +207,16 @@ // this.textBoxReplace.Location = new System.Drawing.Point(250, 35); this.textBoxReplace.Name = "textBoxReplace"; - this.textBoxReplace.Size = new System.Drawing.Size(227, 24); + this.textBoxReplace.Size = new System.Drawing.Size(227, 27); this.textBoxReplace.TabIndex = 2; this.textBoxReplace.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBoxReplaceKeyDown); // // radioButtonRegEx // this.radioButtonRegEx.AutoSize = true; - this.radioButtonRegEx.Location = new System.Drawing.Point(205, 61); + this.radioButtonRegEx.Location = new System.Drawing.Point(251, 62); this.radioButtonRegEx.Name = "radioButtonRegEx"; - this.radioButtonRegEx.Size = new System.Drawing.Size(69, 21); + this.radioButtonRegEx.Size = new System.Drawing.Size(82, 25); this.radioButtonRegEx.TabIndex = 6; this.radioButtonRegEx.Text = "RegEx"; this.radioButtonRegEx.UseVisualStyleBackColor = true; @@ -225,9 +225,9 @@ // radioButtonCaseSensitive // this.radioButtonCaseSensitive.AutoSize = true; - this.radioButtonCaseSensitive.Location = new System.Drawing.Point(94, 61); + this.radioButtonCaseSensitive.Location = new System.Drawing.Point(111, 62); this.radioButtonCaseSensitive.Name = "radioButtonCaseSensitive"; - this.radioButtonCaseSensitive.Size = new System.Drawing.Size(113, 21); + this.radioButtonCaseSensitive.Size = new System.Drawing.Size(141, 25); this.radioButtonCaseSensitive.TabIndex = 5; this.radioButtonCaseSensitive.Text = "Case sensitive"; this.radioButtonCaseSensitive.UseVisualStyleBackColor = true; @@ -237,9 +237,9 @@ // this.radioButtonNormal.AutoSize = true; this.radioButtonNormal.Checked = true; - this.radioButtonNormal.Location = new System.Drawing.Point(22, 61); + this.radioButtonNormal.Location = new System.Drawing.Point(22, 62); this.radioButtonNormal.Name = "radioButtonNormal"; - this.radioButtonNormal.Size = new System.Drawing.Size(72, 21); + this.radioButtonNormal.Size = new System.Drawing.Size(88, 25); this.radioButtonNormal.TabIndex = 4; this.radioButtonNormal.TabStop = true; this.radioButtonNormal.Text = "Normal"; @@ -250,7 +250,7 @@ // this.textBoxFind.Location = new System.Drawing.Point(20, 35); this.textBoxFind.Name = "textBoxFind"; - this.textBoxFind.Size = new System.Drawing.Size(224, 24); + this.textBoxFind.Size = new System.Drawing.Size(224, 27); this.textBoxFind.TabIndex = 1; // // listViewReplaceList @@ -355,7 +355,7 @@ // // MultipleReplace // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(933, 667); this.Controls.Add(this.splitContainer1); diff --git a/src/Forms/RemoveTextFromHearImpaired.Designer.cs b/src/Forms/RemoveTextFromHearImpaired.Designer.cs index 244ed9cf2..ea9b27b94 100644 --- a/src/Forms/RemoveTextFromHearImpaired.Designer.cs +++ b/src/Forms/RemoveTextFromHearImpaired.Designer.cs @@ -58,7 +58,7 @@ // buttonOK // this.buttonOK.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.buttonOK.Location = new System.Drawing.Point(523, 477); + this.buttonOK.Location = new System.Drawing.Point(523, 480); this.buttonOK.Name = "buttonOK"; this.buttonOK.Size = new System.Drawing.Size(75, 21); this.buttonOK.TabIndex = 2; @@ -70,7 +70,7 @@ // this.buttonCancel.Anchor = System.Windows.Forms.AnchorStyles.Bottom; this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.buttonCancel.Location = new System.Drawing.Point(604, 477); + this.buttonCancel.Location = new System.Drawing.Point(604, 480); this.buttonCancel.Name = "buttonCancel"; this.buttonCancel.Size = new System.Drawing.Size(75, 21); this.buttonCancel.TabIndex = 3; @@ -85,7 +85,7 @@ this.groupBoxLinesFound.Controls.Add(this.listViewFixes); this.groupBoxLinesFound.Location = new System.Drawing.Point(12, 222); this.groupBoxLinesFound.Name = "groupBoxLinesFound"; - this.groupBoxLinesFound.Size = new System.Drawing.Size(673, 249); + this.groupBoxLinesFound.Size = new System.Drawing.Size(673, 253); this.groupBoxLinesFound.TabIndex = 1; this.groupBoxLinesFound.TabStop = false; this.groupBoxLinesFound.Text = "Lines found"; @@ -102,9 +102,9 @@ this.columnHeader7, this.columnHeader8}); this.listViewFixes.FullRowSelect = true; - this.listViewFixes.Location = new System.Drawing.Point(6, 15); + this.listViewFixes.Location = new System.Drawing.Point(6, 17); this.listViewFixes.Name = "listViewFixes"; - this.listViewFixes.Size = new System.Drawing.Size(661, 228); + this.listViewFixes.Size = new System.Drawing.Size(661, 230); this.listViewFixes.TabIndex = 0; this.listViewFixes.UseCompatibleStateImageBehavior = false; this.listViewFixes.View = System.Windows.Forms.View.Details; @@ -136,7 +136,7 @@ this.checkBoxRemoveTextBeforeColon.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxRemoveTextBeforeColon.Location = new System.Drawing.Point(241, 26); this.checkBoxRemoveTextBeforeColon.Name = "checkBoxRemoveTextBeforeColon"; - this.checkBoxRemoveTextBeforeColon.Size = new System.Drawing.Size(220, 21); + this.checkBoxRemoveTextBeforeColon.Size = new System.Drawing.Size(265, 25); this.checkBoxRemoveTextBeforeColon.TabIndex = 9; this.checkBoxRemoveTextBeforeColon.Text = "Remove text before a colon (:)"; this.checkBoxRemoveTextBeforeColon.UseVisualStyleBackColor = true; @@ -172,7 +172,7 @@ this.labelRemoveTextBetween.AutoSize = true; this.labelRemoveTextBetween.Location = new System.Drawing.Point(8, 26); this.labelRemoveTextBetween.Name = "labelRemoveTextBetween"; - this.labelRemoveTextBetween.Size = new System.Drawing.Size(144, 17); + this.labelRemoveTextBetween.Size = new System.Drawing.Size(173, 21); this.labelRemoveTextBetween.TabIndex = 13; this.labelRemoveTextBetween.Text = "Remove text between"; // @@ -186,7 +186,7 @@ this.comboBoxRemoveIfTextContains.Location = new System.Drawing.Point(427, 133); this.comboBoxRemoveIfTextContains.MaxLength = 10; this.comboBoxRemoveIfTextContains.Name = "comboBoxRemoveIfTextContains"; - this.comboBoxRemoveIfTextContains.Size = new System.Drawing.Size(100, 25); + this.comboBoxRemoveIfTextContains.Size = new System.Drawing.Size(100, 29); this.comboBoxRemoveIfTextContains.TabIndex = 12; this.comboBoxRemoveIfTextContains.Text = "¶"; this.comboBoxRemoveIfTextContains.TextChanged += new System.EventHandler(this.CheckBoxRemoveTextBetweenCheckedChanged); @@ -196,7 +196,7 @@ this.checkBoxRemoveWhereContains.AutoSize = true; this.checkBoxRemoveWhereContains.Location = new System.Drawing.Point(241, 137); this.checkBoxRemoveWhereContains.Name = "checkBoxRemoveWhereContains"; - this.checkBoxRemoveWhereContains.Size = new System.Drawing.Size(191, 21); + this.checkBoxRemoveWhereContains.Size = new System.Drawing.Size(232, 25); this.checkBoxRemoveWhereContains.TabIndex = 11; this.checkBoxRemoveWhereContains.Text = "Remove text if it contains:"; this.checkBoxRemoveWhereContains.UseVisualStyleBackColor = true; @@ -212,7 +212,7 @@ this.comboBoxCustomEnd.Location = new System.Drawing.Point(116, 135); this.comboBoxCustomEnd.MaxLength = 2; this.comboBoxCustomEnd.Name = "comboBoxCustomEnd"; - this.comboBoxCustomEnd.Size = new System.Drawing.Size(38, 25); + this.comboBoxCustomEnd.Size = new System.Drawing.Size(38, 29); this.comboBoxCustomEnd.TabIndex = 7; this.comboBoxCustomEnd.Text = "¶"; this.comboBoxCustomEnd.TextChanged += new System.EventHandler(this.CheckBoxRemoveTextBetweenCheckedChanged); @@ -227,7 +227,7 @@ this.comboBoxCustomStart.Location = new System.Drawing.Point(41, 135); this.comboBoxCustomStart.MaxLength = 2; this.comboBoxCustomStart.Name = "comboBoxCustomStart"; - this.comboBoxCustomStart.Size = new System.Drawing.Size(38, 25); + this.comboBoxCustomStart.Size = new System.Drawing.Size(38, 29); this.comboBoxCustomStart.TabIndex = 5; this.comboBoxCustomStart.Text = "¶"; this.comboBoxCustomStart.TextChanged += new System.EventHandler(this.CheckBoxRemoveTextBetweenCheckedChanged); @@ -235,9 +235,9 @@ // checkBoxRemoveTextBeforeColonOnlyUppercase // this.checkBoxRemoveTextBeforeColonOnlyUppercase.AutoSize = true; - this.checkBoxRemoveTextBeforeColonOnlyUppercase.Location = new System.Drawing.Point(260, 44); + this.checkBoxRemoveTextBeforeColonOnlyUppercase.Location = new System.Drawing.Point(261, 46); this.checkBoxRemoveTextBeforeColonOnlyUppercase.Name = "checkBoxRemoveTextBeforeColonOnlyUppercase"; - this.checkBoxRemoveTextBeforeColonOnlyUppercase.Size = new System.Drawing.Size(188, 21); + this.checkBoxRemoveTextBeforeColonOnlyUppercase.Size = new System.Drawing.Size(229, 25); this.checkBoxRemoveTextBeforeColonOnlyUppercase.TabIndex = 10; this.checkBoxRemoveTextBeforeColonOnlyUppercase.Text = "Only if text is UPPERCASE"; this.checkBoxRemoveTextBeforeColonOnlyUppercase.UseVisualStyleBackColor = true; @@ -248,7 +248,7 @@ this.checkBoxOnlyIfInSeparateLine.AutoSize = true; this.checkBoxOnlyIfInSeparateLine.Location = new System.Drawing.Point(11, 169); this.checkBoxOnlyIfInSeparateLine.Name = "checkBoxOnlyIfInSeparateLine"; - this.checkBoxOnlyIfInSeparateLine.Size = new System.Drawing.Size(167, 21); + this.checkBoxOnlyIfInSeparateLine.Size = new System.Drawing.Size(207, 25); this.checkBoxOnlyIfInSeparateLine.TabIndex = 8; this.checkBoxOnlyIfInSeparateLine.Text = "Only if on separate line"; this.checkBoxOnlyIfInSeparateLine.UseVisualStyleBackColor = true; @@ -261,7 +261,7 @@ this.checkBoxRemoveTextBetweenCustomTags.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxRemoveTextBetweenCustomTags.Location = new System.Drawing.Point(20, 138); this.checkBoxRemoveTextBetweenCustomTags.Name = "checkBoxRemoveTextBetweenCustomTags"; - this.checkBoxRemoveTextBetweenCustomTags.Size = new System.Drawing.Size(18, 17); + this.checkBoxRemoveTextBetweenCustomTags.Size = new System.Drawing.Size(22, 21); this.checkBoxRemoveTextBetweenCustomTags.TabIndex = 4; this.checkBoxRemoveTextBetweenCustomTags.UseVisualStyleBackColor = true; this.checkBoxRemoveTextBetweenCustomTags.CheckedChanged += new System.EventHandler(this.CheckBoxRemoveTextBetweenCheckedChanged); @@ -273,7 +273,7 @@ this.checkBoxRemoveTextBetweenQuestionMarks.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxRemoveTextBetweenQuestionMarks.Location = new System.Drawing.Point(20, 115); this.checkBoxRemoveTextBetweenQuestionMarks.Name = "checkBoxRemoveTextBetweenQuestionMarks"; - this.checkBoxRemoveTextBetweenQuestionMarks.Size = new System.Drawing.Size(99, 21); + this.checkBoxRemoveTextBetweenQuestionMarks.Size = new System.Drawing.Size(117, 25); this.checkBoxRemoveTextBetweenQuestionMarks.TabIndex = 3; this.checkBoxRemoveTextBetweenQuestionMarks.Text = "\"?\" and \"?\""; this.checkBoxRemoveTextBetweenQuestionMarks.UseVisualStyleBackColor = true; @@ -286,7 +286,7 @@ this.checkBoxRemoveTextBetweenParentheses.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxRemoveTextBetweenParentheses.Location = new System.Drawing.Point(20, 69); this.checkBoxRemoveTextBetweenParentheses.Name = "checkBoxRemoveTextBetweenParentheses"; - this.checkBoxRemoveTextBetweenParentheses.Size = new System.Drawing.Size(95, 21); + this.checkBoxRemoveTextBetweenParentheses.Size = new System.Drawing.Size(115, 25); this.checkBoxRemoveTextBetweenParentheses.TabIndex = 1; this.checkBoxRemoveTextBetweenParentheses.Text = "\"(\" and \")\""; this.checkBoxRemoveTextBetweenParentheses.UseVisualStyleBackColor = true; @@ -299,7 +299,7 @@ this.checkBoxRemoveTextBetweenBrackets.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxRemoveTextBetweenBrackets.Location = new System.Drawing.Point(20, 92); this.checkBoxRemoveTextBetweenBrackets.Name = "checkBoxRemoveTextBetweenBrackets"; - this.checkBoxRemoveTextBetweenBrackets.Size = new System.Drawing.Size(99, 21); + this.checkBoxRemoveTextBetweenBrackets.Size = new System.Drawing.Size(117, 25); this.checkBoxRemoveTextBetweenBrackets.TabIndex = 2; this.checkBoxRemoveTextBetweenBrackets.Text = "\"{\" and \"}\""; this.checkBoxRemoveTextBetweenBrackets.UseVisualStyleBackColor = true; @@ -312,7 +312,7 @@ this.checkBoxRemoveTextBetweenSquares.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxRemoveTextBetweenSquares.Location = new System.Drawing.Point(20, 45); this.checkBoxRemoveTextBetweenSquares.Name = "checkBoxRemoveTextBetweenSquares"; - this.checkBoxRemoveTextBetweenSquares.Size = new System.Drawing.Size(95, 21); + this.checkBoxRemoveTextBetweenSquares.Size = new System.Drawing.Size(115, 25); this.checkBoxRemoveTextBetweenSquares.TabIndex = 0; this.checkBoxRemoveTextBetweenSquares.Text = "\"[\" and \"]\""; this.checkBoxRemoveTextBetweenSquares.UseVisualStyleBackColor = true; @@ -323,15 +323,15 @@ this.labelAnd.AutoSize = true; this.labelAnd.Location = new System.Drawing.Point(85, 141); this.labelAnd.Name = "labelAnd"; - this.labelAnd.Size = new System.Drawing.Size(31, 17); + this.labelAnd.Size = new System.Drawing.Size(37, 21); this.labelAnd.TabIndex = 6; this.labelAnd.Text = "and"; // // FormRemoveTextForHearImpaired // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(697, 503); + this.ClientSize = new System.Drawing.Size(697, 507); this.Controls.Add(this.groupBoxRemoveTextConditions); this.Controls.Add(this.groupBoxLinesFound); this.Controls.Add(this.buttonOK); diff --git a/src/Forms/ReplaceDialog.cs b/src/Forms/ReplaceDialog.cs index 47416781e..f588bed0a 100644 --- a/src/Forms/ReplaceDialog.cs +++ b/src/Forms/ReplaceDialog.cs @@ -26,11 +26,15 @@ namespace Nikse.SubtitleEdit.Forms buttonFind.Text = Configuration.Settings.Language.ReplaceDialog.Find; buttonReplace.Text = Configuration.Settings.Language.ReplaceDialog.Replace; buttonReplaceAll.Text = Configuration.Settings.Language.ReplaceDialog.ReplaceAll; + FixLargeFonts(); } private void FixLargeFonts() { + if (radioButtonRegEx.Left + radioButtonRegEx.Width + 5 > Width) + Width = radioButtonRegEx.Left + radioButtonRegEx.Width + 5; + Graphics graphics = this.CreateGraphics(); SizeF textSize = graphics.MeasureString(buttonReplace.Text, this.Font); if (textSize.Height > buttonReplace.Height - 4) diff --git a/src/Forms/ShowEarlierLater.Designer.cs b/src/Forms/ShowEarlierLater.Designer.cs index d319e9b38..254d81031 100644 --- a/src/Forms/ShowEarlierLater.Designer.cs +++ b/src/Forms/ShowEarlierLater.Designer.cs @@ -42,15 +42,15 @@ namespace Nikse.SubtitleEdit.Forms // labelHoursMinSecsMilliSecs // this.labelHoursMinSecsMilliSecs.AutoSize = true; - this.labelHoursMinSecsMilliSecs.Location = new System.Drawing.Point(11, 7); + this.labelHoursMinSecsMilliSecs.Location = new System.Drawing.Point(11, 6); this.labelHoursMinSecsMilliSecs.Name = "labelHoursMinSecsMilliSecs"; - this.labelHoursMinSecsMilliSecs.Size = new System.Drawing.Size(138, 17); + this.labelHoursMinSecsMilliSecs.Size = new System.Drawing.Size(169, 21); this.labelHoursMinSecsMilliSecs.TabIndex = 18; this.labelHoursMinSecsMilliSecs.Text = "Hours:min:sec.msecs"; // // buttonShowLater // - this.buttonShowLater.Location = new System.Drawing.Point(136, 54); + this.buttonShowLater.Location = new System.Drawing.Point(145, 53); this.buttonShowLater.Name = "buttonShowLater"; this.buttonShowLater.Size = new System.Drawing.Size(119, 21); this.buttonShowLater.TabIndex = 20; @@ -60,7 +60,7 @@ namespace Nikse.SubtitleEdit.Forms // // buttonShowEarlier // - this.buttonShowEarlier.Location = new System.Drawing.Point(136, 27); + this.buttonShowEarlier.Location = new System.Drawing.Point(145, 26); this.buttonShowEarlier.Name = "buttonShowEarlier"; this.buttonShowEarlier.Size = new System.Drawing.Size(120, 21); this.buttonShowEarlier.TabIndex = 19; @@ -73,7 +73,7 @@ namespace Nikse.SubtitleEdit.Forms this.labelTotalAdjustment.AutoSize = true; this.labelTotalAdjustment.Location = new System.Drawing.Point(12, 90); this.labelTotalAdjustment.Name = "labelTotalAdjustment"; - this.labelTotalAdjustment.Size = new System.Drawing.Size(135, 17); + this.labelTotalAdjustment.Size = new System.Drawing.Size(169, 21); this.labelTotalAdjustment.TabIndex = 38; this.labelTotalAdjustment.Text = "labelTotalAdjustment"; // @@ -86,21 +86,21 @@ namespace Nikse.SubtitleEdit.Forms this.timeUpDownAdjust.AutoSize = true; this.timeUpDownAdjust.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.timeUpDownAdjust.Location = new System.Drawing.Point(12, 23); - this.timeUpDownAdjust.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.timeUpDownAdjust.Margin = new System.Windows.Forms.Padding(4); this.timeUpDownAdjust.Name = "timeUpDownAdjust"; - this.timeUpDownAdjust.Size = new System.Drawing.Size(123, 29); + this.timeUpDownAdjust.Size = new System.Drawing.Size(137, 34); this.timeUpDownAdjust.TabIndex = 21; // // ShowEarlierLater // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(272, 113); + this.ClientSize = new System.Drawing.Size(278, 113); + this.Controls.Add(this.buttonShowLater); + this.Controls.Add(this.buttonShowEarlier); this.Controls.Add(this.labelTotalAdjustment); this.Controls.Add(this.timeUpDownAdjust); this.Controls.Add(this.labelHoursMinSecsMilliSecs); - this.Controls.Add(this.buttonShowLater); - this.Controls.Add(this.buttonShowEarlier); this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.KeyPreview = true; diff --git a/src/Forms/SpellCheck.Designer.cs b/src/Forms/SpellCheck.Designer.cs index 5eb7ce4b8..24eff87fd 100644 --- a/src/Forms/SpellCheck.Designer.cs +++ b/src/Forms/SpellCheck.Designer.cs @@ -62,7 +62,7 @@ // // buttonAddToDictionary // - this.buttonAddToDictionary.Location = new System.Drawing.Point(25, 126); + this.buttonAddToDictionary.Location = new System.Drawing.Point(25, 130); this.buttonAddToDictionary.Name = "buttonAddToDictionary"; this.buttonAddToDictionary.Size = new System.Drawing.Size(235, 21); this.buttonAddToDictionary.TabIndex = 7; @@ -72,7 +72,7 @@ // // buttonSkipOnce // - this.buttonSkipOnce.Location = new System.Drawing.Point(23, 72); + this.buttonSkipOnce.Location = new System.Drawing.Point(23, 73); this.buttonSkipOnce.Name = "buttonSkipOnce"; this.buttonSkipOnce.Size = new System.Drawing.Size(117, 21); this.buttonSkipOnce.TabIndex = 4; @@ -86,16 +86,16 @@ this.comboBoxDictionaries.FormattingEnabled = true; this.comboBoxDictionaries.Location = new System.Drawing.Point(317, 30); this.comboBoxDictionaries.Name = "comboBoxDictionaries"; - this.comboBoxDictionaries.Size = new System.Drawing.Size(257, 25); + this.comboBoxDictionaries.Size = new System.Drawing.Size(257, 29); this.comboBoxDictionaries.TabIndex = 8; this.comboBoxDictionaries.SelectedIndexChanged += new System.EventHandler(this.ComboBoxDictionariesSelectedIndexChanged); // // labelLanguage // this.labelLanguage.AutoSize = true; - this.labelLanguage.Location = new System.Drawing.Point(314, 13); + this.labelLanguage.Location = new System.Drawing.Point(314, 12); this.labelLanguage.Name = "labelLanguage"; - this.labelLanguage.Size = new System.Drawing.Size(68, 17); + this.labelLanguage.Size = new System.Drawing.Size(81, 21); this.labelLanguage.TabIndex = 3; this.labelLanguage.Text = "Language"; // @@ -128,19 +128,19 @@ // listBoxSuggestions // this.listBoxSuggestions.FormattingEnabled = true; - this.listBoxSuggestions.ItemHeight = 17; - this.listBoxSuggestions.Location = new System.Drawing.Point(8, 42); + this.listBoxSuggestions.ItemHeight = 21; + this.listBoxSuggestions.Location = new System.Drawing.Point(8, 44); this.listBoxSuggestions.Name = "listBoxSuggestions"; - this.listBoxSuggestions.Size = new System.Drawing.Size(272, 106); + this.listBoxSuggestions.Size = new System.Drawing.Size(272, 88); this.listBoxSuggestions.TabIndex = 11; this.listBoxSuggestions.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.ListBoxSuggestionsMouseDoubleClick); // // labelFullText // this.labelFullText.AutoSize = true; - this.labelFullText.Location = new System.Drawing.Point(8, 16); + this.labelFullText.Location = new System.Drawing.Point(8, 14); this.labelFullText.Name = "labelFullText"; - this.labelFullText.Size = new System.Drawing.Size(56, 17); + this.labelFullText.Size = new System.Drawing.Size(70, 21); this.labelFullText.TabIndex = 7; this.labelFullText.Text = "Full text"; // @@ -148,7 +148,7 @@ // this.textBoxWord.Location = new System.Drawing.Point(23, 19); this.textBoxWord.Name = "textBoxWord"; - this.textBoxWord.Size = new System.Drawing.Size(237, 24); + this.textBoxWord.Size = new System.Drawing.Size(237, 27); this.textBoxWord.TabIndex = 1; // // buttonAbort @@ -163,7 +163,7 @@ // // buttonSkipAll // - this.buttonSkipAll.Location = new System.Drawing.Point(146, 72); + this.buttonSkipAll.Location = new System.Drawing.Point(146, 74); this.buttonSkipAll.Name = "buttonSkipAll"; this.buttonSkipAll.Size = new System.Drawing.Size(114, 21); this.buttonSkipAll.TabIndex = 5; @@ -173,7 +173,7 @@ // // buttonChange // - this.buttonChange.Location = new System.Drawing.Point(23, 45); + this.buttonChange.Location = new System.Drawing.Point(23, 46); this.buttonChange.Name = "buttonChange"; this.buttonChange.Size = new System.Drawing.Size(117, 21); this.buttonChange.TabIndex = 2; @@ -193,7 +193,7 @@ // // buttonChangeAll // - this.buttonChangeAll.Location = new System.Drawing.Point(146, 45); + this.buttonChangeAll.Location = new System.Drawing.Point(146, 46); this.buttonChangeAll.Name = "buttonChangeAll"; this.buttonChangeAll.Size = new System.Drawing.Size(114, 21); this.buttonChangeAll.TabIndex = 3; @@ -213,7 +213,7 @@ // // buttonAddToNames // - this.buttonAddToNames.Location = new System.Drawing.Point(25, 99); + this.buttonAddToNames.Location = new System.Drawing.Point(25, 102); this.buttonAddToNames.Name = "buttonAddToNames"; this.buttonAddToNames.Size = new System.Drawing.Size(235, 21); this.buttonAddToNames.TabIndex = 6; @@ -239,10 +239,10 @@ // // groupBoxSuggestions // - this.groupBoxSuggestions.Controls.Add(this.checkBoxAutoChangeNames); this.groupBoxSuggestions.Controls.Add(this.buttonUseSuggestion); - this.groupBoxSuggestions.Controls.Add(this.listBoxSuggestions); this.groupBoxSuggestions.Controls.Add(this.buttonUseSuggestionAlways); + this.groupBoxSuggestions.Controls.Add(this.checkBoxAutoChangeNames); + this.groupBoxSuggestions.Controls.Add(this.listBoxSuggestions); this.groupBoxSuggestions.Location = new System.Drawing.Point(309, 120); this.groupBoxSuggestions.Name = "groupBoxSuggestions"; this.groupBoxSuggestions.Size = new System.Drawing.Size(286, 182); @@ -255,7 +255,7 @@ this.checkBoxAutoChangeNames.AutoSize = true; this.checkBoxAutoChangeNames.Location = new System.Drawing.Point(8, 157); this.checkBoxAutoChangeNames.Name = "checkBoxAutoChangeNames"; - this.checkBoxAutoChangeNames.Size = new System.Drawing.Size(275, 21); + this.checkBoxAutoChangeNames.Size = new System.Drawing.Size(328, 25); this.checkBoxAutoChangeNames.TabIndex = 12; this.checkBoxAutoChangeNames.Text = "Auto fix names where only casing differ"; this.checkBoxAutoChangeNames.UseVisualStyleBackColor = true; @@ -314,16 +314,16 @@ // // SpellCheck // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(605, 341); + this.Controls.Add(this.richTextBoxParagraph); + this.Controls.Add(this.comboBoxDictionaries); this.Controls.Add(this.buttonEditWholeText); this.Controls.Add(this.groupBoxSuggestions); this.Controls.Add(this.buttonAbort); this.Controls.Add(this.labelFullText); - this.Controls.Add(this.richTextBoxParagraph); this.Controls.Add(this.labelLanguage); - this.Controls.Add(this.comboBoxDictionaries); this.Controls.Add(this.groupBoxWordNotFound); this.Controls.Add(this.groupBoxEditWholeText); this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); diff --git a/src/Forms/SplitSubtitle.Designer.cs b/src/Forms/SplitSubtitle.Designer.cs index 2ce83e5fc..ae0bf3a1b 100644 --- a/src/Forms/SplitSubtitle.Designer.cs +++ b/src/Forms/SplitSubtitle.Designer.cs @@ -41,7 +41,7 @@ // // buttonGetFrameRate // - this.buttonGetFrameRate.Location = new System.Drawing.Point(167, 99); + this.buttonGetFrameRate.Location = new System.Drawing.Point(176, 99); this.buttonGetFrameRate.Name = "buttonGetFrameRate"; this.buttonGetFrameRate.Size = new System.Drawing.Size(24, 22); this.buttonGetFrameRate.TabIndex = 8; @@ -76,7 +76,7 @@ this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(39, 30); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(272, 17); + this.label1.Size = new System.Drawing.Size(331, 21); this.label1.TabIndex = 19; this.label1.Text = "Enter length of first part of video or browse"; // @@ -85,7 +85,7 @@ this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(39, 45); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(191, 17); + this.label2.Size = new System.Drawing.Size(233, 21); this.label2.TabIndex = 20; this.label2.Text = "and get length from video file:"; // @@ -98,7 +98,7 @@ this.labelHoursMinSecsMilliSecs.AutoSize = true; this.labelHoursMinSecsMilliSecs.Location = new System.Drawing.Point(41, 79); this.labelHoursMinSecsMilliSecs.Name = "labelHoursMinSecsMilliSecs"; - this.labelHoursMinSecsMilliSecs.Size = new System.Drawing.Size(138, 17); + this.labelHoursMinSecsMilliSecs.Size = new System.Drawing.Size(169, 21); this.labelHoursMinSecsMilliSecs.TabIndex = 22; this.labelHoursMinSecsMilliSecs.Text = "Hours:min:sec.msecs"; // @@ -107,23 +107,23 @@ this.splitTimeUpDownAdjust.AutoSize = true; this.splitTimeUpDownAdjust.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.splitTimeUpDownAdjust.Location = new System.Drawing.Point(42, 97); - this.splitTimeUpDownAdjust.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.splitTimeUpDownAdjust.Margin = new System.Windows.Forms.Padding(4); this.splitTimeUpDownAdjust.Name = "splitTimeUpDownAdjust"; - this.splitTimeUpDownAdjust.Size = new System.Drawing.Size(123, 29); + this.splitTimeUpDownAdjust.Size = new System.Drawing.Size(137, 34); this.splitTimeUpDownAdjust.TabIndex = 21; // // SplitSubtitle // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(325, 182); - this.Controls.Add(this.labelHoursMinSecsMilliSecs); + this.Controls.Add(this.buttonGetFrameRate); this.Controls.Add(this.splitTimeUpDownAdjust); + this.Controls.Add(this.labelHoursMinSecsMilliSecs); this.Controls.Add(this.label2); this.Controls.Add(this.label1); this.Controls.Add(this.buttonDone); this.Controls.Add(this.buttonSplit); - this.Controls.Add(this.buttonGetFrameRate); this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.KeyPreview = true; diff --git a/src/Forms/SplitSubtitle.cs b/src/Forms/SplitSubtitle.cs index c96cbfac7..46e090a70 100644 --- a/src/Forms/SplitSubtitle.cs +++ b/src/Forms/SplitSubtitle.cs @@ -31,6 +31,11 @@ namespace Nikse.SubtitleEdit.Forms private void FixLargeFonts() { + label2.Top = label1.Top + label1.Height; + + if (label1.Left + label1.Width + 5 > Width) + Width = label1.Left + label1.Width + 5; + Graphics graphics = this.CreateGraphics(); SizeF textSize = graphics.MeasureString(buttonSplit.Text, this.Font); if (textSize.Height > buttonSplit.Height - 4) diff --git a/src/Forms/StartNumberingFrom.Designer.cs b/src/Forms/StartNumberingFrom.Designer.cs index 98af3a33d..fa5bebea6 100644 --- a/src/Forms/StartNumberingFrom.Designer.cs +++ b/src/Forms/StartNumberingFrom.Designer.cs @@ -37,9 +37,9 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(24, 25); + this.label1.Location = new System.Drawing.Point(24, 23); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(99, 13); + this.label1.Size = new System.Drawing.Size(152, 21); this.label1.TabIndex = 1; this.label1.Text = "Start from number:"; // @@ -47,7 +47,7 @@ // this.textBox1.Location = new System.Drawing.Point(27, 41); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(104, 21); + this.textBox1.Size = new System.Drawing.Size(104, 27); this.textBox1.TabIndex = 0; this.textBox1.Text = "1"; this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBox1KeyDown); @@ -74,9 +74,9 @@ // // StartNumberingFrom // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(218, 105); + this.ClientSize = new System.Drawing.Size(261, 113); this.Controls.Add(this.buttonOK); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.textBox1); diff --git a/src/Forms/VisualSync.Designer.cs b/src/Forms/VisualSync.Designer.cs index 596ab43f1..65339bbef 100644 --- a/src/Forms/VisualSync.Designer.cs +++ b/src/Forms/VisualSync.Designer.cs @@ -188,7 +188,7 @@ namespace Nikse.SubtitleEdit.Forms this.comboBoxStartTexts.FormattingEnabled = true; this.comboBoxStartTexts.Location = new System.Drawing.Point(7, 10); this.comboBoxStartTexts.Name = "comboBoxStartTexts"; - this.comboBoxStartTexts.Size = new System.Drawing.Size(422, 25); + this.comboBoxStartTexts.Size = new System.Drawing.Size(422, 21); this.comboBoxStartTexts.TabIndex = 0; // // groupBoxEndScene @@ -288,7 +288,7 @@ namespace Nikse.SubtitleEdit.Forms this.comboBoxEndTexts.FormattingEnabled = true; this.comboBoxEndTexts.Location = new System.Drawing.Point(7, 10); this.comboBoxEndTexts.Name = "comboBoxEndTexts"; - this.comboBoxEndTexts.Size = new System.Drawing.Size(422, 25); + this.comboBoxEndTexts.Size = new System.Drawing.Size(422, 21); this.comboBoxEndTexts.TabIndex = 0; // // buttonCancel @@ -307,7 +307,7 @@ namespace Nikse.SubtitleEdit.Forms this.labelVideoInfo.AutoSize = true; this.labelVideoInfo.Location = new System.Drawing.Point(6, 16); this.labelVideoInfo.Name = "labelVideoInfo"; - this.labelVideoInfo.Size = new System.Drawing.Size(106, 17); + this.labelVideoInfo.Size = new System.Drawing.Size(84, 13); this.labelVideoInfo.TabIndex = 13; this.labelVideoInfo.Text = "No video loaded"; // @@ -345,19 +345,19 @@ namespace Nikse.SubtitleEdit.Forms this.labelTip.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.labelTip.AutoSize = true; this.labelTip.ForeColor = System.Drawing.Color.Silver; - this.labelTip.Location = new System.Drawing.Point(12, 472); + this.labelTip.Location = new System.Drawing.Point(12, 468); this.labelTip.Name = "labelTip"; - this.labelTip.Size = new System.Drawing.Size(423, 17); + this.labelTip.Size = new System.Drawing.Size(332, 13); this.labelTip.TabIndex = 15; this.labelTip.Text = "Tip: Use keys to move 100 ms back/forward"; // // VisualSync // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(927, 525); - this.Controls.Add(this.labelTip); this.Controls.Add(this.buttonSync); + this.Controls.Add(this.labelTip); this.Controls.Add(this.groupBoxMovieInfo); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.groupBoxEndScene); diff --git a/src/Properties/Manifest.manifest b/src/Properties/Manifest.manifest new file mode 100644 index 000000000..1b38d6511 --- /dev/null +++ b/src/Properties/Manifest.manifest @@ -0,0 +1,44 @@ + + + + SubtitleEdit + + + + + + + + + + + + + + + + + + + + + true + + + diff --git a/src/SubtitleEdit.csproj b/src/SubtitleEdit.csproj index ba82a86af..9cb8ba74e 100644 --- a/src/SubtitleEdit.csproj +++ b/src/SubtitleEdit.csproj @@ -71,6 +71,9 @@ LocalIntranet + + Properties\Manifest.manifest + False @@ -772,6 +775,7 @@ SyncPointsSync.cs + SettingsSingleFileGenerator Settings.Designer.cs @@ -896,6 +900,7 @@ +