From 59259b3d4367bebcfac0c8f696153b274beec161 Mon Sep 17 00:00:00 2001 From: thilo Date: Fri, 6 May 2011 18:16:17 +0000 Subject: [PATCH] *neutrino menu classes: show NEUTRINO_ICON_SCRAMBLED if a PIN code request is necessary git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1439 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/widget/menue.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index fd0fb2bc1..40dd08301 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -469,10 +469,19 @@ class CLockedMenuForwarder : public CMenuForwarder, public CPINProtection public: CLockedMenuForwarder(const neutrino_locale_t Text, char* _validPIN, bool ask=true, const bool Active=true, char *Option=NULL, CMenuTarget* Target=NULL, const char * const ActionKey = NULL, - neutrino_msg_t DirectKey = CRCInput::RC_nokey, const char * const IconName = NULL) + neutrino_msg_t DirectKey = CRCInput::RC_nokey, const char * const IconName = NULL, const char * const IconName_Info_right = NULL) - : CMenuForwarder(Text, Active, Option, Target, ActionKey, DirectKey, IconName) , - CPINProtection(_validPIN){Ask = ask;}; + : CMenuForwarder(Text, Active, Option, Target, ActionKey, DirectKey, IconName, IconName_Info_right) ,CPINProtection(_validPIN) + { + Ask = ask; + + //if we in ask mode then show NEUTRINO_ICON_SCRAMBLED as default info icon or no icon, + //but use always an info icon if defined in parameter 'IconName_Info_right' + if (IconName_Info_right || ask) + iconName_Info_right = IconName_Info_right ? IconName_Info_right : NEUTRINO_ICON_SCRAMBLED; + else + iconName_Info_right = ""; + }; virtual int exec(CMenuTarget* parent); };