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

Merge remote-tracking branch 'cst-next'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: b53fbaf327
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-08 (Fri, 08 Jan 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2016-01-08 19:52:41 +01:00
parent 27dbde26c9 c95ba0b3d2
commit 6ac7d5a087
25 changed files with 194 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/user_menue.cpp
View File

@@ -266,14 +266,15 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
if (g_RemoteControl->subChannels.empty())
break;
// NVOD/SubService- Kanal!
CMenuWidget *tmpNVODSelector = new CMenuWidget(g_RemoteControl->are_subchannels ? LOCALE_NVODSELECTOR_SUBSERVICE : LOCALE_NVODSELECTOR_HEAD, NEUTRINO_ICON_VIDEO);
CMenuWidget *tmpNVODSelector = new CMenuWidget(g_RemoteControl->are_subchannels ? LOCALE_NVODSELECTOR_SUBSERVICE : LOCALE_NVODSELECTOR_STARTTIME, NEUTRINO_ICON_VIDEO);
if (!subchanselect.getNVODMenu(tmpNVODSelector)) {
delete tmpNVODSelector;
break;
}
keyhelper.get(&key,&icon);
menu_item = new CMenuDForwarder(g_RemoteControl->are_subchannels ? LOCALE_NVODSELECTOR_SUBSERVICE : LOCALE_NVODSELECTOR_HEAD, true, NULL, tmpNVODSelector, "-1", key,icon);
menu_item = new CMenuDForwarder(g_RemoteControl->are_subchannels ? LOCALE_NVODSELECTOR_SUBSERVICE : LOCALE_NVODSELECTOR_STARTTIME, true, NULL, tmpNVODSelector, "-1", key,icon);
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
break;
}
case SNeutrinoSettings::ITEM_TECHINFO:
@@ -519,7 +520,7 @@ const char *CUserMenu::getUserMenuButtonName(int button, bool &active, bool retu
case SNeutrinoSettings::ITEM_SUBCHANNEL:
if (!g_RemoteControl->subChannels.empty()) {
if(loc == NONEXISTANT_LOCALE && !text)
loc = g_RemoteControl->are_subchannels ? LOCALE_NVODSELECTOR_SUBSERVICE : LOCALE_NVODSELECTOR_HEAD;
loc = g_RemoteControl->are_subchannels ? LOCALE_NVODSELECTOR_SUBSERVICE : LOCALE_NVODSELECTOR_STARTTIME;
else
return_title = true;
active = true;