mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 01:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-08-08 20:06:40 +02:00
parent 72a9fa40db 57e410c052
commit 1763bb9e64
28 changed files with 298 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/widget/menue.cpp
View File

@@ -51,7 +51,7 @@ CMenuSeparator CGenericMenuSeparator(0, NONEXISTANT_LOCALE, true);
CMenuSeparator CGenericMenuSeparatorLine(CMenuSeparator::LINE, NONEXISTANT_LOCALE, true);
CMenuForwarder CGenericMenuBack(LOCALE_MENU_BACK, true, NULL, NULL, NULL, CRCInput::RC_nokey, NEUTRINO_ICON_BUTTON_LEFT, NULL, true);
CMenuForwarder CGenericMenuCancel(LOCALE_MENU_CANCEL, true, NULL, NULL, NULL, CRCInput::RC_nokey, NEUTRINO_ICON_BUTTON_HOME, NULL, true);
CMenuForwarder CGenericMenuNext(LOCALE_MENU_NEXT, true, NULL, NULL, NULL, CRCInput::RC_nokey, NEUTRINO_ICON_BUTTON_HOME, NULL, true);
CMenuForwarder CGenericMenuNext(LOCALE_MENU_NEXT, true, NULL, NULL, NULL, CRCInput::RC_nokey, NEUTRINO_ICON_BUTTON_RIGHT, NULL, true);
CMenuSeparator * const GenericMenuSeparator = &CGenericMenuSeparator;
CMenuSeparator * const GenericMenuSeparatorLine = &CGenericMenuSeparatorLine;
CMenuForwarder * const GenericMenuBack = &CGenericMenuBack;
@@ -131,7 +131,13 @@ bool CMenuItem::initModeCondition(const int& stb_mode)
void CMenuItem::disableByCondition(const menu_item_disable_cond_t& condition)
{
int stb_mode = CNeutrinoApp::getInstance()->getMode();
#if ENABLE_UPNP
if (condition & DCOND_MODE_UPNP){
if (stb_mode == CNeutrinoApp::mode_upnp)
if (initModeCondition(stb_mode))
return;
}
#endif
if (condition & DCOND_MODE_TS){
if (stb_mode == CNeutrinoApp::mode_ts)
if (initModeCondition(stb_mode))

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

@@ -78,6 +78,9 @@ enum
DCOND_MODE_TV = 2,
DCOND_MODE_RADIO = 4,
DCOND_MODE_TS = 8
#if ENABLE_UPNP
,DCOND_MODE_UPNP = 16
#endif
}/*menu_item_disable_cond_t*/;
class CChangeObserver