Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-05-19 22:59:54 +02:00
parent 464a234940
commit a86bc779b4
251 changed files with 26673 additions and 443 deletions

View File

@@ -839,6 +839,14 @@ void CEventList::paintDescription(int index)
else
CEitManager::getInstance()->getActualEPGServiceKey(evtlist[index].channelID, &epgData );
//NI
infozone_text = "";
if (!epgData.info1.empty() && !epgData.info2.empty() && (epgData.info2.find(epgData.info1) != 0)) {
infozone_text += epgData.info1;
infozone_text += "\n";
infozone_text += epgData.info2;
}
else
if(!epgData.info2.empty()){
infozone_text = epgData.info2;
}
@@ -958,7 +966,7 @@ void CEventList::showFunctionBar (bool show, t_channel_id channel_id)
CColorKeyHelper keyhelper; //user_menue.h
neutrino_msg_t dummy = CRCInput::RC_nokey;
const char * icon = NULL;
struct button_label buttons[5];
struct button_label buttons[6]; //NI
int btn_cnt = 0;
int tID = -1; //any value, not NULL
@@ -1016,6 +1024,11 @@ void CEventList::showFunctionBar (bool show, t_channel_id channel_id)
btn_cnt++;
}
//NI timerlist button
buttons[btn_cnt].button = NEUTRINO_ICON_BUTTON_0;
buttons[btn_cnt].locale = LOCALE_TIMERLIST_NAME;
btn_cnt++;
::paintButtons(bx, by, bw, btn_cnt, buttons, bw, bh);
}