From 6bca0156042ef4ea7848fdbcdf2bced12cfdc454 Mon Sep 17 00:00:00 2001 From: thilo Date: Thu, 5 Jan 2012 23:39:13 +0000 Subject: [PATCH] *neutrino personalize: don't show parental setup in personalize setup It's not very useful to manage parental setup with more than one pin option see also: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/p138010-personalisierungsmen%C3%BCs-anpassen/#post138010 git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2039 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/neutrino_menue.cpp | 6 +++--- src/system/settings.cpp | 1 - src/system/settings.h | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index bdd0d3a28..bf952fde2 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -230,8 +230,8 @@ void CNeutrinoApp::InitMenuSettings() //*************************************************************************************************** // save - int show_save = CPersonalizeGui::PERSONALIZE_MODE_VISIBLE; - personalize.addItem(MENU_SETTINGS, new CMenuForwarder(LOCALE_MAINSETTINGS_SAVESETTINGSNOW, true, NULL, this, "savesettings", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED), &show_save, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); + int show = CPersonalizeGui::PERSONALIZE_MODE_VISIBLE; + personalize.addItem(MENU_SETTINGS, new CMenuForwarder(LOCALE_MAINSETTINGS_SAVESETTINGSNOW, true, NULL, this, "savesettings", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED), &show, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); // separator line personalize.addItem(MENU_SETTINGS, GenericMenuSeparatorLine, NULL, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); @@ -245,7 +245,7 @@ void CNeutrinoApp::InitMenuSettings() personalize.addItem(MENU_SETTINGS, new CMenuForwarder(LOCALE_MAINSETTINGS_AUDIO, true, NULL, new CAudioSetup()), &g_settings.personalize[SNeutrinoSettings::P_MSET_AUDIO]); // parental lock - personalize.addItem(MENU_SETTINGS, new CMenuForwarder(LOCALE_PARENTALLOCK_PARENTALLOCK, true, NULL, new CParentalSetup()), &g_settings.personalize[SNeutrinoSettings::P_MSET_YOUTH]); + personalize.addItem(MENU_SETTINGS, new CMenuForwarder(LOCALE_PARENTALLOCK_PARENTALLOCK, true, NULL, new CParentalSetup()), &show, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); // network if(networksetup == NULL) diff --git a/src/system/settings.cpp b/src/system/settings.cpp index b8ba83218..ad6e4e950 100644 --- a/src/system/settings.cpp +++ b/src/system/settings.cpp @@ -58,7 +58,6 @@ const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SE {"personalize_settingsmager" , CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED}, {"personalize_video" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_audio" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, - {"personalize_youth" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_network" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_recording" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_osdlang" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, diff --git a/src/system/settings.h b/src/system/settings.h index 0cdab057b..4d722a436 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -157,7 +157,6 @@ struct SNeutrinoSettings P_MSET_SETTINGS_MANAGER, P_MSET_VIDEO, P_MSET_AUDIO, - P_MSET_YOUTH, P_MSET_NETWORK, P_MSET_RECORDING, P_MSET_OSDLANG,