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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/Makefile.am
	src/gui/user_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 79a2dc262b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-12-15 11:49:05 +01:00
parent 2dae9f273a 39c2751a05
commit 36741264b0
265 changed files with 381 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/channellist.cpp
View File

@@ -1541,24 +1541,23 @@ void CChannelList::paintDetails(int index)
int ypos = y + height + OFFSET_INTER;
int ypos_a = ypos + OFFSET_INNER_SMALL;
CChannelEvent *p_event = NULL;
//colored_events init
bool colored_event_C = (g_settings.theme.colored_events_channellist == 1);
bool colored_event_N = (g_settings.theme.colored_events_channellist == 2);
frameBuffer->paintBoxRel(x, ypos, full_width, info_height, COL_MENUCONTENTDARK_PLUS_0, RADIUS_LARGE);
frameBuffer->paintBoxFrame(x, ypos, full_width, info_height, 1, COL_FRAME_PLUS_0, RADIUS_LARGE); //NI
if ((*chanlist).empty())
return;
//colored_events init
bool colored_event_C = (g_settings.theme.colored_events_channellist == 1);
bool colored_event_N = (g_settings.theme.colored_events_channellist == 2);
CChannelEvent *p_event = NULL;
if (displayNext)
p_event = &(*chanlist)[index]->nextEvent;
else
p_event = &(*chanlist)[index]->currentEvent;
if (/* !IS_WEBTV((*chanlist)[index]->getChannelID()) && */ !p_event->description.empty()) {
if (/* !IS_WEBTV((*chanlist)[index]->getChannelID()) && */ p_event && !p_event->description.empty()) {
char cNoch[50] = {0}; // UTF-8
char cSeit[50] = {0}; // UTF-8
@@ -1625,7 +1624,7 @@ void CChannelList::paintDetails(int index)
else if (IS_WEBTV((*chanlist)[index]->getChannelID())) {
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, ypos_a + fheight, full_width - 30, (*chanlist)[index]->getDesc(), colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_MENUCONTENTDARK_TEXT, 0, true);
}
if (IS_WEBTV((*chanlist)[index]->getChannelID())) {
if (g_settings.channellist_foot == 0 && IS_WEBTV((*chanlist)[index]->getChannelID())) {
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, ypos_a + 2*fheight + fdescrheight, full_width - 30, (*chanlist)[index]->getUrl(), COL_MENUCONTENTDARK_TEXT, 0, true);
} else if(g_settings.channellist_foot == 0) {
transponder t;
@@ -1642,7 +1641,7 @@ void CChannelList::paintDetails(int index)
else if( !displayNext && g_settings.channellist_foot == 1) { // next Event
CSectionsdClient::CurrentNextInfo CurrentNext;
CEitManager::getInstance()->getCurrentNextServiceKey((*chanlist)[index]->getChannelID(), CurrentNext);
CEitManager::getInstance()->getCurrentNextServiceKey((*chanlist)[index]->getEpgID(), CurrentNext);
if (!CurrentNext.next_name.empty()) {
char buf[128] = {0};
char cFrom[50] = {0}; // UTF-8