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 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d7044490de
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-23 (Sun, 23 Apr 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-04-23 20:29:55 +02:00
parent 096a9f37b0 000595e6b7
commit 495764fc55
3 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/channellist.cpp
View File

@@ -100,7 +100,6 @@ extern bool autoshift;
static CComponentsPIP *cc_minitv = NULL;
extern CBouquetManager *g_bouquetManager;
extern int old_b_id;
static CComponentsChannelLogoScalable* CChannelLogo = NULL;
static CComponentsHeader *header = NULL;
extern bool timeset;
@@ -130,7 +129,6 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
cc_minitv = NULL;
logo_off = 0;
minitv_is_active = false;
CChannelLogo = NULL;
headerNew = true;
bouquet = NULL;
chanlist = &channels;
@@ -970,11 +968,6 @@ void CChannelList::hide()
}
if(header)
header->kill();
if (CChannelLogo){
CChannelLogo->kill();
delete CChannelLogo;
CChannelLogo = NULL;
}
frameBuffer->paintBackground(); //NI clear whole screen
clearItem2DetailsLine();
@@ -2145,6 +2138,7 @@ void CChannelList::paintHead()
}
header->setDimensionsAll(x, y, full_width, theight);
header->setCorner(RADIUS_LARGE, CORNER_TOP);
if (bouquet && bouquet->zapitBouquet && bouquet->zapitBouquet->bLocked != g_settings.parentallock_defaultlocked)
header->setIcon(NEUTRINO_ICON_LOCK);
@@ -2155,11 +2149,6 @@ void CChannelList::paintHead()
header->setCaption(header_txt, CTextBox::NO_AUTO_LINEBREAK, header_txt_col);
if (header->enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_MENUCONTENT_PLUS_0)){
if (CChannelLogo)
CChannelLogo->clearFbData();
}
if (timeset) {
if(!edit_state){
if (header->getContextBtnObject())
@@ -2206,10 +2195,6 @@ void CChannelList::ResetModules()
delete cc_minitv;
cc_minitv = NULL;
}
if (CChannelLogo) {
delete CChannelLogo;
CChannelLogo = NULL;
}
}
void CChannelList::paintBody()