Minor UI fixes

This commit is contained in:
niksedk 2023-08-12 21:32:08 +02:00
parent 9f4340dbfa
commit e1690ff3e7
6 changed files with 84 additions and 15 deletions

View File

@ -274,6 +274,7 @@
this.Controls.Add(this.buttonRipWave);
this.Controls.Add(this.labelProgress);
this.Controls.Add(this.groupBoxInput);
this.KeyPreview = true;
this.MinimumSize = new System.Drawing.Size(900, 400);
this.Name = "AddWaveformBatch";
this.ShowIcon = false;

View File

@ -502,7 +502,14 @@ namespace Nikse.SubtitleEdit.Forms
{
if (e.KeyCode == Keys.Escape)
{
_abort = true;
if (_converting)
{
_abort = true;
}
else
{
DialogResult = DialogResult.Cancel;
}
}
}

View File

@ -159,7 +159,7 @@ namespace Nikse.SubtitleEdit.Forms
this.buttonStyles = new System.Windows.Forms.Button();
this.buttonChooseFolder = new System.Windows.Forms.Button();
this.comboBoxSubtitleFormats = new Nikse.SubtitleEdit.Controls.NikseComboBox();
this.textBoxOutputFolder = new System.Windows.Forms.TextBox();
this.textBoxOutputFolder = new Nikse.SubtitleEdit.Controls.SETextBox(true);
this.labelEncoding = new System.Windows.Forms.Label();
this.radioButtonSaveInSourceFolder = new System.Windows.Forms.RadioButton();
this.comboBoxEncoding = new Nikse.SubtitleEdit.Controls.NikseComboBox();
@ -2206,7 +2206,7 @@ namespace Nikse.SubtitleEdit.Forms
private System.Windows.Forms.LinkLabel linkLabelOpenOutputFolder;
private System.Windows.Forms.CheckBox checkBoxOverwrite;
private System.Windows.Forms.Button buttonChooseFolder;
private System.Windows.Forms.TextBox textBoxOutputFolder;
private Nikse.SubtitleEdit.Controls.SETextBox textBoxOutputFolder;
private System.Windows.Forms.RadioButton radioButtonSaveInSourceFolder;
private System.Windows.Forms.ListView listViewConvertOptions;
private System.Windows.Forms.ColumnHeader ActionCheckBox;

View File

@ -105,7 +105,7 @@ namespace Nikse.SubtitleEdit.Forms
this.buttonGenerate.Location = new System.Drawing.Point(549, 249);
this.buttonGenerate.Name = "buttonGenerate";
this.buttonGenerate.Size = new System.Drawing.Size(121, 23);
this.buttonGenerate.TabIndex = 20;
this.buttonGenerate.TabIndex = 91;
this.buttonGenerate.Text = "Generate";
this.buttonGenerate.UseVisualStyleBackColor = true;
this.buttonGenerate.Click += new System.EventHandler(this.buttonGenerate_Click);
@ -115,7 +115,7 @@ namespace Nikse.SubtitleEdit.Forms
this.contextMenuStripGenerate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.promptParameterBeforeGenerateToolStripMenuItem});
this.contextMenuStripGenerate.Name = "contextMenuStripGenerate";
this.contextMenuStripGenerate.Size = new System.Drawing.Size(290, 48);
this.contextMenuStripGenerate.Size = new System.Drawing.Size(290, 26);
//
// promptParameterBeforeGenerateToolStripMenuItem
//
@ -132,7 +132,7 @@ namespace Nikse.SubtitleEdit.Forms
this.buttonCancel.Location = new System.Drawing.Point(676, 249);
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(75, 23);
this.buttonCancel.TabIndex = 21;
this.buttonCancel.TabIndex = 92;
this.buttonCancel.Text = "C&ancel";
this.buttonCancel.UseVisualStyleBackColor = true;
this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
@ -158,6 +158,14 @@ namespace Nikse.SubtitleEdit.Forms
//
// numericUpDownWidth
//
this.numericUpDownWidth.BackColor = System.Drawing.SystemColors.Window;
this.numericUpDownWidth.BackColorDisabled = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
this.numericUpDownWidth.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(171)))), ((int)(((byte)(173)))), ((int)(((byte)(179)))));
this.numericUpDownWidth.BorderColorDisabled = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120)))));
this.numericUpDownWidth.ButtonForeColor = System.Drawing.SystemColors.ControlText;
this.numericUpDownWidth.ButtonForeColorDown = System.Drawing.Color.Orange;
this.numericUpDownWidth.ButtonForeColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(120)))), ((int)(((byte)(215)))));
this.numericUpDownWidth.DecimalPlaces = 0;
this.numericUpDownWidth.Increment = new decimal(new int[] {
2,
0,
@ -177,6 +185,8 @@ namespace Nikse.SubtitleEdit.Forms
this.numericUpDownWidth.Name = "numericUpDownWidth";
this.numericUpDownWidth.Size = new System.Drawing.Size(64, 20);
this.numericUpDownWidth.TabIndex = 2;
this.numericUpDownWidth.TabStop = false;
this.numericUpDownWidth.ThousandsSeparator = false;
this.numericUpDownWidth.Value = new decimal(new int[] {
1280,
0,
@ -186,6 +196,14 @@ namespace Nikse.SubtitleEdit.Forms
//
// numericUpDownHeight
//
this.numericUpDownHeight.BackColor = System.Drawing.SystemColors.Window;
this.numericUpDownHeight.BackColorDisabled = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
this.numericUpDownHeight.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(171)))), ((int)(((byte)(173)))), ((int)(((byte)(179)))));
this.numericUpDownHeight.BorderColorDisabled = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120)))));
this.numericUpDownHeight.ButtonForeColor = System.Drawing.SystemColors.ControlText;
this.numericUpDownHeight.ButtonForeColorDown = System.Drawing.Color.Orange;
this.numericUpDownHeight.ButtonForeColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(120)))), ((int)(((byte)(215)))));
this.numericUpDownHeight.DecimalPlaces = 0;
this.numericUpDownHeight.Increment = new decimal(new int[] {
2,
0,
@ -205,6 +223,8 @@ namespace Nikse.SubtitleEdit.Forms
this.numericUpDownHeight.Name = "numericUpDownHeight";
this.numericUpDownHeight.Size = new System.Drawing.Size(64, 20);
this.numericUpDownHeight.TabIndex = 4;
this.numericUpDownHeight.TabStop = false;
this.numericUpDownHeight.ThousandsSeparator = false;
this.numericUpDownHeight.Value = new decimal(new int[] {
720,
0,
@ -302,6 +322,19 @@ namespace Nikse.SubtitleEdit.Forms
//
// numericUpDownDurationMinutes
//
this.numericUpDownDurationMinutes.BackColor = System.Drawing.SystemColors.Window;
this.numericUpDownDurationMinutes.BackColorDisabled = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
this.numericUpDownDurationMinutes.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(171)))), ((int)(((byte)(173)))), ((int)(((byte)(179)))));
this.numericUpDownDurationMinutes.BorderColorDisabled = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120)))));
this.numericUpDownDurationMinutes.ButtonForeColor = System.Drawing.SystemColors.ControlText;
this.numericUpDownDurationMinutes.ButtonForeColorDown = System.Drawing.Color.Orange;
this.numericUpDownDurationMinutes.ButtonForeColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(120)))), ((int)(((byte)(215)))));
this.numericUpDownDurationMinutes.DecimalPlaces = 0;
this.numericUpDownDurationMinutes.Increment = new decimal(new int[] {
1,
0,
0,
0});
this.numericUpDownDurationMinutes.Location = new System.Drawing.Point(165, 30);
this.numericUpDownDurationMinutes.Maximum = new decimal(new int[] {
1000,
@ -316,6 +349,8 @@ namespace Nikse.SubtitleEdit.Forms
this.numericUpDownDurationMinutes.Name = "numericUpDownDurationMinutes";
this.numericUpDownDurationMinutes.Size = new System.Drawing.Size(64, 20);
this.numericUpDownDurationMinutes.TabIndex = 0;
this.numericUpDownDurationMinutes.TabStop = false;
this.numericUpDownDurationMinutes.ThousandsSeparator = false;
this.numericUpDownDurationMinutes.Value = new decimal(new int[] {
10,
0,
@ -343,10 +378,23 @@ namespace Nikse.SubtitleEdit.Forms
//
// comboBoxFrameRate
//
this.comboBoxFrameRate.BackColor = System.Drawing.SystemColors.Window;
this.comboBoxFrameRate.BackColorDisabled = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
this.comboBoxFrameRate.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(171)))), ((int)(((byte)(173)))), ((int)(((byte)(179)))));
this.comboBoxFrameRate.BorderColorDisabled = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120)))));
this.comboBoxFrameRate.ButtonForeColor = System.Drawing.SystemColors.ControlText;
this.comboBoxFrameRate.ButtonForeColorDown = System.Drawing.Color.Orange;
this.comboBoxFrameRate.ButtonForeColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(120)))), ((int)(((byte)(215)))));
this.comboBoxFrameRate.DropDownHeight = 400;
this.comboBoxFrameRate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxFrameRate.DropDownWidth = 121;
this.comboBoxFrameRate.FormattingEnabled = true;
this.comboBoxFrameRate.Location = new System.Drawing.Point(165, 89);
this.comboBoxFrameRate.MaxLength = 32767;
this.comboBoxFrameRate.Name = "comboBoxFrameRate";
this.comboBoxFrameRate.SelectedIndex = -1;
this.comboBoxFrameRate.SelectedItem = null;
this.comboBoxFrameRate.SelectedText = "";
this.comboBoxFrameRate.Size = new System.Drawing.Size(121, 21);
this.comboBoxFrameRate.TabIndex = 6;
//
@ -517,7 +565,7 @@ namespace Nikse.SubtitleEdit.Forms
this.checkBoxAddTimeCode.Location = new System.Drawing.Point(387, 181);
this.checkBoxAddTimeCode.Name = "checkBoxAddTimeCode";
this.checkBoxAddTimeCode.Size = new System.Drawing.Size(94, 17);
this.checkBoxAddTimeCode.TabIndex = 31;
this.checkBoxAddTimeCode.TabIndex = 9;
this.checkBoxAddTimeCode.Text = "Add time code";
this.checkBoxAddTimeCode.UseVisualStyleBackColor = true;
//

View File

@ -46,6 +46,7 @@ namespace Nikse.SubtitleEdit.Forms
// 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(386, 129);
this.buttonCancel.Name = "buttonCancel";
@ -89,13 +90,25 @@ namespace Nikse.SubtitleEdit.Forms
//
// timeUpDownVideoPosition
//
this.timeUpDownVideoPosition.AutoSize = true;
this.timeUpDownVideoPosition.BackColor = System.Drawing.SystemColors.Window;
this.timeUpDownVideoPosition.BackColorDisabled = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
this.timeUpDownVideoPosition.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(171)))), ((int)(((byte)(173)))), ((int)(((byte)(179)))));
this.timeUpDownVideoPosition.BorderColorDisabled = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120)))));
this.timeUpDownVideoPosition.ButtonForeColor = System.Drawing.SystemColors.ControlText;
this.timeUpDownVideoPosition.ButtonForeColorDown = System.Drawing.Color.Orange;
this.timeUpDownVideoPosition.ButtonForeColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(120)))), ((int)(((byte)(215)))));
this.timeUpDownVideoPosition.Font = new System.Drawing.Font("Segoe UI", 9F);
this.timeUpDownVideoPosition.Increment = new decimal(new int[] {
100,
0,
0,
0});
this.timeUpDownVideoPosition.Location = new System.Drawing.Point(13, 39);
this.timeUpDownVideoPosition.Margin = new System.Windows.Forms.Padding(4);
this.timeUpDownVideoPosition.Name = "timeUpDownVideoPosition";
this.timeUpDownVideoPosition.Size = new System.Drawing.Size(111, 27);
this.timeUpDownVideoPosition.Size = new System.Drawing.Size(111, 23);
this.timeUpDownVideoPosition.TabIndex = 1;
this.timeUpDownVideoPosition.TabStop = false;
timeCode1.Hours = 0;
timeCode1.Milliseconds = 0;
timeCode1.Minutes = 0;

View File

@ -29,7 +29,7 @@
private void InitializeComponent()
{
this.label1 = new System.Windows.Forms.Label();
this.textBox1 = new System.Windows.Forms.TextBox();
this.textBox1 = new Nikse.SubtitleEdit.Controls.SETextBox(true);
this.buttonCancel = new System.Windows.Forms.Button();
this.buttonOK = new System.Windows.Forms.Button();
this.SuspendLayout();
@ -37,7 +37,7 @@
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(24, 23);
this.label1.Location = new System.Drawing.Point(20, 19);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(99, 13);
this.label1.TabIndex = 1;
@ -45,7 +45,7 @@
//
// textBox1
//
this.textBox1.Location = new System.Drawing.Point(27, 41);
this.textBox1.Location = new System.Drawing.Point(23, 37);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(104, 21);
this.textBox1.TabIndex = 0;
@ -55,7 +55,7 @@
// buttonCancel
//
this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.buttonCancel.Location = new System.Drawing.Point(113, 78);
this.buttonCancel.Location = new System.Drawing.Point(174, 78);
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(75, 23);
this.buttonCancel.TabIndex = 2;
@ -64,7 +64,7 @@
//
// buttonOK
//
this.buttonOK.Location = new System.Drawing.Point(31, 78);
this.buttonOK.Location = new System.Drawing.Point(93, 78);
this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(75, 23);
this.buttonOK.TabIndex = 1;
@ -99,7 +99,7 @@
#endregion
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox textBox1;
private Nikse.SubtitleEdit.Controls.SETextBox textBox1;
private System.Windows.Forms.Button buttonCancel;
private System.Windows.Forms.Button buttonOK;
}