From fb4d202f8eed5134b8e5cac7416c4a1b826ffb6e Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Thu, 29 Dec 2016 23:26:52 +0100 Subject: [PATCH] settings: add explicit button font Fonts for menu foot and button font are not not necessarily the same thing. TODO: locales Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/65ac231940b75a73d8449ea184d4cf6a97528ae1 Author: Thilo Graf Date: 2016-12-29 (Thu, 29 Dec 2016) ------------------ This commit was generated by Migit --- src/gui/osd_setup.cpp | 6 ++++-- src/system/locals.h | 1 + src/system/locals_intern.h | 1 + src/system/settings.h | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 73b9e0ad9..698ac5110 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -160,7 +160,8 @@ size_t moviebrowser_font_items = sizeof(moviebrowser_font_sizes)/sizeof(moviebro const SNeutrinoSettings::FONT_TYPES other_font_sizes[] = { SNeutrinoSettings::FONT_TYPE_SUBTITLES, - SNeutrinoSettings::FONT_TYPE_FILEBROWSER_ITEM + SNeutrinoSettings::FONT_TYPE_FILEBROWSER_ITEM, + SNeutrinoSettings::FONT_TYPE_BUTTON_TEXT }; size_t other_font_items = sizeof(other_font_sizes)/sizeof(other_font_sizes[0]); @@ -214,7 +215,8 @@ font_sizes_struct neutrino_font[SNeutrinoSettings::FONT_TYPE_COUNT] = {LOCALE_FONTSIZE_MOVIEBROWSER_LIST , 17, CNeutrinoFonts::FONT_STYLE_REGULAR, 0}, {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_MESSAGE_TEXT , 20, CNeutrinoFonts::FONT_STYLE_REGULAR, 1}, + {LOCALE_FONTSIZE_BUTTON_TEXT , 14, CNeutrinoFonts::FONT_STYLE_REGULAR, 0} }; int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey) diff --git a/src/system/locals.h b/src/system/locals.h index 4e5548044..9bc970415 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -739,6 +739,7 @@ typedef enum LOCALE_FONTMENU_SCALING_Y, LOCALE_FONTMENU_SCALING_Y_HINT2, LOCALE_FONTMENU_SIZES, + LOCALE_FONTSIZE_BUTTON_TEXT, LOCALE_FONTSIZE_CHANNEL_NUM_ZAP, LOCALE_FONTSIZE_CHANNELLIST, LOCALE_FONTSIZE_CHANNELLIST_DESCR, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index bb613b5cb..2ec577772 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -739,6 +739,7 @@ const char * locale_real_names[] = "fontmenu.scaling_y", "fontmenu.scaling_y_hint2", "fontmenu.sizes", + "fontsize.button_text", "fontsize.channel_num_zap", "fontsize.channellist", "fontsize.channellist_descr", diff --git a/src/system/settings.h b/src/system/settings.h index bb82c729a..6d8bb8dc7 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -688,6 +688,7 @@ struct SNeutrinoSettings FONT_TYPE_MOVIEBROWSER_INFO, FONT_TYPE_SUBTITLES, FONT_TYPE_MESSAGE_TEXT, + FONT_TYPE_BUTTON_TEXT, FONT_TYPE_COUNT };