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

Merge branch 'master' into pu/msgbox

Browse Source 
Origin commit data
------------------
Commit: ac59ce80b1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-26 (Wed, 26 Oct 2016)
This commit is contained in:
Thilo Graf
2016-10-26 09:56:49 +02:00
parent 87b0dfa6df 4b0adcee84
commit 49f57968ed
8 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/followscreenings.cpp
View File

@@ -87,14 +87,12 @@ int CFollowScreenings::exec(CMenuTarget* /*parent*/, const std::string & actionK
if (i->eventType == CTimerd::TIMER_RECORD) {
if (channel_id == i->channel_id && e->startTime == i->epg_starttime) {
Timer.removeTimerEvent(i->eventID);
#if 0
if (followlist.size() > 1)
if (!forwarders.empty())
forwarders[ix]->iconName_Info_right = "";
#if 0
else
ShowMsg(LOCALE_TIMER_EVENTREMOVED_TITLE, LOCALE_TIMER_EVENTREMOVED_MSG,
CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO);
#else
forwarders[ix]->iconName_Info_right = "";
#endif
return menu_return::RETURN_REPAINT;
}
@@ -108,14 +106,12 @@ int CFollowScreenings::exec(CMenuTarget* /*parent*/, const std::string & actionK
e->startTime, e->startTime - (ANNOUNCETIME + 120 ), apids, true, e->startTime - (ANNOUNCETIME + 120) > time(NULL), recDir, true) == -1) {
//FIXME -- no error handling, but this shouldn't happen ...
} else {
#if 0
if (followlist.size() > 1)
if (!forwarders.empty())
forwarders[ix]->iconName_Info_right = NEUTRINO_ICON_REC;
#if 0
else
ShowMsg(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG,
CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO);
#else
forwarders[ix]->iconName_Info_right = NEUTRINO_ICON_REC;
#endif
return menu_return::RETURN_REPAINT;
}
@@ -152,12 +148,10 @@ void CFollowScreenings::show()
getFollowScreenings();
#if 0
if (followlist.size() == 1) {
snprintf(actionstr, sizeof(actionstr), "%lu", followlist.front().startTime);
exec(NULL, actionstr);
} else {
#endif
CMenuWidget m(LOCALE_EPGVIEWER_SELECT_SCREENING, NEUTRINO_ICON_SETTINGS);
const char *icon = NEUTRINO_ICON_BUTTON_RED;
neutrino_msg_t directKey = CRCInput::RC_red;
@@ -180,8 +174,6 @@ void CFollowScreenings::show()
}
m.enableSaveScreen(true);
m.exec(NULL, "");
#if 0
}
#endif
}

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}
};