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

* Menu hints: Extra font added

Browse Source 
- Font size set by Menu/Settings/Font settings/Menu/Menu hints
This commit is contained in:
micha-bbg
2012-07-12 00:26:52 +02:00
parent 108b8d9523
commit ee781bd880
7 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -521,6 +521,7 @@ fontsize.infobar_info Info
fontsize.infobar_number Nummer fontsize.infobar_number Nummer
fontsize.infobar_small Klein fontsize.infobar_small Klein
fontsize.menu Menütext fontsize.menu Menütext
fontsize.menu_hint Menühinweise
fontsize.menu_info Menüinfo fontsize.menu_info Menüinfo
fontsize.menu_title Menütitel fontsize.menu_title Menütitel
hdd_10min 10 min. hdd_10min 10 min.

1
data/locale/english.locale
View File

@@ -521,6 +521,7 @@ fontsize.infobar_info info
fontsize.infobar_number Number fontsize.infobar_number Number
fontsize.infobar_small Small fontsize.infobar_small Small
fontsize.menu Menutext fontsize.menu Menutext
fontsize.menu_hint Menu hints
fontsize.menu_info Menu Info fontsize.menu_info Menu Info
fontsize.menu_title Menu Title fontsize.menu_title Menu Title
hdd_10min 10 min. hdd_10min 10 min.

8
src/gui/osd_setup.cpp
View File

@@ -121,17 +121,18 @@ const SNeutrinoSettings::FONT_TYPES gamelist_font_sizes[2] =
SNeutrinoSettings::FONT_TYPE_GAMELIST_ITEMSMALL 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_TITLE,
SNeutrinoSettings::FONT_TYPE_MENU, SNeutrinoSettings::FONT_TYPE_MENU,
SNeutrinoSettings::FONT_TYPE_MENU_INFO, SNeutrinoSettings::FONT_TYPE_MENU_INFO,
SNeutrinoSettings::FONT_TYPE_MENU_HINT,
SNeutrinoSettings::FONT_TYPE_FILEBROWSER_ITEM SNeutrinoSettings::FONT_TYPE_FILEBROWSER_ITEM
}; };
font_sizes_groups font_sizes_groups[6] = 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_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_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 }, {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_CHANNAME , 30, FONT_STYLE_BOLD , 0},
{LOCALE_FONTSIZE_INFOBAR_INFO , 20, FONT_STYLE_REGULAR, 1}, {LOCALE_FONTSIZE_INFOBAR_INFO , 20, FONT_STYLE_REGULAR, 1},
{LOCALE_FONTSIZE_INFOBAR_SMALL , 14, 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) int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)

2
src/gui/widget/menue.cpp
View File

@@ -1141,7 +1141,7 @@ printf("paintHint: icon %s text %s\n", item->hintIcon.c_str(), g_Locale->getText
if (item->hint == NONEXISTANT_LOCALE) if (item->hint == NONEXISTANT_LOCALE)
return; return;
int HintFont = SNeutrinoSettings::FONT_TYPE_MENU_INFO; int HintFont = SNeutrinoSettings::FONT_TYPE_MENU_HINT;
int fheight = g_Font[HintFont]->getHeight(); int fheight = g_Font[HintFont]->getHeight();
std::string str1, str2; std::string str1, str2;

1
src/system/locals.h
View File

@@ -548,6 +548,7 @@ typedef enum
LOCALE_FONTSIZE_INFOBAR_NUMBER, LOCALE_FONTSIZE_INFOBAR_NUMBER,
LOCALE_FONTSIZE_INFOBAR_SMALL, LOCALE_FONTSIZE_INFOBAR_SMALL,
LOCALE_FONTSIZE_MENU, LOCALE_FONTSIZE_MENU,
LOCALE_FONTSIZE_MENU_HINT,
LOCALE_FONTSIZE_MENU_INFO, LOCALE_FONTSIZE_MENU_INFO,
LOCALE_FONTSIZE_MENU_TITLE, LOCALE_FONTSIZE_MENU_TITLE,
LOCALE_HDD_10MIN, LOCALE_HDD_10MIN,

1
src/system/locals_intern.h
View File

@@ -548,6 +548,7 @@ const char * locale_real_names[] =
"fontsize.infobar_number", "fontsize.infobar_number",
"fontsize.infobar_small", "fontsize.infobar_small",
"fontsize.menu", "fontsize.menu",
"fontsize.menu_hint",
"fontsize.menu_info", "fontsize.menu_info",
"fontsize.menu_title", "fontsize.menu_title",
"hdd_10min", "hdd_10min",

5
src/system/settings.h
View File

@@ -456,7 +456,7 @@ struct SNeutrinoSettings
// Font sizes // Font sizes
#define FONT_TYPE_COUNT 22 #define FONT_TYPE_COUNT 23
enum FONT_TYPES { enum FONT_TYPES {
FONT_TYPE_MENU = 0, FONT_TYPE_MENU = 0,
FONT_TYPE_MENU_TITLE = 1, FONT_TYPE_MENU_TITLE = 1,
@@ -479,7 +479,8 @@ struct SNeutrinoSettings
FONT_TYPE_INFOBAR_CHANNAME = 18, FONT_TYPE_INFOBAR_CHANNAME = 18,
FONT_TYPE_INFOBAR_INFO = 19, FONT_TYPE_INFOBAR_INFO = 19,
FONT_TYPE_INFOBAR_SMALL = 20, FONT_TYPE_INFOBAR_SMALL = 20,
FONT_TYPE_FILEBROWSER_ITEM = 21 FONT_TYPE_FILEBROWSER_ITEM = 21,
FONT_TYPE_MENU_HINT = 22
}; };
// lcdd // lcdd