diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 37603b677..2a995d183 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -521,6 +521,7 @@ fontsize.infobar_info Info fontsize.infobar_number Nummer fontsize.infobar_small Klein fontsize.menu Menütext +fontsize.menu_hint Menühinweise fontsize.menu_info Menüinfo fontsize.menu_title Menütitel hdd_10min 10 min. diff --git a/data/locale/english.locale b/data/locale/english.locale index 1a54d47c9..3d2bac75b 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -521,6 +521,7 @@ fontsize.infobar_info info fontsize.infobar_number Number fontsize.infobar_small Small fontsize.menu Menutext +fontsize.menu_hint Menu hints fontsize.menu_info Menu Info fontsize.menu_title Menu Title hdd_10min 10 min. diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index a4986e0a7..256d8a401 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -121,17 +121,18 @@ const SNeutrinoSettings::FONT_TYPES gamelist_font_sizes[2] = SNeutrinoSettings::FONT_TYPE_GAMELIST_ITEMSMALL }; -const SNeutrinoSettings::FONT_TYPES other_font_sizes[4] = +const SNeutrinoSettings::FONT_TYPES other_font_sizes[5] = { SNeutrinoSettings::FONT_TYPE_MENU_TITLE, SNeutrinoSettings::FONT_TYPE_MENU, SNeutrinoSettings::FONT_TYPE_MENU_INFO, + SNeutrinoSettings::FONT_TYPE_MENU_HINT, SNeutrinoSettings::FONT_TYPE_FILEBROWSER_ITEM }; font_sizes_groups font_sizes_groups[6] = { - {LOCALE_FONTMENU_MENU , 4, other_font_sizes , "fontsize.doth", LOCALE_MENU_HINT_MENU_FONTS }, + {LOCALE_FONTMENU_MENU , 5, other_font_sizes , "fontsize.doth", LOCALE_MENU_HINT_MENU_FONTS }, {LOCALE_FONTMENU_CHANNELLIST, 4, channellist_font_sizes, "fontsize.dcha", LOCALE_MENU_HINT_CHANNELLIST_FONTS }, {LOCALE_FONTMENU_EVENTLIST , 4, eventlist_font_sizes , "fontsize.deve", LOCALE_MENU_HINT_EVENTLIST_FONTS }, {LOCALE_FONTMENU_EPG , 4, epg_font_sizes , "fontsize.depg", LOCALE_MENU_HINT_EPG_FONTS }, @@ -166,7 +167,8 @@ font_sizes_struct neutrino_font[FONT_TYPE_COUNT] = {LOCALE_FONTSIZE_INFOBAR_CHANNAME , 30, FONT_STYLE_BOLD , 0}, {LOCALE_FONTSIZE_INFOBAR_INFO , 20, FONT_STYLE_REGULAR, 1}, {LOCALE_FONTSIZE_INFOBAR_SMALL , 14, FONT_STYLE_REGULAR, 1}, - {LOCALE_FONTSIZE_FILEBROWSER_ITEM , 16, FONT_STYLE_BOLD , 1} + {LOCALE_FONTSIZE_FILEBROWSER_ITEM , 16, FONT_STYLE_BOLD , 1}, + {LOCALE_FONTSIZE_MENU_HINT , 16, FONT_STYLE_REGULAR, 0} }; int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index c6738b6f4..f4553c99e 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -1141,7 +1141,7 @@ printf("paintHint: icon %s text %s\n", item->hintIcon.c_str(), g_Locale->getText if (item->hint == NONEXISTANT_LOCALE) return; - int HintFont = SNeutrinoSettings::FONT_TYPE_MENU_INFO; + int HintFont = SNeutrinoSettings::FONT_TYPE_MENU_HINT; int fheight = g_Font[HintFont]->getHeight(); std::string str1, str2; diff --git a/src/system/locals.h b/src/system/locals.h index 626bc1def..d2379c635 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -548,6 +548,7 @@ typedef enum LOCALE_FONTSIZE_INFOBAR_NUMBER, LOCALE_FONTSIZE_INFOBAR_SMALL, LOCALE_FONTSIZE_MENU, + LOCALE_FONTSIZE_MENU_HINT, LOCALE_FONTSIZE_MENU_INFO, LOCALE_FONTSIZE_MENU_TITLE, LOCALE_HDD_10MIN, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 0cb0a8541..61a12cda1 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -548,6 +548,7 @@ const char * locale_real_names[] = "fontsize.infobar_number", "fontsize.infobar_small", "fontsize.menu", + "fontsize.menu_hint", "fontsize.menu_info", "fontsize.menu_title", "hdd_10min", diff --git a/src/system/settings.h b/src/system/settings.h index 7296ba0b0..345ca26a6 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -456,7 +456,7 @@ struct SNeutrinoSettings // Font sizes -#define FONT_TYPE_COUNT 22 +#define FONT_TYPE_COUNT 23 enum FONT_TYPES { FONT_TYPE_MENU = 0, FONT_TYPE_MENU_TITLE = 1, @@ -479,7 +479,8 @@ struct SNeutrinoSettings FONT_TYPE_INFOBAR_CHANNAME = 18, FONT_TYPE_INFOBAR_INFO = 19, FONT_TYPE_INFOBAR_SMALL = 20, - FONT_TYPE_FILEBROWSER_ITEM = 21 + FONT_TYPE_FILEBROWSER_ITEM = 21, + FONT_TYPE_MENU_HINT = 22 }; // lcdd