neutrino: add the possibility to lock bouquets by default

This basically inverts the "locked" attribute of bouquets.xml and
allows to selectively enable only favourites or similar.

Conflicts:
	src/gui/channellist.cpp
This commit is contained in:
Stefan Seyfried
2011-10-30 11:53:44 +01:00
committed by [CST] Focus
parent d79d592d27
commit 27493de2ef
10 changed files with 28 additions and 3 deletions

View File

@@ -88,6 +88,14 @@ const CMenuOptionChooser::keyval PARENTALLOCK_LOCKAGE_OPTIONS[PARENTALLOCK_LOCKA
{ 16, LOCALE_PARENTALLOCK_LOCKAGE16 },
{ 18, LOCALE_PARENTALLOCK_LOCKAGE18 }
};
#define PARENTALLOCK_DEFAULTLOCKED_OPTION_COUNT 2
const CMenuOptionChooser::keyval PARENTALLOCK_DEFAULTLOCKED_OPTIONS[PARENTALLOCK_DEFAULTLOCKED_OPTION_COUNT] =
{
{ false, LOCALE_PARENTALLOCK_DEFAULTUNLOCKED },
{ true, LOCALE_PARENTALLOCK_DEFAULTLOCKED }
};
extern bool parentallocked;
void CParentalSetup::showParentalSetup()
{
@@ -109,6 +117,8 @@ void CParentalSetup::showParentalSetup()
mc->setHint("", LOCALE_MENU_HINT_PARENTALLOCK_LOCKAGE);
plock->addItem(mc);
plock->addItem(new CMenuOptionChooser(LOCALE_PARENTALLOCK_BOUQUETMODE, &g_settings.parentallock_defaultlocked, PARENTALLOCK_DEFAULTLOCKED_OPTIONS, PARENTALLOCK_DEFAULTLOCKED_OPTION_COUNT, !parentallocked));
CPINChangeWidget pinChangeWidget(LOCALE_PARENTALLOCK_CHANGEPIN, g_settings.parentallock_pincode, 4, LOCALE_PARENTALLOCK_CHANGEPIN_HINT1);
CMenuForwarder * mf = new CMenuForwarder(LOCALE_PARENTALLOCK_CHANGEPIN, true, g_settings.parentallock_pincode, &pinChangeWidget);
mf->setHint("", LOCALE_MENU_HINT_PARENTALLOCK_CHANGEPIN);