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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Commit: aa61c39211
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-30 (Sat, 30 Sep 2017)
This commit is contained in:
vanhofen
2017-09-30 09:18:12 +02:00
parent 9351a0bf31 57e71ff625
commit 0a7d0a149a
1 changed files with 37 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -948,54 +948,47 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
break; break;
} }
case (CRCInput::RC_left): case (CRCInput::RC_left):
{
if(hasItem() && selected > -1 && (int)items.size() > selected) {
CMenuItem* itemX = items[selected];
if (!itemX->isMenueOptionChooser()) {
if (g_settings.menu_left_exit)
msg = CRCInput::RC_timeout;
break;
}
}
}
case (CRCInput::RC_right): case (CRCInput::RC_right):
case (CRCInput::RC_ok): case (CRCInput::RC_ok):
{ if (hasItem() && selected > -1 && (int)items.size() > selected) {
if(hasItem() && selected > -1 && (int)items.size() > selected) { //NI lcd4l-support
//NI lcd4l-support LCD4l->RemoveFile("/tmp/lcd/menu");
LCD4l->RemoveFile("/tmp/lcd/menu");
//exec this item... //exec this item...
CMenuItem* item = items[selected]; CMenuItem* item = items[selected];
if (!item->isSelectable()) if (msg == CRCInput::RC_left && g_settings.menu_left_exit &&
break; !item->isMenueOptionChooser()) {
item->msg = msg;
fader.StopFade();
int rv = item->exec( this );
//NI lcd4l-support
if (g_settings.lcd4l_support)
LCD4l->CreateFile("/tmp/lcd/menu", item->lcd4l_text, g_settings.lcd4l_convert);
switch ( rv ) {
case menu_return::RETURN_EXIT_ALL:
retval = menu_return::RETURN_EXIT_ALL;
/* fall through */
case menu_return::RETURN_EXIT:
msg = CRCInput::RC_timeout;
break;
case menu_return::RETURN_REPAINT:
case menu_return::RETURN_EXIT_REPAINT:
if (fade && washidden)
fader.StartFadeIn();
checkHints();
pos = selected;
paint();
break;
}
} else
msg = CRCInput::RC_timeout; msg = CRCInput::RC_timeout;
} break;
}
if (!item->isSelectable())
break;
item->msg = msg;
fader.StopFade();
int rv = item->exec( this );
//NI lcd4l-support
if (g_settings.lcd4l_support)
LCD4l->CreateFile("/tmp/lcd/menu", item->lcd4l_text, g_settings.lcd4l_convert);
switch ( rv ) {
case menu_return::RETURN_EXIT_ALL:
retval = menu_return::RETURN_EXIT_ALL;
/* fall through */
case menu_return::RETURN_EXIT:
msg = CRCInput::RC_timeout;
break;
case menu_return::RETURN_REPAINT:
case menu_return::RETURN_EXIT_REPAINT:
if (fade && washidden)
fader.StartFadeIn();
checkHints();
pos = selected;
paint();
break;
}
} else
msg = CRCInput::RC_timeout;
break; break;
case (CRCInput::RC_home): case (CRCInput::RC_home):