Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-28 15:02:35 +01:00
Code Issues Projects Releases Wiki Activity

Remembers more settings from export (to image based formats) window: Horizontal alignment + 3d stuff

Browse Source
This commit is contained in:
niksedk 2014-03-14 16:16:07 +01:00
parent d0e19374fb
commit d42568d895
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Forms/ExportPngXml.cs
View File

@ -2332,7 +2332,7 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
for (int i=0; i<1000; i++)
comboBoxBottomMargin.Items.Add(i);
if (Configuration.Settings.Tools.ExportBottomMargin >= 0 && Configuration.Settings.Tools.ExportBottomMargin < comboBoxBottomMargin.Items.Count)
comboBoxBottomMargin.SelectedIndex = Configuration.Settings.Tools.ExportBottomMargin;
comboBoxBottomMargin.SelectedIndex = Configuration.Settings.Tools.ExportBottomMargin;
if (exportType == "BLURAYSUP" || exportType == "IMAGE/FRAME" && Configuration.Settings.Tools.ExportBluRayBottomMargin >= 0 && Configuration.Settings.Tools.ExportBluRayBottomMargin < comboBoxBottomMargin.Items.Count)
comboBoxBottomMargin.SelectedIndex = Configuration.Settings.Tools.ExportBluRayBottomMargin;
@ -2386,6 +2386,14 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
}
checkBoxBold.Checked = Configuration.Settings.Tools.ExportLastFontBold;
if (Configuration.Settings.Tools.Export3DType >= 0 && Configuration.Settings.Tools.Export3DType < comboBox3D.Items.Count)
comboBox3D.SelectedIndex = Configuration.Settings.Tools.Export3DType;
if (Configuration.Settings.Tools.Export3DDepth >= numericUpDownDepth3D.Minimum && Configuration.Settings.Tools.Export3DDepth <= numericUpDownDepth3D.Maximum)
numericUpDownDepth3D.Value = Configuration.Settings.Tools.Export3DDepth;
if (Configuration.Settings.Tools.ExportHorizontalAlignment >= 0 && Configuration.Settings.Tools.ExportHorizontalAlignment < comboBoxHAlign.Items.Count)
comboBoxHAlign.SelectedIndex = Configuration.Settings.Tools.ExportHorizontalAlignment;
subtitleListView1.Fill(_subtitle);
subtitleListView1.SelectIndexAndEnsureVisible(0);
}
@ -2665,6 +2673,10 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
else
Configuration.Settings.Tools.ExportBottomMargin = comboBoxBottomMargin.SelectedIndex;
Configuration.Settings.Tools.ExportHorizontalAlignment = comboBoxHAlign.SelectedIndex;
Configuration.Settings.Tools.Export3DType = comboBox3D.SelectedIndex;
Configuration.Settings.Tools.Export3DDepth = (int)numericUpDownDepth3D.Value;
if (comboBoxShadowWidth.Visible)
Configuration.Settings.Tools.ExportBluRayShadow = comboBoxShadowWidth.SelectedIndex;
@ -2682,6 +2694,16 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
private void comboBox3D_SelectedIndexChanged(object sender, EventArgs e)
{
if (comboBox3D.SelectedIndex == 0)
{
labelDepth.Enabled = false;
numericUpDownDepth3D.Enabled = false;
}
else
{
labelDepth.Enabled = true;
numericUpDownDepth3D.Enabled = true;
}
subtitleListView1_SelectedIndexChanged(null, null);
}

18
src/Logic/Settings.cs
View File

@ -134,8 +134,11 @@ namespace Nikse.SubtitleEdit.Logic
public Color ExportFontColor { get; set; }
public Color ExportBorderColor { get; set; }
public int ExportBottomMargin { get; set; }
public int ExportHorizontalAlignment { get; set; }
public int ExportBluRayBottomMargin { get; set; }
public int ExportBluRayShadow { get; set; }
public int Export3DType { get; set; }
public int Export3DDepth { get; set; }
public bool FixCommonErrorsFixOverlapAllowEqualEndStart { get; set; }
public string ImportTextSplitting { get; set; }
public bool ImportTextMergeShortLines { get; set; }
@ -184,9 +187,12 @@ namespace Nikse.SubtitleEdit.Logic
ExportFontColor = Color.White;
ExportBorderColor = Color.Black;
ExportBottomMargin = 15;
ExportHorizontalAlignment = 0;
ExportVobSubSimpleRendering = true;
ExportBluRayBottomMargin = 20;
ExportBluRayShadow = 1;
Export3DType = 0;
Export3DDepth = 0;
ExportFcpImageType = "Bmp";
ExportLastBorderWidth = 2;
BridgeGapMilliseconds = 100;
@ -1597,12 +1603,21 @@ namespace Nikse.SubtitleEdit.Logic
subNode = node.SelectSingleNode("ExportBottomMargin");
if (subNode != null)
settings.Tools.ExportBottomMargin = int.Parse(subNode.InnerText);
subNode = node.SelectSingleNode("ExportHorizontalAlignment");
if (subNode != null)
settings.Tools.ExportHorizontalAlignment = int.Parse(subNode.InnerText);
subNode = node.SelectSingleNode("ExportBluRayBottomMargin");
if (subNode != null)
settings.Tools.ExportBluRayBottomMargin = int.Parse(subNode.InnerText);
subNode = node.SelectSingleNode("ExportBluRayShadow");
if (subNode != null)
settings.Tools.ExportBluRayShadow = int.Parse(subNode.InnerText);
subNode = node.SelectSingleNode("Export3DType");
if (subNode != null)
settings.Tools.Export3DType = int.Parse(subNode.InnerText);
subNode = node.SelectSingleNode("Export3DDepth");
if (subNode != null)
settings.Tools.Export3DDepth = int.Parse(subNode.InnerText);
subNode = node.SelectSingleNode("FixCommonErrorsFixOverlapAllowEqualEndStart");
if (subNode != null)
settings.Tools.FixCommonErrorsFixOverlapAllowEqualEndStart = Convert.ToBoolean(subNode.InnerText);
@ -2637,8 +2652,11 @@ namespace Nikse.SubtitleEdit.Logic
textWriter.WriteElementString("ExportFontColor", settings.Tools.ExportFontColor.ToArgb().ToString());
textWriter.WriteElementString("ExportBorderColor", settings.Tools.ExportBorderColor.ToArgb().ToString());
textWriter.WriteElementString("ExportBottomMargin", settings.Tools.ExportBottomMargin.ToString());
textWriter.WriteElementString("ExportHorizontalAlignment", settings.Tools.ExportHorizontalAlignment.ToString());
textWriter.WriteElementString("ExportBluRayBottomMargin", settings.Tools.ExportBluRayBottomMargin.ToString());
textWriter.WriteElementString("ExportBluRayShadow", settings.Tools.ExportBluRayShadow.ToString());
textWriter.WriteElementString("Export3DType", settings.Tools.Export3DType.ToString());
textWriter.WriteElementString("Export3DDepth", settings.Tools.Export3DDepth.ToString());
textWriter.WriteElementString("FixCommonErrorsFixOverlapAllowEqualEndStart", settings.Tools.FixCommonErrorsFixOverlapAllowEqualEndStart.ToString());
textWriter.WriteElementString("ImportTextSplitting", settings.Tools.ImportTextSplitting);
textWriter.WriteElementString("ImportTextMergeShortLines", settings.Tools.ImportTextMergeShortLines.ToString());