mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 01:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

- rename ttx_font_file => font_file_monospace

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2022-01-30 21:17:38 +01:00
committed by Thilo Graf
parent c8b5572673
commit d5cebd3a57
6 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/osd_setup.cpp
View File

@@ -78,7 +78,7 @@
extern CRemoteControl * g_RemoteControl;
extern const char * locale_real_names[];
extern std::string ttx_font_file;
extern std::string font_file_monospace;
extern CTimeOSD *FileTimeOSD;
COsdSetup::COsdSetup(int wizard_mode)
@@ -274,10 +274,10 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
CFileFilter fileFilter;
fileFilter.addFilter("ttf");
fileBrowser.Filter = &fileFilter;
if (fileBrowser.exec(getPathName(g_settings.ttx_font_file).c_str()) == true)
if (fileBrowser.exec(getPathName(g_settings.font_file_monospace).c_str()) == true)
{
g_settings.ttx_font_file = fileBrowser.getSelectedFile()->Name;
ttx_font_file = fileBrowser.getSelectedFile()->Name;
g_settings.font_file_monospace = fileBrowser.getSelectedFile()->Name;
font_file_monospace = fileBrowser.getSelectedFile()->Name;
printf("[neutrino] ttx font file %s\n", fileBrowser.getSelectedFile()->Name.c_str());
CNeutrinoApp::getInstance()->SetupFonts(CNeutrinoFonts::FONTSETUP_NEUTRINO_FONT | CNeutrinoFonts::FONTSETUP_NEUTRINO_FONT_INST);
osdTtxFontFile = "(" + getBaseName(fileBrowser.getSelectedFile()->Name) + ")";
@@ -1102,7 +1102,7 @@ void COsdSetup::showOsdFontSizeSetup(CMenuWidget *menu_fonts)
fontSettings->addItem(mfFontFile);
// select teletext font file
osdTtxFontFile = g_settings.ttx_font_file;
osdTtxFontFile = g_settings.font_file_monospace;
osdTtxFontFile = "(" + getBaseName(osdTtxFontFile) + ")";
mfTtxFontFile = new CMenuForwarder(LOCALE_COLORMENU_FONT_TTX, true, osdTtxFontFile.c_str(), this, "ttx_font", CRCInput::RC_green);
mfTtxFontFile->setHint("", LOCALE_MENU_HINT_FONT_TTX);