Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-27 22:42:38 +01:00
Code Issues Projects Releases Wiki Activity

Remember some settings from "File -> Import text"

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1716 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2013-03-10 11:01:49 +00:00
parent 3692755863
commit 4556196db6
4 changed files with 114 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
src/Forms/ImportText.Designer.cs generated
View File

@ -32,14 +32,16 @@
this.groupBoxImportText = new System.Windows.Forms.GroupBox();
this.textBoxText = new System.Windows.Forms.TextBox();
this.groupBoxImportOptions = new System.Windows.Forms.GroupBox();
this.checkBoxMergeShortLines = new System.Windows.Forms.CheckBox();
this.checkBoxGenerateTimeCodes = new System.Windows.Forms.CheckBox();
this.groupBoxTimeCodes = new System.Windows.Forms.GroupBox();
this.labelGapBetweenSubtitles = new System.Windows.Forms.Label();
this.numericUpDownGapBetweenLines = new System.Windows.Forms.NumericUpDown();
this.groupBoxDuration = new System.Windows.Forms.GroupBox();
this.numericUpDownDurationFixed = new System.Windows.Forms.NumericUpDown();
this.radioButtonDurationFixed = new System.Windows.Forms.RadioButton();
this.radioButtonDurationAuto = new System.Windows.Forms.RadioButton();
this.checkBoxMergeShortLines = new System.Windows.Forms.CheckBox();
this.buttonRefresh = new System.Windows.Forms.Button();
this.numericUpDownGapBetweenLines = new System.Windows.Forms.NumericUpDown();
this.labelGapBetweenSubtitles = new System.Windows.Forms.Label();
this.checkBoxRemoveLinesWithoutLetters = new System.Windows.Forms.CheckBox();
this.groupBoxSplitting = new System.Windows.Forms.GroupBox();
this.radioButtonSplitAtBlankLines = new System.Windows.Forms.RadioButton();
@ -51,16 +53,14 @@
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
this.buttonCancel = new System.Windows.Forms.Button();
this.buttonOK = new System.Windows.Forms.Button();
this.groupBoxTimeCodes = new System.Windows.Forms.GroupBox();
this.checkBoxGenerateTimeCodes = new System.Windows.Forms.CheckBox();
this.groupBoxImportText.SuspendLayout();
this.groupBoxImportOptions.SuspendLayout();
this.groupBoxTimeCodes.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownGapBetweenLines)).BeginInit();
this.groupBoxDuration.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownDurationFixed)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownGapBetweenLines)).BeginInit();
this.groupBoxSplitting.SuspendLayout();
this.groupBoxImportResult.SuspendLayout();
this.groupBoxTimeCodes.SuspendLayout();
this.SuspendLayout();
//
// buttonOpenText
@ -120,18 +120,61 @@
this.groupBoxImportOptions.TabStop = false;
this.groupBoxImportOptions.Text = "Import options";
//
// checkBoxMergeShortLines
// checkBoxGenerateTimeCodes
//
this.checkBoxMergeShortLines.AutoSize = true;
this.checkBoxMergeShortLines.Checked = true;
this.checkBoxMergeShortLines.CheckState = System.Windows.Forms.CheckState.Checked;
this.checkBoxMergeShortLines.Location = new System.Drawing.Point(19, 98);
this.checkBoxMergeShortLines.Name = "checkBoxMergeShortLines";
this.checkBoxMergeShortLines.Size = new System.Drawing.Size(193, 17);
this.checkBoxMergeShortLines.TabIndex = 1;
this.checkBoxMergeShortLines.Text = "Merge short lines with continuation";
this.checkBoxMergeShortLines.UseVisualStyleBackColor = true;
this.checkBoxMergeShortLines.CheckedChanged += new System.EventHandler(this.CheckBoxMergeShortLinesCheckedChanged);
this.checkBoxGenerateTimeCodes.AutoSize = true;
this.checkBoxGenerateTimeCodes.Location = new System.Drawing.Point(19, 167);
this.checkBoxGenerateTimeCodes.Name = "checkBoxGenerateTimeCodes";
this.checkBoxGenerateTimeCodes.Size = new System.Drawing.Size(124, 17);
this.checkBoxGenerateTimeCodes.TabIndex = 4;
this.checkBoxGenerateTimeCodes.Text = "Generate time codes";
this.checkBoxGenerateTimeCodes.UseVisualStyleBackColor = true;
this.checkBoxGenerateTimeCodes.CheckedChanged += new System.EventHandler(this.checkBoxGenerateTimeCodes_CheckedChanged);
//
// groupBoxTimeCodes
//
this.groupBoxTimeCodes.Controls.Add(this.labelGapBetweenSubtitles);
this.groupBoxTimeCodes.Controls.Add(this.numericUpDownGapBetweenLines);
this.groupBoxTimeCodes.Controls.Add(this.groupBoxDuration);
this.groupBoxTimeCodes.Enabled = false;
this.groupBoxTimeCodes.Location = new System.Drawing.Point(6, 192);
this.groupBoxTimeCodes.Name = "groupBoxTimeCodes";
this.groupBoxTimeCodes.Size = new System.Drawing.Size(329, 126);
this.groupBoxTimeCodes.TabIndex = 5;
this.groupBoxTimeCodes.TabStop = false;
this.groupBoxTimeCodes.Text = "Time codes";
//
// labelGapBetweenSubtitles
//
this.labelGapBetweenSubtitles.AutoSize = true;
this.labelGapBetweenSubtitles.Location = new System.Drawing.Point(6, 23);
this.labelGapBetweenSubtitles.Name = "labelGapBetweenSubtitles";
this.labelGapBetweenSubtitles.Size = new System.Drawing.Size(180, 13);
this.labelGapBetweenSubtitles.TabIndex = 0;
this.labelGapBetweenSubtitles.Text = "Gap between subtitles (milliseconds)";
//
// numericUpDownGapBetweenLines
//
this.numericUpDownGapBetweenLines.Location = new System.Drawing.Point(192, 20);
this.numericUpDownGapBetweenLines.Maximum = new decimal(new int[] {
100000,
0,
0,
0});
this.numericUpDownGapBetweenLines.Minimum = new decimal(new int[] {
1,
0,
0,
0});
this.numericUpDownGapBetweenLines.Name = "numericUpDownGapBetweenLines";
this.numericUpDownGapBetweenLines.Size = new System.Drawing.Size(64, 21);
this.numericUpDownGapBetweenLines.TabIndex = 1;
this.numericUpDownGapBetweenLines.Value = new decimal(new int[] {
1000,
0,
0,
0});
this.numericUpDownGapBetweenLines.ValueChanged += new System.EventHandler(this.NumericUpDownGapBetweenLinesValueChanged);
//
// groupBoxDuration
//
@ -173,7 +216,7 @@
this.radioButtonDurationFixed.AutoSize = true;
this.radioButtonDurationFixed.Location = new System.Drawing.Point(16, 42);
this.radioButtonDurationFixed.Name = "radioButtonDurationFixed";
this.radioButtonDurationFixed.Size = new System.Drawing.Size(51, 17);
this.radioButtonDurationFixed.Size = new System.Drawing.Size(50, 17);
this.radioButtonDurationFixed.TabIndex = 1;
this.radioButtonDurationFixed.Text = "Fixed";
this.radioButtonDurationFixed.UseVisualStyleBackColor = true;
@ -185,13 +228,26 @@
this.radioButtonDurationAuto.Checked = true;
this.radioButtonDurationAuto.Location = new System.Drawing.Point(16, 19);
this.radioButtonDurationAuto.Name = "radioButtonDurationAuto";
this.radioButtonDurationAuto.Size = new System.Drawing.Size(48, 17);
this.radioButtonDurationAuto.Size = new System.Drawing.Size(47, 17);
this.radioButtonDurationAuto.TabIndex = 0;
this.radioButtonDurationAuto.TabStop = true;
this.radioButtonDurationAuto.Text = "Auto";
this.radioButtonDurationAuto.UseVisualStyleBackColor = true;
this.radioButtonDurationAuto.CheckedChanged += new System.EventHandler(this.RadioButtonDurationAutoCheckedChanged);
//
// checkBoxMergeShortLines
//
this.checkBoxMergeShortLines.AutoSize = true;
this.checkBoxMergeShortLines.Checked = true;
this.checkBoxMergeShortLines.CheckState = System.Windows.Forms.CheckState.Checked;
this.checkBoxMergeShortLines.Location = new System.Drawing.Point(19, 98);
this.checkBoxMergeShortLines.Name = "checkBoxMergeShortLines";
this.checkBoxMergeShortLines.Size = new System.Drawing.Size(189, 17);
this.checkBoxMergeShortLines.TabIndex = 1;
this.checkBoxMergeShortLines.Text = "Merge short lines with continuation";
this.checkBoxMergeShortLines.UseVisualStyleBackColor = true;
this.checkBoxMergeShortLines.CheckedChanged += new System.EventHandler(this.CheckBoxMergeShortLinesCheckedChanged);
//
// buttonRefresh
//
this.buttonRefresh.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@ -203,38 +259,6 @@
this.buttonRefresh.UseVisualStyleBackColor = true;
this.buttonRefresh.Click += new System.EventHandler(this.ButtonRefreshClick);
//
// numericUpDownGapBetweenLines
//
this.numericUpDownGapBetweenLines.Location = new System.Drawing.Point(192, 20);
this.numericUpDownGapBetweenLines.Maximum = new decimal(new int[] {
100000,
0,
0,
0});
this.numericUpDownGapBetweenLines.Minimum = new decimal(new int[] {
1,
0,
0,
0});
this.numericUpDownGapBetweenLines.Name = "numericUpDownGapBetweenLines";
this.numericUpDownGapBetweenLines.Size = new System.Drawing.Size(64, 21);
this.numericUpDownGapBetweenLines.TabIndex = 1;
this.numericUpDownGapBetweenLines.Value = new decimal(new int[] {
1000,
0,
0,
0});
this.numericUpDownGapBetweenLines.ValueChanged += new System.EventHandler(this.NumericUpDownGapBetweenLinesValueChanged);
//
// labelGapBetweenSubtitles
//
this.labelGapBetweenSubtitles.AutoSize = true;
this.labelGapBetweenSubtitles.Location = new System.Drawing.Point(6, 23);
this.labelGapBetweenSubtitles.Name = "labelGapBetweenSubtitles";
this.labelGapBetweenSubtitles.Size = new System.Drawing.Size(180, 13);
this.labelGapBetweenSubtitles.TabIndex = 0;
this.labelGapBetweenSubtitles.Text = "Gap between subtitles (milliseconds)";
//
// checkBoxRemoveLinesWithoutLetters
//
this.checkBoxRemoveLinesWithoutLetters.AutoSize = true;
@ -242,7 +266,7 @@
this.checkBoxRemoveLinesWithoutLetters.CheckState = System.Windows.Forms.CheckState.Checked;
this.checkBoxRemoveLinesWithoutLetters.Location = new System.Drawing.Point(19, 144);
this.checkBoxRemoveLinesWithoutLetters.Name = "checkBoxRemoveLinesWithoutLetters";
this.checkBoxRemoveLinesWithoutLetters.Size = new System.Drawing.Size(162, 17);
this.checkBoxRemoveLinesWithoutLetters.Size = new System.Drawing.Size(158, 17);
this.checkBoxRemoveLinesWithoutLetters.TabIndex = 3;
this.checkBoxRemoveLinesWithoutLetters.Text = "Remove lines without letters";
this.checkBoxRemoveLinesWithoutLetters.UseVisualStyleBackColor = true;
@ -302,7 +326,7 @@
this.checkBoxRemoveEmptyLines.CheckState = System.Windows.Forms.CheckState.Checked;
this.checkBoxRemoveEmptyLines.Location = new System.Drawing.Point(19, 121);
this.checkBoxRemoveEmptyLines.Name = "checkBoxRemoveEmptyLines";
this.checkBoxRemoveEmptyLines.Size = new System.Drawing.Size(122, 17);
this.checkBoxRemoveEmptyLines.Size = new System.Drawing.Size(121, 17);
this.checkBoxRemoveEmptyLines.TabIndex = 2;
this.checkBoxRemoveEmptyLines.Text = "Remove empty lines";
this.checkBoxRemoveEmptyLines.UseVisualStyleBackColor = true;
@ -371,30 +395,6 @@
this.buttonOK.UseVisualStyleBackColor = true;
this.buttonOK.Click += new System.EventHandler(this.ButtonOkClick);
//
// groupBoxTimeCodes
//
this.groupBoxTimeCodes.Controls.Add(this.labelGapBetweenSubtitles);
this.groupBoxTimeCodes.Controls.Add(this.numericUpDownGapBetweenLines);
this.groupBoxTimeCodes.Controls.Add(this.groupBoxDuration);
this.groupBoxTimeCodes.Enabled = false;
this.groupBoxTimeCodes.Location = new System.Drawing.Point(6, 192);
this.groupBoxTimeCodes.Name = "groupBoxTimeCodes";
this.groupBoxTimeCodes.Size = new System.Drawing.Size(329, 126);
this.groupBoxTimeCodes.TabIndex = 5;
this.groupBoxTimeCodes.TabStop = false;
this.groupBoxTimeCodes.Text = "Time codes";
//
// checkBoxGenerateTimeCodes
//
this.checkBoxGenerateTimeCodes.AutoSize = true;
this.checkBoxGenerateTimeCodes.Location = new System.Drawing.Point(19, 167);
this.checkBoxGenerateTimeCodes.Name = "checkBoxGenerateTimeCodes";
this.checkBoxGenerateTimeCodes.Size = new System.Drawing.Size(125, 17);
this.checkBoxGenerateTimeCodes.TabIndex = 4;
this.checkBoxGenerateTimeCodes.Text = "Generate time codes";
this.checkBoxGenerateTimeCodes.UseVisualStyleBackColor = true;
this.checkBoxGenerateTimeCodes.CheckedChanged += new System.EventHandler(this.checkBoxGenerateTimeCodes_CheckedChanged);
//
// ImportText
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -413,20 +413,21 @@
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Import text";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ImportText_FormClosing);
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ImportTextKeyDown);
this.groupBoxImportText.ResumeLayout(false);
this.groupBoxImportText.PerformLayout();
this.groupBoxImportOptions.ResumeLayout(false);
this.groupBoxImportOptions.PerformLayout();
this.groupBoxTimeCodes.ResumeLayout(false);
this.groupBoxTimeCodes.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownGapBetweenLines)).EndInit();
this.groupBoxDuration.ResumeLayout(false);
this.groupBoxDuration.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownDurationFixed)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownGapBetweenLines)).EndInit();
this.groupBoxSplitting.ResumeLayout(false);
this.groupBoxSplitting.PerformLayout();
this.groupBoxImportResult.ResumeLayout(false);
this.groupBoxTimeCodes.ResumeLayout(false);
this.groupBoxTimeCodes.PerformLayout();
this.ResumeLayout(false);
}

19
src/Forms/ImportText.cs
View File

@ -55,6 +55,14 @@ namespace Nikse.SubtitleEdit.Forms
checkBoxGenerateTimeCodes.Visible = false;
}
if (string.IsNullOrEmpty(Configuration.Settings.Tools.ImportTextSplitting))
radioButtonAutoSplit.Checked = true;
else if (Configuration.Settings.Tools.ImportTextSplitting.ToLower() == "blank lines")
radioButtonSplitAtBlankLines.Checked = true;
else if (Configuration.Settings.Tools.ImportTextSplitting.ToLower() == "line")
radioButtonLineMode.Checked = true;
checkBoxMergeShortLines.Checked = Configuration.Settings.Tools.ImportTextMergeShortLines;
numericUpDownDurationFixed.Enabled = radioButtonDurationFixed.Checked;
FixLargeFonts();
_refreshTimer.Interval = 400;
@ -620,5 +628,16 @@ namespace Nikse.SubtitleEdit.Forms
GeneratePreview();
}
private void ImportText_FormClosing(object sender, FormClosingEventArgs e)
{
if (radioButtonSplitAtBlankLines.Checked)
Configuration.Settings.Tools.ImportTextSplitting = "blank lines";
else if (radioButtonLineMode.Checked)
Configuration.Settings.Tools.ImportTextSplitting = "line";
else
Configuration.Settings.Tools.ImportTextSplitting = "auto";
Configuration.Settings.Tools.ImportTextMergeShortLines = checkBoxMergeShortLines.Checked;
}
}
}

2
src/Forms/Main.resx
View File

@ -681,7 +681,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
CAAAAk1TRnQBSQFMAgEBAgEAAeABHQHgAR0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAAegBHQHoAR0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

14
src/Logic/Settings.cs
View File

@ -118,6 +118,8 @@ namespace Nikse.SubtitleEdit.Logic
public string ExportBluRayFontName { get; set; }
public int ExportBluRaybFontSize { get; set; }
public bool FixCommonErrorsFixOverlapAllowEqualEndStart { get; set; }
public string ImportTextSplitting { get; set; }
public bool ImportTextMergeShortLines { get; set; }
public ToolsSettings()
{
@ -1368,7 +1370,13 @@ namespace Nikse.SubtitleEdit.Logic
settings.Tools.ExportBluRaybFontSize = Convert.ToInt32(subNode.InnerText);
subNode = node.SelectSingleNode("FixCommonErrorsFixOverlapAllowEqualEndStart");
if (subNode != null)
settings.Tools.FixCommonErrorsFixOverlapAllowEqualEndStart = Convert.ToBoolean(subNode.InnerText);
settings.Tools.FixCommonErrorsFixOverlapAllowEqualEndStart = Convert.ToBoolean(subNode.InnerText);
subNode = node.SelectSingleNode("ImportTextSplitting");
if (subNode != null)
settings.Tools.ImportTextSplitting = subNode.InnerText;
subNode = node.SelectSingleNode("ImportTextMergeShortLines");
if (subNode != null)
settings.Tools.ImportTextMergeShortLines = Convert.ToBoolean(subNode.InnerText);
settings.SubtitleSettings = new Nikse.SubtitleEdit.Logic.SubtitleSettings();
node = doc.DocumentElement.SelectSingleNode("SubtitleSettings");
@ -2218,7 +2226,9 @@ namespace Nikse.SubtitleEdit.Logic
textWriter.WriteElementString("ExportVobSubFontSize", settings.Tools.ExportVobSubFontSize.ToString());
textWriter.WriteElementString("ExportBluRayFontName", settings.Tools.ExportBluRayFontName);
textWriter.WriteElementString("ExportBluRaybFontSize", settings.Tools.ExportBluRaybFontSize.ToString());
textWriter.WriteElementString("FixCommonErrorsFixOverlapAllowEqualEndStart", settings.Tools.FixCommonErrorsFixOverlapAllowEqualEndStart.ToString());
textWriter.WriteElementString("FixCommonErrorsFixOverlapAllowEqualEndStart", settings.Tools.FixCommonErrorsFixOverlapAllowEqualEndStart.ToString());
textWriter.WriteElementString("ImportTextSplitting", settings.Tools.ImportTextSplitting);
textWriter.WriteElementString("ImportTextMergeShortLines", settings.Tools.ImportTextMergeShortLines.ToString());
textWriter.WriteEndElement();
textWriter.WriteStartElement("SubtitleSettings", "");