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

Merge branch 'master' into pu/mp

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 08dc0d7561
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-30 (Sat, 30 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-09-30 13:22:29 +02:00
parent 43eeb40008 61a2b10f7e
commit f5fc50139e
2 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/deutsch.locale
View File

@@ -15,7 +15,7 @@ EPGPlus.page_up Seite vor
EPGPlus.prev_bouquet Bouquet zurück EPGPlus.prev_bouquet Bouquet zurück
EPGPlus.record Aufnahme EPGPlus.record Aufnahme
EPGPlus.refresh_epg Aktualisieren EPGPlus.refresh_epg Aktualisieren
EPGPlus.remind Vormerken EPGPlus.remind Umschalten
EPGPlus.scroll_mode Scroll-Modus EPGPlus.scroll_mode Scroll-Modus
EPGPlus.stretch_mode Stretch-Modus EPGPlus.stretch_mode Stretch-Modus
EPGPlus.swap_mode Blättern EPGPlus.swap_mode Blättern

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

@@ -927,46 +927,39 @@ 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) { //exec this item...
//exec this item... CMenuItem* item = items[selected];
CMenuItem* item = items[selected]; if (msg == CRCInput::RC_left && g_settings.menu_left_exit &&
if (!item->isSelectable()) !item->isMenueOptionChooser()) {
break;
item->msg = msg;
fader.StopFade();
int rv = item->exec( this );
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 );
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):