Channellist: only show lock icon if parental lock is active

additionally, remove the icon on change to an unlocked bouquet


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8ab511fdbc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2017-12-26 22:58:36 +01:00
committed by vanhofen
parent 94bb966c90
commit 3cf2a4dbfb

View File

@@ -2165,8 +2165,12 @@ void CChannelList::paintHead()
header->setDimensionsAll(x, y, full_width, theight); header->setDimensionsAll(x, y, full_width, theight);
header->setCorner(RADIUS_LARGE, CORNER_TOP); header->setCorner(RADIUS_LARGE, CORNER_TOP);
if (bouquet && bouquet->zapitBouquet && bouquet->zapitBouquet->bLocked != g_settings.parentallock_defaultlocked) if ((g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_CHANGETOLOCKED) &&
bouquet && bouquet->zapitBouquet &&
(bouquet->zapitBouquet->bLocked != g_settings.parentallock_defaultlocked))
header->setIcon(NEUTRINO_ICON_LOCK); header->setIcon(NEUTRINO_ICON_LOCK);
else
header->setIcon(NULL);
std::string header_txt = !edit_state ? name : std::string(g_Locale->getText(LOCALE_CHANNELLIST_EDIT)) + ": " + name; std::string header_txt = !edit_state ? name : std::string(g_Locale->getText(LOCALE_CHANNELLIST_EDIT)) + ": " + name;
fb_pixel_t header_txt_col = (edit_state ? COL_RED : COL_MENUHEAD_TEXT); fb_pixel_t header_txt_col = (edit_state ? COL_RED : COL_MENUHEAD_TEXT);