mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 00:41:09 +02:00
adzap: call adzap directly from usermenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b0996e3d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)
Origin message was:
------------------
- adzap: call adzap directly from usermenu
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -377,7 +377,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
break;
|
||||
case SNeutrinoSettings::ITEM_ADZAP:
|
||||
keyhelper.get(&key,&icon,CRCInput::RC_blue);
|
||||
menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_ADZAP, true, adzap_active ? g_Locale->getText(LOCALE_OPTIONS_OFF) : NULL, neutrino, "adzap", key, icon);
|
||||
menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_ADZAP, true, adzap_active ? g_Locale->getText(LOCALE_OPTIONS_OFF) : NULL, CAdZapMenu::getInstance(), "adzap", key, icon);
|
||||
menu_item->setHint(NEUTRINO_ICON_HINT_ADZAP, adzap_active ? LOCALE_MENU_HINT_ADZAP_ACTIVE : LOCALE_MENU_HINT_ADZAP);
|
||||
break;
|
||||
#if 0
|
||||
|
@@ -4003,13 +4003,6 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
else if(actionKey == "adzap") {
|
||||
CAdZapMenu::getInstance()->exec(parent, "adzap");
|
||||
if (CAdZapMenu::getInstance()->isActive())
|
||||
return menu_return::RETURN_EXIT_ALL;
|
||||
else
|
||||
return menu_return::RETURN_REPAINT;
|
||||
}
|
||||
else if(actionKey == "moviedir") {
|
||||
parent->hide();
|
||||
|
||||
|
Reference in New Issue
Block a user