mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +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: 4589862ad3
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-07 (Sun, 07 May 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
gixxpunk
2017-05-07 19:05:56 +02:00
parent e58b84de18 1fd330008d
commit d60bb70533
10 changed files with 326 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/gui/channellist.cpp
View File

@@ -123,10 +123,10 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
fheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight();
fdescrheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->getHeight();
previous_channellist_additional = -1;
previous_channellist_additional = g_settings.channellist_additional;
eventFont = SNeutrinoSettings::FONT_TYPE_CHANNELLIST_EVENT;
dline = NULL;
cc_minitv = NULL;
minitv_is_active = false;
headerNew = true;
bouquet = NULL;
@@ -137,6 +137,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
paint_events_index = -2;
CFrameBuffer::getInstance()->OnAfterSetPallette.connect(sigc::mem_fun(this, &CChannelList::ResetModules));
CNeutrinoApp::getInstance()->OnAfterSetupFonts.connect(sigc::mem_fun(this, &CChannelList::ResetModules));
}
CChannelList::~CChannelList()
@@ -301,7 +302,7 @@ int CChannelList::doChannelMenu(void)
int shortcut = 0;
static int old_selected = 0;
char cnt[5];
bool unlocked = true;
int ret = 0;
if(g_settings.minimode)
@@ -363,7 +364,8 @@ int CChannelList::doChannelMenu(void)
CBouquetList *blist = tvmode ? TVfavList : RADIOfavList;
bool fav_found = true;
switch(select) {
case 0: // edit mode
case 0: {// edit mode
bool unlocked = true;
if (g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_CHANGETOLOCKED) {
int pl_z = g_settings.parentallock_zaptime * 60;
if (g_settings.personalize[SNeutrinoSettings::P_MSER_BOUQUET_EDIT] == CPersonalizeGui::PERSONALIZE_MODE_PIN) {
@@ -388,7 +390,7 @@ int CChannelList::doChannelMenu(void)
editMode(true);
ret = -1;
break;
case 1: // add to
}case 1: // add to
if (!addChannelToBouquet())
return -1;
ret = 1;
@@ -487,7 +489,7 @@ void CChannelList::calcSize()
fheight = 1; /* avoid div-by-zero crash on invalid font */
footerHeight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->getHeight()+6;
minitv_is_active = ( (g_settings.channellist_additional == 2) && (CNeutrinoApp::getInstance()->getMode() != NeutrinoMessages::mode_ts) );
minitv_is_active = ( (g_settings.channellist_additional == SNeutrinoSettings::CHANNELLIST_ADDITIONAL_MODE_MINITV) && (CNeutrinoApp::getInstance()->getMode() != NeutrinoMessages::mode_ts) );
// calculate width
full_width = frameBuffer->getScreenWidthRel(); //NI
@@ -961,11 +963,11 @@ int CChannelList::show()
void CChannelList::hide()
{
paint_events(-2); // cancel paint_events thread
if ((g_settings.channellist_additional == 2) || (previous_channellist_additional == 2)) // with miniTV
if ((g_settings.channellist_additional == SNeutrinoSettings::CHANNELLIST_ADDITIONAL_MODE_MINITV) || (previous_channellist_additional == SNeutrinoSettings::CHANNELLIST_ADDITIONAL_MODE_MINITV)) // with miniTV
{
if (cc_minitv)
delete cc_minitv;
cc_minitv = NULL;
if (cc_minitv){
delete cc_minitv; cc_minitv = NULL;
}
}
if(header)
header->kill();
@@ -2184,13 +2186,17 @@ void CChannelList::paintHead()
CComponentsHeader* CChannelList::getHeaderObject()
{
return header;
if (header)
return header;
return NULL;
}
void CChannelList::ResetModules()
{
delete header;
header = NULL;
if (header){
delete header;
header = NULL;
}
if(dline){
delete dline;
dline = NULL;