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

Make it possible to override system font

Browse Source
This commit is contained in:
Nikolaj Olsson 2017-10-01 09:26:06 +02:00
parent b33d09a9bd
commit eed6dcbe4d
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libse/Settings.cs
View File

@ -553,6 +553,9 @@ namespace Nikse.SubtitleEdit.Core
public bool AutoConvertToUtf8 { get; set; }
public bool WriteUtf8Bom { get; set; }
public bool AutoGuessAnsiEncoding { get; set; }
public string SystemSubtitleFontNameOverride { get; set; }
public int SystemSubtitleFontSizeOverride { get; set; }
public string SubtitleFontName { get; set; }
public int SubtitleFontSize { get; set; }
public bool SubtitleFontBold { get; set; }
@ -1461,6 +1464,12 @@ namespace Nikse.SubtitleEdit.Core
subNode = node.SelectSingleNode("AutoGuessAnsiEncoding");
if (subNode != null)
settings.General.AutoGuessAnsiEncoding = Convert.ToBoolean(subNode.InnerText);
subNode = node.SelectSingleNode("SystemSubtitleFontNameOverride");
if (subNode != null)
settings.General.SystemSubtitleFontNameOverride = subNode.InnerText;
subNode = node.SelectSingleNode("SystemSubtitleFontSizeOverride");
if (subNode != null && !string.IsNullOrEmpty(subNode.InnerText))
settings.General.SystemSubtitleFontSizeOverride = Convert.ToInt32(subNode.InnerText);
subNode = node.SelectSingleNode("_subtitleFontName");
if (subNode != null)
settings.General.SubtitleFontName = subNode.InnerText;
@ -3211,6 +3220,8 @@ namespace Nikse.SubtitleEdit.Core
textWriter.WriteElementString("AutoConvertToUtf8", settings.General.AutoConvertToUtf8.ToString());
textWriter.WriteElementString("WriteUtf8Bom", settings.General.WriteUtf8Bom.ToString());
textWriter.WriteElementString("AutoGuessAnsiEncoding", settings.General.AutoGuessAnsiEncoding.ToString());
textWriter.WriteElementString("SystemSubtitleFontNameOverride", settings.General.SystemSubtitleFontNameOverride);
textWriter.WriteElementString("SystemSubtitleFontSizeOverride", settings.General.SystemSubtitleFontSizeOverride.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("_subtitleFontName", settings.General.SubtitleFontName);
textWriter.WriteElementString("SubtitleFontSize", settings.General.SubtitleFontSize.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("SubtitleFontBold", settings.General.SubtitleFontBold.ToString());

17
src/Logic/UiUtil.cs
View File

@ -323,7 +323,7 @@ namespace Nikse.SubtitleEdit.Logic
var gs = Configuration.Settings.General;
if (string.IsNullOrEmpty(gs.SubtitleFontName))
gs.SubtitleFontName = "Tahoma";
gs.SubtitleFontName = SystemFonts.MessageBoxFont.Name;
try
{
@ -342,7 +342,20 @@ namespace Nikse.SubtitleEdit.Logic
private static Font GetDefaultFont()
{
return SystemFonts.MessageBoxFont;
var gs = Configuration.Settings.General;
if (string.IsNullOrEmpty(gs.SystemSubtitleFontNameOverride) || gs.SystemSubtitleFontSizeOverride < 5)
{
return SystemFonts.MessageBoxFont;
}
try
{
return new Font(gs.SystemSubtitleFontNameOverride, gs.SystemSubtitleFontSizeOverride);
}
catch
{
return SystemFonts.MessageBoxFont;
}
}
internal static void PreInitialize(Form form)