mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 02:11:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Commit: 315a87f2be
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)
This commit is contained in:
gixxpunk
2017-09-18 16:31:55 +02:00
parent 389b44ffab 48cf627494
commit abee9b0913
8 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/widget/menue.h
View File

@@ -197,6 +197,8 @@ class CMenuItem : public CComponentsSignals
void activateNotify(void);
virtual void disableByCondition(const menu_item_disable_cond_t& condition);
void setParentWidget(CMenuWidget* parent){parent_widget = parent;}
void setInfoIconRight(const char * const IconName_Info_right);
const char* getInfoIconRight(){return iconName_Info_right;}
//NI lcd4l-support
std::string lcd4l_text;
@@ -692,7 +694,6 @@ class CLockedMenuForwarder : public CMenuForwarder, public CPINProtection
: 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)