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

- channellist: show current event in additional info box

Browse Source
This commit is contained in:
svenhoefer
2013-05-12 22:26:10 +02:00
parent 9ae72bf02d
commit e170aec2d9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/channellist.cpp
View File

@@ -2237,8 +2237,7 @@ void CChannelList::paint_events(int index)
for (e=evtlist.begin(); e!=evtlist.end(); ++e ) for (e=evtlist.begin(); e!=evtlist.end(); ++e )
{ {
//Remove events in the past //Remove events in the past
time_t dif = azeit - e->startTime; if ( (azeit > (e->startTime + e->duration)) && (!(e->eventID == 0)))
if ( (dif > 0) && (!(e->eventID == 0)))
{ {
do do
{ {
@@ -2246,9 +2245,8 @@ void CChannelList::paint_events(int index)
e = evtlist.erase( e ); e = evtlist.erase( e );
if (e == evtlist.end()) if (e == evtlist.end())
break; break;
dif = azeit - e->startTime;
} }
while ( dif > 0 ); while ( azeit > (e->startTime + e->duration));
} }
if (e == evtlist.end()) if (e == evtlist.end())
break; break;
@@ -2256,15 +2254,17 @@ void CChannelList::paint_events(int index)
//Display the remaining events //Display the remaining events
if ((y+ theight+ pig_height + i*ffheight) < (y+ theight+ pig_height + infozone_height)) if ((y+ theight+ pig_height + i*ffheight) < (y+ theight+ pig_height + infozone_height))
{ {
bool first = false;
if (e->eventID) if (e->eventID)
{ {
first = (i == 1);
struct tm *tmStartZeit = localtime(&e->startTime); struct tm *tmStartZeit = localtime(&e->startTime);
strftime(startTime, sizeof(startTime), "%H:%M", tmStartZeit ); strftime(startTime, sizeof(startTime), "%H:%M", tmStartZeit );
//printf("%s %s\n", startTime, e->description.c_str()); //printf("%s %s\n", startTime, e->description.c_str());
startTimeWidth = eventStartTimeWidth; startTimeWidth = eventStartTimeWidth;
g_Font[eventFont]->RenderString(x+ width+5, y+ theight+ pig_height + i*ffheight, startTimeWidth, startTime, (g_settings.colored_events_channellist == 2 /* next */) ? COL_COLORED_EVENTS_CHANNELLIST : COL_MENUCONTENTINACTIVE, 0, true); g_Font[eventFont]->RenderString(x+ width+5, y+ theight+ pig_height + i*ffheight, startTimeWidth, startTime, (g_settings.colored_events_channellist == 2 /* next */) ? COL_COLORED_EVENTS_CHANNELLIST : COL_MENUCONTENTINACTIVE, 0, true);
} }
g_Font[eventFont]->RenderString(x+ width+5+startTimeWidth, y+ theight+ pig_height + i*ffheight, infozone_width - startTimeWidth - 20, e->description, COL_MENUCONTENTDARK, 0, true); g_Font[eventFont]->RenderString(x+ width+5+startTimeWidth, y+ theight+ pig_height + i*ffheight, infozone_width - startTimeWidth - 20, e->description, (first) ? COL_MENUHEAD : COL_MENUCONTENTDARK, 0, true);
} }
else else
{ {