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

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

Browse Source 
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-12 22:32:07 +02:00
parent 88d02d6b60 f8e1da4418
commit e6d2ba00b3
41 changed files with 802 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/user_menue.cpp
View File

@@ -96,7 +96,6 @@ extern CCAMMenuHandler * g_CamHandler;
#include <system/debug.h>
//NI
#include <gui/ni_menu.h>
#include <gui/infoicons_setup.h>
#include <gui/infoicons.h>
@@ -168,7 +167,6 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
// define classes
CSubChannelSelectMenu subchanselect;
CNeutrinoApp * neutrino = CNeutrinoApp::getInstance();
CNIMenu *ni_menu = CNIMenu::getInstance(); //NI
std::string txt = g_settings.usermenu[button]->title;
if (button < COL_BUTTONMAX && txt.empty())
@@ -418,7 +416,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
case SNeutrinoSettings::ITEM_ECMINFO:
{
keyhelper.get(&key,&icon);
menu_item = new CMenuForwarder(LOCALE_ECMINFO_SHOW, file_size("/tmp/ecm.info"), NULL, ni_menu, "ecmInfo", key, icon);
menu_item = new CMenuForwarder(LOCALE_ECMINFO_SHOW, file_size("/tmp/ecm.info"), NULL, neutrino, "ecmInfo", key, icon);
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
break;
}
@@ -426,7 +424,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
case SNeutrinoSettings::ITEM_CAMD_RESET:
{
keyhelper.get(&key,&icon);
menu_item = new CMenuForwarder(LOCALE_CAMD_RESET, true, NULL, ni_menu, "camd_reset", key, icon);
menu_item = new CMenuForwarder(LOCALE_CAMD_RESET, true, NULL, neutrino, "camd_reset", key, icon);
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
break;
}