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

Mode fb and picviewer cleanup; unify channel logo display code

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@259 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3fb6607ba0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-05 (Fri, 05 Feb 2010)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2010-02-05 15:26:57 +00:00
parent 6a43795692
commit 5121c12da2
16 changed files with 498 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/eventlist.cpp
View File

@@ -261,7 +261,7 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
name = channelname;
sort_mode=0;
paintHead(channel_id);
paintHead(channel_id, name);
readEvents(channel_id);
paint(channel_id);
showFunctionBar(true);
@@ -370,7 +370,7 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
else
liststart=(selected/listmaxshow)*listmaxshow;
hide();
paintHead(channel_id);
paintHead(channel_id, name);
paint(channel_id);
showFunctionBar(true);
@@ -481,7 +481,7 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
if(in_search) {
in_search = false;
name = channelname;
paintHead(channel_id);
paintHead(channel_id, name);
readEvents(channel_id);
paint(channel_id);
showFunctionBar(true);
@@ -525,7 +525,7 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
timerlist.clear();
g_Timerd->getTimerList (timerlist);
paintHead(channel_id);
paintHead(channel_id, name);
paint(channel_id);
showFunctionBar(true);
}
@@ -672,14 +672,18 @@ void EventList::paintItem(unsigned int pos, t_channel_id channel_id)
}
}
void EventList::paintHead(t_channel_id channel_id)
void EventList::paintHead(t_channel_id channel_id, std::string channelname)
{
bool logo_ok = false;
frameBuffer->paintBoxRel(x,y, width,theight+0, COL_MENUHEAD_PLUS_0, ROUND_RADIUS, CORNER_TOP);
#ifndef FB_USE_PALETTE
logo_ok = g_PicViewer->DisplayLogo(channel_id, x+10, y+(theight-PIC_H)/2, PIC_W, PIC_H);
#endif
std::string lname;
if(g_PicViewer->GetLogoName(channel_id, channelname, lname))
logo_ok = g_PicViewer->DisplayImage(lname, x+10, y+(theight-PIC_H)/2, PIC_W, PIC_H);
//logo_ok = g_PicViewer->DisplayLogo(channel_id, x+10, y+(theight-PIC_H)/2, PIC_W, PIC_H);
g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_TITLE]->RenderString(x+15+(logo_ok? 5+PIC_W:0),y+theight+1, width, name.c_str(), COL_MENUHEAD, 0, true); // UTF-8
}
@@ -884,7 +888,7 @@ int EventList::findEvents(void)
name += m_search_keyword;
name += "'";
}
paintHead(0);
paintHead(0, "");
paint();
showFunctionBar(true);
return(res);