From e7cb0f668f9b8b6a49d6397365c1065ae0b963ae Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Sat, 9 Mar 2019 23:31:13 +0100 Subject: [PATCH] - eventlist: don't show EPGplus button when EPGplus is disabled Conflicts: src/gui/eventlist.cpp Signed-off-by: Thilo Graf --- src/gui/eventlist.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index bb0c480b3..099ac1907 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -991,7 +991,7 @@ void CEventList::paintFoot(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]; //TODO dbt: add directly into footer object with setButtonLabels() + struct button_label buttons[7]; //TODO dbt: add directly into footer object with setButtonLabels() int btn_cnt = 0; int tID = -1; //any value, not NULL @@ -1049,15 +1049,18 @@ void CEventList::paintFoot(t_channel_id channel_id) btn_cnt++; } -#if 0 - buttons[btn_cnt].button = NEUTRINO_ICON_BUTTON_INFO_SMALL; - buttons[btn_cnt].locale = LOCALE_EPGPLUS_HEAD; - btn_cnt++; + // epg button for epg-plus + if (g_settings.eventlist_epgplus) + { + buttons[btn_cnt].button = NEUTRINO_ICON_BUTTON_EPG; + buttons[btn_cnt].locale = LOCALE_EPGPLUS_HEAD; + btn_cnt++; + } + // timerlist button buttons[btn_cnt].button = g_info.hw_caps->has_button_timer ? NEUTRINO_ICON_BUTTON_TIMER : NEUTRINO_ICON_BUTTON_0; buttons[btn_cnt].locale = LOCALE_TIMERLIST_NAME; btn_cnt++; -#endif CComponentsFooter footer; footer.enableShadow(CC_SHADOW_ON, -1, true);