From 2bc1d9f24f904b28d43915656b47a2527111f885 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 28 Dec 2011 00:20:04 +0000 Subject: [PATCH] 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: https://github.com/neutrino-images/ni-neutrino/commit/27a44fc37d81fcdc3767ef4ee06f5b3c8e3d3e81 Author: Thilo Graf 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 --- src/gui/personalize.cpp | 8 +++++--- src/gui/personalize.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp index 8d0e2ed67..4fba9c472 100644 --- a/src/gui/personalize.cpp +++ b/src/gui/personalize.cpp @@ -244,7 +244,7 @@ int CPersonalizeGui::exec(CMenuTarget* parent, const string & actionKey) return menu_return::RETURN_EXIT_ALL; } - ShowPersonalizationMenu(); // Show main Personalization Menu + res = ShowPersonalizationMenu(); // Show main Personalization Menu SaveAndExit(); 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 //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); @@ -302,7 +302,7 @@ void CPersonalizeGui::ShowPersonalizationMenu() pMenu->addItem(GenericMenuSeparatorLine); 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(); delete pMenu; delete uMenu; @@ -311,6 +311,8 @@ void CPersonalizeGui::ShowPersonalizationMenu() delete plMenu; v_userMenuSetup.clear(); delete pers_notifier; + + return res; } //init pin setup dialog diff --git a/src/gui/personalize.h b/src/gui/personalize.h index a49a65d81..c78ead1e4 100644 --- a/src/gui/personalize.h +++ b/src/gui/personalize.h @@ -134,7 +134,7 @@ class CPersonalizeGui : public CMenuTarget std::vector v_item; std::vector v_widget; - void ShowPersonalizationMenu(); + int ShowPersonalizationMenu(); void ShowMenuOptions(const int& menu); void ShowHelpPersonalize(); void ShowPinSetup(CMenuWidget* p_widget, CPINChangeWidget *pin_widget);