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

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

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98edb55233
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-26 22:51:58 +02:00
parent 1f5b252c74 144725ebcd
commit 72745a089b
31 changed files with 187 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/epgview.cpp
View File

@@ -895,14 +895,15 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
// show the epg
// header + logo
if (!header){
header = new CComponentsHeader(sx, sy, ox, toph);
if (!header)
{
header = new CComponentsHeader();
header->setColorBody(COL_MENUHEAD_PLUS_0);
header->enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_MENUCONTENT_PLUS_0, g_settings.theme.menu_Head_gradient_direction);
header->enableClock(true, "%H:%M", "%H %M", true);
}else
header->setDimensionsAll(sx, sy, ox, toph);
}
header->setDimensionsAll(sx, sy, ox, toph);
header->setCaptionFont(font_title);
header->setCaption(epgData.title);