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

moviebrowser: port configuration of moviebrowser fonts from NI-Neutrino

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 82f7eff169
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)

Origin message was:
------------------
- moviebrowser: port configuration of moviebrowser fonts from NI-Neutrino

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-25 12:19:48 +02:00
parent e437d6f686
commit c1bda7d95c
7 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/moviebrowser/mb.cpp
View File

@@ -1088,20 +1088,22 @@ int CMovieBrowser::paint(void)
//CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, g_Locale->getText(LOCALE_MOVIEBROWSER_HEAD));
Font* font = NULL;
Font* font = g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_LIST];
m_movieSelectionHandler = NULL;
m_pcBrowser = new CListFrame(&m_browserListLines, font, CListFrame::SCROLL | CListFrame::HEADER_LINE,
&m_cBoxFrameBrowserList);
&m_cBoxFrameBrowserList, NULL,
g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_HEAD]);
m_pcLastPlay = new CListFrame(&m_playListLines, font, CListFrame::SCROLL | CListFrame::HEADER_LINE | CListFrame::TITLE,
&m_cBoxFrameLastPlayList, g_Locale->getText(LOCALE_MOVIEBROWSER_HEAD_PLAYLIST),
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]);
g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_HEAD]);
m_pcLastRecord = new CListFrame(&m_recordListLines, font, CListFrame::SCROLL | CListFrame::HEADER_LINE | CListFrame::TITLE,
&m_cBoxFrameLastRecordList, g_Locale->getText(LOCALE_MOVIEBROWSER_HEAD_RECORDLIST),
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]);
g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_HEAD]);
m_pcFilter = new CListFrame(&m_FilterLines, font, CListFrame::SCROLL | CListFrame::TITLE,
&m_cBoxFrameFilter, g_Locale->getText(LOCALE_MOVIEBROWSER_HEAD_FILTER),
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]);
m_pcInfo = new CTextBox(" ", NULL, CTextBox::TOP | CTextBox::SCROLL, &m_cBoxFrameInfo);
g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_HEAD]);
m_pcInfo = new CTextBox(" ", g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_INFO], CTextBox::TOP | CTextBox::SCROLL, &m_cBoxFrameInfo);
if (m_pcBrowser == NULL || m_pcLastPlay == NULL ||

12
src/gui/osd_setup.cpp
View File

@@ -149,6 +149,14 @@ const SNeutrinoSettings::FONT_TYPES menu_font_sizes[] =
};
size_t menu_font_items = sizeof(menu_font_sizes)/sizeof(menu_font_sizes[0]);
const SNeutrinoSettings::FONT_TYPES moviebrowser_font_sizes[] =
{
SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_HEAD,
SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_LIST,
SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_INFO
};
size_t moviebrowser_font_items = sizeof(moviebrowser_font_sizes)/sizeof(moviebrowser_font_sizes[0]);
const SNeutrinoSettings::FONT_TYPES other_font_sizes[] =
{
SNeutrinoSettings::FONT_TYPE_SUBTITLES,
@@ -163,6 +171,7 @@ font_sizes_groups font_sizes_groups[] =
{LOCALE_FONTMENU_EVENTLIST , eventlist_font_items , eventlist_font_sizes , "fontsize.deve", LOCALE_MENU_HINT_EVENTLIST_FONTS },
{LOCALE_FONTMENU_EPG , epg_font_items , epg_font_sizes , "fontsize.depg", LOCALE_MENU_HINT_EPG_FONTS },
{LOCALE_FONTMENU_INFOBAR , infobar_font_items , infobar_font_sizes , "fontsize.dinf", LOCALE_MENU_HINT_INFOBAR_FONTS },
{LOCALE_FONTMENU_MOVIEBROWSER,moviebrowser_font_items,moviebrowser_font_sizes,"fontsize.dmbr", LOCALE_MENU_HINT_MOVIEBROWSER_FONTS },
{LOCALE_FONTMENU_OTHER , other_font_items , other_font_sizes , "fontsize.doth", LOCALE_MENU_HINT_OTHER_FONTS }
};
#define FONT_GROUP_COUNT (sizeof(font_sizes_groups)/sizeof(font_sizes_groups[0]))
@@ -193,6 +202,9 @@ font_sizes_struct neutrino_font[SNeutrinoSettings::FONT_TYPE_COUNT] =
{LOCALE_FONTSIZE_INFOBAR_SMALL , 14, CNeutrinoFonts::FONT_STYLE_REGULAR, 1},
{LOCALE_FONTSIZE_FILEBROWSER_ITEM , 16, CNeutrinoFonts::FONT_STYLE_BOLD , 1},
{LOCALE_FONTSIZE_MENU_HINT , 16, CNeutrinoFonts::FONT_STYLE_REGULAR, 0},
{LOCALE_FONTSIZE_MOVIEBROWSER_HEAD , 15, CNeutrinoFonts::FONT_STYLE_REGULAR, 2},
{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}
};

5
src/system/locals.h
View File

@@ -730,6 +730,7 @@ typedef enum
LOCALE_FONTMENU_HEAD,
LOCALE_FONTMENU_INFOBAR,
LOCALE_FONTMENU_MENU,
LOCALE_FONTMENU_MOVIEBROWSER,
LOCALE_FONTMENU_OTHER,
LOCALE_FONTMENU_SCALING,
LOCALE_FONTMENU_SCALING_X,
@@ -762,6 +763,9 @@ typedef enum
LOCALE_FONTSIZE_MENU_HINT,
LOCALE_FONTSIZE_MENU_INFO,
LOCALE_FONTSIZE_MENU_TITLE,
LOCALE_FONTSIZE_MOVIEBROWSER_HEAD,
LOCALE_FONTSIZE_MOVIEBROWSER_INFO,
LOCALE_FONTSIZE_MOVIEBROWSER_LIST,
LOCALE_FONTSIZE_SUBTITLES,
LOCALE_FSK_ALL,
LOCALE_FSK_FROM_12,
@@ -1214,6 +1218,7 @@ typedef enum
LOCALE_MENU_HINT_MISC_ONLINESERVICES,
LOCALE_MENU_HINT_MISC_ZAPIT,
LOCALE_MENU_HINT_MOVIE,
LOCALE_MENU_HINT_MOVIEBROWSER_FONTS,
LOCALE_MENU_HINT_MOVIEBROWSER_SETUP,
LOCALE_MENU_HINT_MOVIEPLAYER_PLUGIN,
LOCALE_MENU_HINT_NET_BROADCAST,

5
src/system/locals_intern.h
View File

@@ -730,6 +730,7 @@ const char * locale_real_names[] =
"fontmenu.head",
"fontmenu.infobar",
"fontmenu.menu",
"fontmenu.moviebrowser",
"fontmenu.other",
"fontmenu.scaling",
"fontmenu.scaling_x",
@@ -762,6 +763,9 @@ const char * locale_real_names[] =
"fontsize.menu_hint",
"fontsize.menu_info",
"fontsize.menu_title",
"fontsize.moviebrowser_head",
"fontsize.moviebrowser_info",
"fontsize.moviebrowser_list",
"fontsize.subtitles",
"fsk.all",
"fsk.from_12",
@@ -1214,6 +1218,7 @@ const char * locale_real_names[] =
"menu.hint_misc_onlineservices",
"menu.hint_misc_zapit",
"menu.hint_movie",
"menu.hint_moviebrowser_fonts",
"menu.hint_moviebrowser_setup",
"menu.hint_movieplayer_plugin",
"menu.hint_net_broadcast",

3
src/system/settings.h
View File

@@ -669,6 +669,9 @@ struct SNeutrinoSettings
FONT_TYPE_INFOBAR_SMALL,
FONT_TYPE_FILEBROWSER_ITEM,
FONT_TYPE_MENU_HINT,
FONT_TYPE_MOVIEBROWSER_HEAD,
FONT_TYPE_MOVIEBROWSER_LIST,
FONT_TYPE_MOVIEBROWSER_INFO,
FONT_TYPE_SUBTITLES,
FONT_TYPE_COUNT
};