mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

settings: add explicit button font

Browse Source 
Fonts for menu foot and button font are not not necessarily the same thing.

TODO: locales


Origin commit data
------------------
Branch: ni/coolstream
Commit: 65ac231940
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2016-12-29 23:26:52 +01:00
parent 5d53e0bf31
commit fb4d202f8e
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/osd_setup.cpp
View File

@@ -160,7 +160,8 @@ size_t moviebrowser_font_items = sizeof(moviebrowser_font_sizes)/sizeof(moviebro
const SNeutrinoSettings::FONT_TYPES other_font_sizes[] = const SNeutrinoSettings::FONT_TYPES other_font_sizes[] =
{ {
SNeutrinoSettings::FONT_TYPE_SUBTITLES, 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]); 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_LIST , 17, CNeutrinoFonts::FONT_STYLE_REGULAR, 0},
{LOCALE_FONTSIZE_MOVIEBROWSER_INFO , 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_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) int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)

1
src/system/locals.h
View File

@@ -739,6 +739,7 @@ typedef enum
LOCALE_FONTMENU_SCALING_Y, LOCALE_FONTMENU_SCALING_Y,
LOCALE_FONTMENU_SCALING_Y_HINT2, LOCALE_FONTMENU_SCALING_Y_HINT2,
LOCALE_FONTMENU_SIZES, LOCALE_FONTMENU_SIZES,
LOCALE_FONTSIZE_BUTTON_TEXT,
LOCALE_FONTSIZE_CHANNEL_NUM_ZAP, LOCALE_FONTSIZE_CHANNEL_NUM_ZAP,
LOCALE_FONTSIZE_CHANNELLIST, LOCALE_FONTSIZE_CHANNELLIST,
LOCALE_FONTSIZE_CHANNELLIST_DESCR, LOCALE_FONTSIZE_CHANNELLIST_DESCR,

1
src/system/locals_intern.h
View File

@@ -739,6 +739,7 @@ const char * locale_real_names[] =
"fontmenu.scaling_y", "fontmenu.scaling_y",
"fontmenu.scaling_y_hint2", "fontmenu.scaling_y_hint2",
"fontmenu.sizes", "fontmenu.sizes",
"fontsize.button_text",
"fontsize.channel_num_zap", "fontsize.channel_num_zap",
"fontsize.channellist", "fontsize.channellist",
"fontsize.channellist_descr", "fontsize.channellist_descr",

1
src/system/settings.h
View File

@@ -688,6 +688,7 @@ struct SNeutrinoSettings
FONT_TYPE_MOVIEBROWSER_INFO, FONT_TYPE_MOVIEBROWSER_INFO,
FONT_TYPE_SUBTITLES, FONT_TYPE_SUBTITLES,
FONT_TYPE_MESSAGE_TEXT, FONT_TYPE_MESSAGE_TEXT,
FONT_TYPE_BUTTON_TEXT,
FONT_TYPE_COUNT FONT_TYPE_COUNT
}; };