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

adzap: call adzap directly from usermenu

Browse Source 
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:
vanhofen
2016-02-29 22:44:06 +01:00
parent 7615e8eac0
commit 6160cf9291
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/user_menue.cpp
View File

@@ -377,7 +377,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
break; break;
case SNeutrinoSettings::ITEM_ADZAP: case SNeutrinoSettings::ITEM_ADZAP:
keyhelper.get(&key,&icon,CRCInput::RC_blue); 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); menu_item->setHint(NEUTRINO_ICON_HINT_ADZAP, adzap_active ? LOCALE_MENU_HINT_ADZAP_ACTIVE : LOCALE_MENU_HINT_ADZAP);
break; break;
#if 0 #if 0

7
src/neutrino.cpp
View File

@@ -4003,13 +4003,6 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
exit(1); 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") { else if(actionKey == "moviedir") {
parent->hide(); parent->hide();