From c4bc6154d88221c05886f00d7571c5e9a5c922df Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sat, 10 Feb 2018 14:52:38 +0100 Subject: [PATCH] locales/fonts: add global window font --- data/locale/deutsch.locale | 1 + data/locale/english.locale | 1 + src/gui/osd_setup.cpp | 4 +++- src/system/locals.h | 1 + src/system/locals_intern.h | 1 + src/system/settings.h | 1 + 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index cf6ee97c7..d5e918a92 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -744,6 +744,7 @@ fontsize.eventlist_itemlarge Groß fontsize.eventlist_itemsmall Klein fontsize.eventlist_title Titel fontsize.filebrowser_item Dateibrowsereinträge +fontsize.general_window_text Allgemeiner Fenstertext fontsize.hint Schriftart wird initialisiert,\nbitte warten ... fontsize.infobar_channame Kanalname fontsize.infobar_info Info diff --git a/data/locale/english.locale b/data/locale/english.locale index b95783db6..d802ba245 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -744,6 +744,7 @@ fontsize.eventlist_itemlarge Large fontsize.eventlist_itemsmall Small fontsize.eventlist_title Title fontsize.filebrowser_item Filebrowser items +fontsize.general_window_text General window text fontsize.hint Initialising font,\nplease wait ... fontsize.infobar_channame Channel name fontsize.infobar_info Info diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 74b96d714..e80aa9702 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -171,6 +171,7 @@ size_t moviebrowser_font_items = sizeof(moviebrowser_font_sizes)/sizeof(moviebro const SNeutrinoSettings::FONT_TYPES other_font_sizes[] = { + SNeutrinoSettings::FONT_TYPE_WINDOW_GENERAL, SNeutrinoSettings::FONT_TYPE_SUBTITLES, SNeutrinoSettings::FONT_TYPE_FILEBROWSER_ITEM, SNeutrinoSettings::FONT_TYPE_BUTTON_TEXT @@ -229,7 +230,8 @@ font_sizes_struct neutrino_font[SNeutrinoSettings::FONT_TYPE_COUNT] = {LOCALE_FONTSIZE_MOVIEBROWSER_INFO , 17, CNeutrinoFonts::FONT_STYLE_REGULAR, 0}, {LOCALE_FONTSIZE_SUBTITLES , 25, CNeutrinoFonts::FONT_STYLE_BOLD , 0}, {LOCALE_FONTSIZE_MESSAGE_TEXT , 20, CNeutrinoFonts::FONT_STYLE_REGULAR, 1}, - {LOCALE_FONTSIZE_BUTTON_TEXT , 14, CNeutrinoFonts::FONT_STYLE_REGULAR, 0} + {LOCALE_FONTSIZE_BUTTON_TEXT , 14, CNeutrinoFonts::FONT_STYLE_REGULAR, 0}, + {LOCALE_FONTSIZE_GENERAL_WINDOW_TEXT, 20, CNeutrinoFonts::FONT_STYLE_REGULAR, 1} }; int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey) diff --git a/src/system/locals.h b/src/system/locals.h index f2e5a8ce3..e2211c1eb 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -771,6 +771,7 @@ typedef enum LOCALE_FONTSIZE_EVENTLIST_ITEMSMALL, LOCALE_FONTSIZE_EVENTLIST_TITLE, LOCALE_FONTSIZE_FILEBROWSER_ITEM, + LOCALE_FONTSIZE_GENERAL_WINDOW_TEXT, LOCALE_FONTSIZE_HINT, LOCALE_FONTSIZE_INFOBAR_CHANNAME, LOCALE_FONTSIZE_INFOBAR_INFO, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index d606c0c16..4833e921c 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -771,6 +771,7 @@ const char * locale_real_names[] = "fontsize.eventlist_itemsmall", "fontsize.eventlist_title", "fontsize.filebrowser_item", + "fontsize.general_window_text", "fontsize.hint", "fontsize.infobar_channame", "fontsize.infobar_info", diff --git a/src/system/settings.h b/src/system/settings.h index 01486f208..679507fab 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -728,6 +728,7 @@ struct SNeutrinoSettings FONT_TYPE_SUBTITLES, FONT_TYPE_MESSAGE_TEXT, FONT_TYPE_BUTTON_TEXT, + FONT_TYPE_WINDOW_GENERAL, FONT_TYPE_COUNT };