mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
parent
7476ba8110
commit
56510f8b97
@ -23,6 +23,7 @@
|
||||
* Optimize ASSA style import
|
||||
* Improve line split a little - thx i990049
|
||||
* Add a few English words/names to dictionaries
|
||||
* Remember font in burn-in - thx Nespula95
|
||||
* FIXED:
|
||||
* Fix italic in DCinema interop - thx Andrey
|
||||
* Fix Whisper model download - thx darnn
|
||||
|
@ -397,6 +397,8 @@ namespace Nikse.SubtitleEdit.Core.Common
|
||||
public bool AssaBgBoxDrawingOnly { get; set; }
|
||||
|
||||
|
||||
public string GenVideoFontName { get; set; }
|
||||
public int GenVideoFontSize { get; set; }
|
||||
public string GenVideoEncoding { get; set; }
|
||||
public string GenVideoPreset { get; set; }
|
||||
public string GenVideoCrf { get; set; }
|
||||
@ -6077,6 +6079,18 @@ $HorzAlign = Center
|
||||
}
|
||||
|
||||
|
||||
subNode = node.SelectSingleNode("GenVideoFontName");
|
||||
if (subNode != null)
|
||||
{
|
||||
settings.Tools.GenVideoFontName = subNode.InnerText;
|
||||
}
|
||||
|
||||
subNode = node.SelectSingleNode("GenVideoFontSize");
|
||||
if (subNode != null)
|
||||
{
|
||||
settings.Tools.GenVideoFontSize = Convert.ToInt32(subNode.InnerText, CultureInfo.InvariantCulture);
|
||||
}
|
||||
|
||||
subNode = node.SelectSingleNode("GenVideoEncoding");
|
||||
if (subNode != null)
|
||||
{
|
||||
@ -10443,6 +10457,8 @@ $HorzAlign = Center
|
||||
textWriter.WriteElementString("AssaBgBoxDrawingFileWatch", settings.Tools.AssaBgBoxDrawingFileWatch.ToString(CultureInfo.InvariantCulture));
|
||||
textWriter.WriteElementString("AssaBgBoxDrawingOnly", settings.Tools.AssaBgBoxDrawingOnly.ToString(CultureInfo.InvariantCulture));
|
||||
textWriter.WriteElementString("AssaBgBoxDrawing", settings.Tools.AssaBgBoxDrawing);
|
||||
textWriter.WriteElementString("GenVideoFontName", settings.Tools.GenVideoFontName);
|
||||
textWriter.WriteElementString("GenVideoFontSize", settings.Tools.GenVideoFontSize.ToString(CultureInfo.InvariantCulture));
|
||||
textWriter.WriteElementString("GenVideoEncoding", settings.Tools.GenVideoEncoding);
|
||||
textWriter.WriteElementString("GenVideoPreset", settings.Tools.GenVideoPreset);
|
||||
textWriter.WriteElementString("GenVideoCrf", settings.Tools.GenVideoCrf);
|
||||
|
@ -148,7 +148,11 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
labelInfo.Text = LanguageSettings.Current.GenerateVideoWithBurnedInSubs.InfoAssaOn;
|
||||
}
|
||||
|
||||
var initialFont = Configuration.Settings.Tools.ExportBluRayFontName;
|
||||
var initialFont = Configuration.Settings.Tools.GenVideoFontName;
|
||||
if (string.IsNullOrEmpty(initialFont))
|
||||
{
|
||||
initialFont = Configuration.Settings.Tools.ExportBluRayFontName;
|
||||
}
|
||||
if (string.IsNullOrEmpty(initialFont))
|
||||
{
|
||||
initialFont = UiUtil.GetDefaultFont().Name;
|
||||
@ -169,6 +173,12 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
comboBoxSubtitleFont.SelectedIndex = 0;
|
||||
}
|
||||
|
||||
if (Configuration.Settings.Tools.GenVideoFontSize >= numericUpDownFontSize.Minimum &&
|
||||
Configuration.Settings.Tools.GenVideoFontSize >= numericUpDownFontSize.Minimum)
|
||||
{
|
||||
numericUpDownFontSize.Value = Configuration.Settings.Tools.GenVideoFontSize;
|
||||
}
|
||||
|
||||
checkBoxRightToLeft.Checked = Configuration.Settings.General.RightToLeftMode && LanguageAutoDetect.CouldBeRightToLeftLanguage(_assaSubtitle);
|
||||
textBoxLog.Visible = false;
|
||||
|
||||
@ -651,6 +661,8 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
|
||||
private void GenerateVideoWithHardSubs_FormClosing(object sender, FormClosingEventArgs e)
|
||||
{
|
||||
Configuration.Settings.Tools.GenVideoFontName = comboBoxSubtitleFont.Text;
|
||||
Configuration.Settings.Tools.GenVideoFontSize = (int)numericUpDownFontSize.Value;
|
||||
Configuration.Settings.Tools.GenVideoEncoding = comboBoxVideoEncoding.Text;
|
||||
Configuration.Settings.Tools.GenVideoPreset = comboBoxPreset.Text;
|
||||
Configuration.Settings.Tools.GenVideoCrf = comboBoxCrf.Text;
|
||||
|
Loading…
Reference in New Issue
Block a user