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 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7bccd83b07
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-27 (Thu, 27 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-27 14:02:32 +02:00
parent c548a68954 70d2aa725d
commit 8af0c9668b
30 changed files with 149 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
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;
@@ -974,11 +972,6 @@ void CChannelList::hide()
}
if(header)
header->kill();
if (CChannelLogo){
CChannelLogo->kill();
delete CChannelLogo;
CChannelLogo = NULL;
}
frameBuffer->paintBackground(); //NI clear whole screen
clearItem2DetailsLine();
@@ -2151,6 +2144,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);
@@ -2161,11 +2155,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())
@@ -2191,6 +2180,8 @@ void CChannelList::paintHead()
header->setChannelLogo((*chanlist)[selected]->getChannelID(), (*chanlist)[selected]->getName());
header->getChannelLogoObject()->allowPaint(false);
}
else
header->setChannelLogo(0, string());
header->paint(CC_SAVE_SCREEN_NO);
showChannelLogo();
}
@@ -2212,10 +2203,6 @@ void CChannelList::ResetModules()
delete cc_minitv;
cc_minitv = NULL;
}
if (CChannelLogo) {
delete CChannelLogo;
CChannelLogo = NULL;
}
}
void CChannelList::paintBody()
@@ -2253,7 +2240,7 @@ void CChannelList::paintBody()
const int ypos = y+ theight;
const int sb = height - theight - footerHeight; // paint scrollbar over full height of main box
frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0);
frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PLUS_0);
unsigned int listmaxshow_tmp = listmaxshow ? listmaxshow : 1;//avoid division by zero
int sbc= (((*chanlist).size()- 1)/ listmaxshow_tmp)+ 1;
const int sbs= (selected/listmaxshow_tmp);