neutrino: leave personalize setup with menu key

Note: works not in sub menues

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2018 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 27a44fc37d
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-12-28 (Wed, 28 Dec 2011)

Origin message was:
------------------
*neutrino: leave personalize setup with menu key

Note: works not in sub menues

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2018 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
2011-12-28 00:20:04 +00:00
parent 1c35d9f29f
commit 2bc1d9f24f
2 changed files with 6 additions and 4 deletions

View File

@@ -244,7 +244,7 @@ int CPersonalizeGui::exec(CMenuTarget* parent, const string & actionKey)
return menu_return::RETURN_EXIT_ALL; return menu_return::RETURN_EXIT_ALL;
} }
ShowPersonalizationMenu(); // Show main Personalization Menu res = ShowPersonalizationMenu(); // Show main Personalization Menu
SaveAndExit(); SaveAndExit();
return res; return res;
} }
@@ -259,7 +259,7 @@ const CMenuOptionChooser::keyval OPTIONS_FEAT_KEY_OPTIONS[CPersonalizeGui::PERSO
}; };
//This is the main personalization menu. From here we can go to the other sub-menu's and enable/disable //This is the main personalization menu. From here we can go to the other sub-menu's and enable/disable
//the PIN code feature, as well as determine whether or not the EPG menu/Features menu is accessible. //the PIN code feature, as well as determine whether or not the EPG menu/Features menu is accessible.
void CPersonalizeGui::ShowPersonalizationMenu() int CPersonalizeGui::ShowPersonalizationMenu()
{ {
width = w_max (40, 10); width = w_max (40, 10);
@@ -302,7 +302,7 @@ void CPersonalizeGui::ShowPersonalizationMenu()
pMenu->addItem(GenericMenuSeparatorLine); pMenu->addItem(GenericMenuSeparatorLine);
pMenu->addItem(new CMenuForwarder(LOCALE_PERSONALIZE_HELP, true, NULL, this, "personalize_help", CRCInput::RC_help, NEUTRINO_ICON_BUTTON_HELP)); pMenu->addItem(new CMenuForwarder(LOCALE_PERSONALIZE_HELP, true, NULL, this, "personalize_help", CRCInput::RC_help, NEUTRINO_ICON_BUTTON_HELP));
pMenu->exec(NULL, ""); int res = pMenu->exec(NULL, "");
pMenu->hide(); pMenu->hide();
delete pMenu; delete pMenu;
delete uMenu; delete uMenu;
@@ -311,6 +311,8 @@ void CPersonalizeGui::ShowPersonalizationMenu()
delete plMenu; delete plMenu;
v_userMenuSetup.clear(); v_userMenuSetup.clear();
delete pers_notifier; delete pers_notifier;
return res;
} }
//init pin setup dialog //init pin setup dialog

View File

@@ -134,7 +134,7 @@ class CPersonalizeGui : public CMenuTarget
std::vector<menu_item_t> v_item; std::vector<menu_item_t> v_item;
std::vector<CMenuWidget *> v_widget; std::vector<CMenuWidget *> v_widget;
void ShowPersonalizationMenu(); int ShowPersonalizationMenu();
void ShowMenuOptions(const int& menu); void ShowMenuOptions(const int& menu);
void ShowHelpPersonalize(); void ShowHelpPersonalize();
void ShowPinSetup(CMenuWidget* p_widget, CPINChangeWidget *pin_widget); void ShowPinSetup(CMenuWidget* p_widget, CPINChangeWidget *pin_widget);