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

src/gui/eventlist.cpp -fix show channel name in search mode

Browse Source
This commit is contained in:
Jacek Jendrzej
2014-06-07 13:14:11 +02:00
parent 3e08c361a7
commit 218a3906fd
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/eventlist.cpp
View File

@@ -540,6 +540,7 @@ int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& c
{ {
if(in_search) { if(in_search) {
in_search = false; in_search = false;
m_showChannel = false;
paintHead(channel_id, channelname); paintHead(channel_id, channelname);
readEvents(channel_id); readEvents(channel_id);
paint(channel_id); paint(channel_id);
@@ -752,13 +753,11 @@ void CNeutrinoEventList::paintItem(unsigned int pos, t_channel_id channel_idI)
datetime1_str += strftime(", %d", tmStartZeit); datetime1_str += strftime(", %d", tmStartZeit);
datetime1_str += g_Locale->getText(CLocaleManager::getMonth(tmStartZeit)); datetime1_str += g_Locale->getText(CLocaleManager::getMonth(tmStartZeit));
//datetime2_str += '.';
if ( m_showChannel ) // show the channel if we made a event search only (which could be made through all channels ). if ( m_showChannel ) // show the channel if we made a event search only (which could be made through all channels ).
{ {
t_channel_id channel = evtlist[curpos].channelID; t_channel_id channel = evtlist[curpos].channelID;
datetime2_str += " "; datetime1_str += " ";
datetime2_str += CServiceManager::getInstance()->GetServiceName(channel); datetime1_str += CServiceManager::getInstance()->GetServiceName(channel);
} }
snprintf(tmpstr,sizeof(tmpstr), "[%d %s]", evtlist[curpos].duration / 60, unit_short_minute); snprintf(tmpstr,sizeof(tmpstr), "[%d %s]", evtlist[curpos].duration / 60, unit_short_minute);
@@ -766,11 +765,9 @@ void CNeutrinoEventList::paintItem(unsigned int pos, t_channel_id channel_idI)
} }
// 1st line // 1st line
int fwidth1a=g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->getRenderWidth(datetime1_str); int fwidth1a=g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->getRenderWidth(datetime1_str,true);
//int fwidth1b=g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->getRenderWidth(datetime2_str);
g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->RenderString(x+5, ypos+ fheight1+3, fwidth1a, datetime1_str, color, 0, true); // UTF-8 g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->RenderString(x+5, ypos+ fheight1+3, fwidth1a, datetime1_str, color, 0, true); // UTF-8
//g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->RenderString(x+5+fwidth1a/2, ypos+ fheight1+3, fwidth1b, datetime2_str, color, 0, true); // UTF-8
int seit = ( evtlist[curpos].startTime - time(NULL) ) / 60; int seit = ( evtlist[curpos].startTime - time(NULL) ) / 60;
if ( (seit> 0) && (seit<100) && (duration_str.length()!=0) ) if ( (seit> 0) && (seit<100) && (duration_str.length()!=0) )