Export to bluray settings now saved - thx Minh :)

git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1882 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2013-06-18 18:49:36 +00:00
parent 705117b6cd
commit ff916c9e90
2 changed files with 34 additions and 2 deletions

View File

@ -69,6 +69,8 @@ namespace Nikse.SubtitleEdit.Forms
{
InitializeComponent();
comboBoxImageFormat.SelectedIndex = 4;
_subtitleColor = Configuration.Settings.Tools.ExportFontColor;
_borderColor = Configuration.Settings.Tools.ExportBorderColor;
}
private double FrameRate
@ -1833,9 +1835,9 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
for (int i=0; i<1000; i++)
comboBoxBottomMargin.Items.Add(i);
comboBoxBottomMargin.SelectedIndex = 15;
comboBoxBottomMargin.SelectedIndex = Configuration.Settings.Tools.ExportBottomMargin;
if (exportType == "BLURAYSUP" || exportType == "IMAGE/FRAME")
comboBoxBottomMargin.SelectedIndex = 20;
comboBoxBottomMargin.SelectedIndex = Configuration.Settings.Tools.ExportBluRayBottomMargin;
if (_exportType == "BLURAYSUP" || _exportType == "VOBSUB" || _exportType == "IMAGE/FRAME")
{
comboBoxBottomMargin.Visible = true;
@ -2059,6 +2061,12 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
Configuration.Settings.Tools.ExportBluRayFontSize = (int)_subtitleFontSize;
Configuration.Settings.Tools.ExportBluRayVideoResolution = res;
}
Configuration.Settings.Tools.ExportFontColor = _subtitleColor;
Configuration.Settings.Tools.ExportBorderColor = _borderColor;
if (_exportType == "BLURAYSUP" || _exportType == "DOST")
Configuration.Settings.Tools.ExportBluRayBottomMargin = comboBoxBottomMargin.SelectedIndex;
else
Configuration.Settings.Tools.ExportBottomMargin = comboBoxBottomMargin.SelectedIndex;
}
private void numericUpDownDepth3D_ValueChanged(object sender, EventArgs e)

View File

@ -120,6 +120,10 @@ namespace Nikse.SubtitleEdit.Logic
public string ExportBluRayFontName { get; set; }
public int ExportBluRayFontSize { get; set; }
public string ExportBluRayVideoResolution { get; set; }
public Color ExportFontColor { get; set; }
public Color ExportBorderColor { get; set; }
public int ExportBottomMargin { get; set; }
public int ExportBluRayBottomMargin { get; set; }
public bool FixCommonErrorsFixOverlapAllowEqualEndStart { get; set; }
public string ImportTextSplitting { get; set; }
public bool ImportTextMergeShortLines { get; set; }
@ -161,6 +165,10 @@ namespace Nikse.SubtitleEdit.Logic
ModifySelectionText = string.Empty;
GenerateTimeCodePatterns = "HH:mm:ss;yyyy-MM-dd;dddd dd MMMM yyyy <br>HH:mm:ss;dddd dd MMMM yyyy <br>hh:mm:ss tt;s";
MusicSymbolStyle = "Double"; // 'Double' or 'Single'
ExportFontColor = Color.White;
ExportBorderColor = Color.Black;
ExportBottomMargin = 15;
ExportBluRayBottomMargin = 20;
}
}
@ -1409,6 +1417,18 @@ namespace Nikse.SubtitleEdit.Logic
subNode = node.SelectSingleNode("ExportBluRayVideoResolution");
if (subNode != null)
settings.Tools.ExportBluRayVideoResolution = subNode.InnerText;
subNode = node.SelectSingleNode("ExportFontColor");
if (subNode != null)
settings.Tools.ExportFontColor = Color.FromArgb(int.Parse(subNode.InnerText));
subNode = node.SelectSingleNode("ExportBorderColor");
if (subNode != null)
settings.Tools.ExportBorderColor = Color.FromArgb(int.Parse(subNode.InnerText));
subNode = node.SelectSingleNode("ExportBottomMargin");
if (subNode != null)
settings.Tools.ExportBottomMargin = int.Parse(subNode.InnerText);
subNode = node.SelectSingleNode("ExportBluRayBottomMargin");
if (subNode != null)
settings.Tools.ExportBluRayBottomMargin = int.Parse(subNode.InnerText);
subNode = node.SelectSingleNode("FixCommonErrorsFixOverlapAllowEqualEndStart");
if (subNode != null)
settings.Tools.FixCommonErrorsFixOverlapAllowEqualEndStart = Convert.ToBoolean(subNode.InnerText);
@ -2308,6 +2328,10 @@ namespace Nikse.SubtitleEdit.Logic
textWriter.WriteElementString("ExportBluRayFontName", settings.Tools.ExportBluRayFontName);
textWriter.WriteElementString("ExportBluRayFontSize", settings.Tools.ExportBluRayFontSize.ToString());
textWriter.WriteElementString("ExportBluRayVideoResolution", settings.Tools.ExportBluRayVideoResolution);
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("ExportBluRayBottomMargin", settings.Tools.ExportBluRayBottomMargin.ToString());
textWriter.WriteElementString("FixCommonErrorsFixOverlapAllowEqualEndStart", settings.Tools.FixCommonErrorsFixOverlapAllowEqualEndStart.ToString());
textWriter.WriteElementString("ImportTextSplitting", settings.Tools.ImportTextSplitting);
textWriter.WriteElementString("ImportTextMergeShortLines", settings.Tools.ImportTextMergeShortLines.ToString());