From 6202c0d156c3e09eeeb050902468390495ae291d Mon Sep 17 00:00:00 2001
From: Jim Stichnoth <jstichnoth@mythtv.org>
Date: Wed, 29 Feb 2012 15:46:02 -0800
Subject: [PATCH] Revert "Subtitles: Remove the OSDSubFont setting."

This reverts commit 25fe663161784a1738496c8ab584d71e66cb85a5.

The OSDSubFont setting will be replaced with a new setting called
DefaultSubtitleFont with a default value of FreeMono.
---
 mythtv/libs/libmythtv/subtitlescreen.cpp       |  2 +-
 mythtv/libs/libmythtv/teletextscreen.cpp       |  2 +-
 .../programs/mythfrontend/globalsettings.cpp   | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/mythtv/libs/libmythtv/subtitlescreen.cpp b/mythtv/libs/libmythtv/subtitlescreen.cpp
index 78d7d808dd5..92f546ccf8c 100644
--- a/mythtv/libs/libmythtv/subtitlescreen.cpp
+++ b/mythtv/libs/libmythtv/subtitlescreen.cpp
@@ -99,7 +99,7 @@ bool SubtitleScreen::Create(void)
     m_useBackground = (bool)gCoreContext->GetNumSetting("CCBackground", 0);
     m_textFontZoom  = gCoreContext->GetNumSetting("OSDCC708TextZoom", 100);
 
-    QString defaultFont = "FreeMono";
+    QString defaultFont = gCoreContext->GetSetting("OSDSubFont", "FreeSans");
     m_fontNames.append(defaultFont);       // default
     m_fontNames.append("FreeMono");        // mono serif
     m_fontNames.append("DejaVu Serif");    // prop serif
diff --git a/mythtv/libs/libmythtv/teletextscreen.cpp b/mythtv/libs/libmythtv/teletextscreen.cpp
index aa32eb61d22..e309b224d70 100644
--- a/mythtv/libs/libmythtv/teletextscreen.cpp
+++ b/mythtv/libs/libmythtv/teletextscreen.cpp
@@ -674,7 +674,7 @@ void TeletextScreen::DrawStatus(void)
 bool TeletextScreen::InitialiseFont()
 {
     static bool initialised = false;
-    QString font = "FreeMono";
+    QString font = gCoreContext->GetSetting("OSDSubFont", "FreeSans");
     if (initialised)
     {
         if (gTTFont->face().family() == font)
diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
index b8d042589eb..d852174cc2c 100644
--- a/mythtv/programs/mythfrontend/globalsettings.cpp
+++ b/mythtv/programs/mythfrontend/globalsettings.cpp
@@ -1368,6 +1368,23 @@ static HostSpinBox *OSDCC708TextZoomPercentage(void)
     return gs;
 }
 
+static HostComboBox *SubtitleFont()
+{
+    HostComboBox *hcb = new HostComboBox("OSDSubFont");
+    QFontDatabase db;
+    QStringList fonts = db.families();
+    QStringList hide  = db.families(QFontDatabase::Symbol);
+
+    hcb->setLabel(QObject::tr("Subtitle Font"));
+    hcb->setHelpText(QObject::tr("The font to use for text based subtitles."));
+    foreach (QString font, fonts)
+    {
+        if (!hide.contains(font))
+            hcb->addSelection(font, font, font.toLower() == "freesans");
+    }
+    return hcb;
+}
+
 static HostComboBox *SubtitleCodec()
 {
     HostComboBox *gc = new HostComboBox("SubtitleCodec");
@@ -3443,6 +3460,7 @@ OSDSettings::OSDSettings()
     osd->addChild(CCBackground());
     osd->addChild(DefaultCCMode());
     osd->addChild(PreferCC708());
+    osd->addChild(SubtitleFont());
     osd->addChild(OSDCC708TextZoomPercentage());
     osd->addChild(SubtitleCodec());
     addChild(osd);