Merge remote-tracking branch 'tuxbox/master'

Origin commit data
------------------
Commit: abec1c311b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)
This commit is contained in:
Stefan Seyfried
2017-03-04 19:32:30 +01:00
46 changed files with 335 additions and 233 deletions

View File

@@ -76,7 +76,7 @@
#include "driver/display.h"
extern CPlugins * g_PluginList;
extern CPlugins * g_Plugins;
extern CRemoteControl * g_RemoteControl;
extern CCAMMenuHandler * g_CamHandler;
// extern bool has_hdd;
@@ -187,31 +187,31 @@ void CNeutrinoApp::InitMenuMain()
CMenuForwarder * mf;
if (!g_settings.easymenu) {
//games
bool show_games = g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME);
bool show_games = g_Plugins->hasPlugin(CPlugins::P_TYPE_GAME);
mf = new CMenuForwarder(LOCALE_MAINMENU_GAMES, show_games, NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME));
mf->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES);
personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_GAMES]);
#if 0
//tools
bool show_tools = g_PluginList->hasPlugin(CPlugins::P_TYPE_TOOL);
bool show_tools = g_Plugins->hasPlugin(CPlugins::P_TYPE_TOOL);
mf = new CMenuForwarder(LOCALE_MAINMENU_TOOLS, show_tools, NULL, new CPluginList(LOCALE_MAINMENU_TOOLS,CPlugins::P_TYPE_TOOL));
mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_TOOLS);
personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TOOLS]);
//scripts
bool show_scripts = g_PluginList->hasPlugin(CPlugins::P_TYPE_SCRIPT);
bool show_scripts = g_Plugins->hasPlugin(CPlugins::P_TYPE_SCRIPT);
mf = new CMenuForwarder(LOCALE_MAINMENU_SCRIPTS, show_scripts, NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT));
mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS);
personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SCRIPTS]);
//lua
bool show_lua = g_PluginList->hasPlugin(CPlugins::P_TYPE_LUA);
bool show_lua = g_Plugins->hasPlugin(CPlugins::P_TYPE_LUA);
mf = new CMenuForwarder(LOCALE_MAINMENU_LUA, show_lua, NULL, new CPluginList(LOCALE_MAINMENU_LUA,CPlugins::P_TYPE_LUA));
mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_LUA);
personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_LUA]);
#else
bool show_plugins = g_PluginList->hasPlugin(CPlugins::P_TYPE_NO_GAME);
bool show_plugins = g_Plugins->hasPlugin(CPlugins::P_TYPE_NO_GAME);
mf = new CMenuForwarder(LOCALE_MAINMENU_LUA, show_plugins, NULL, new CPluginList(LOCALE_MAINMENU_LUA, CPlugins::P_TYPE_NO_GAME));
mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_LUA);
personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_LUA]);