revert the split into lots of plugin types

* present the user with only two types of extensions: games and
 everything else (lua, script, binary .so)
* use lua locale, right now it is translated to just "Plugins" :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 44e127a8dd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-16 (Sun, 16 Feb 2014)

Origin message was:
------------------
revert the split into lots of plugin types

* present the user with only two types of extensions: games and
 everything else (lua, script, binary .so)
* use lua locale, right now it is translated to just "Plugins" :-)


------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-02-16 18:38:03 +01:00
parent 5c15a5ef26
commit e942dbf393
4 changed files with 37 additions and 15 deletions

View File

@@ -11,6 +11,7 @@
Copyright (C) 2011 T. Graf 'dbt'
Homepage: http://www.dbox2-tuning.net/
Copyright (C) 2013-2014 Stefan Seyfried
License: GPL
@@ -126,11 +127,11 @@ bool CUserMenu::showUserMenu(int button)
CDBoxInfoWidget *boxinfo = NULL;
CNeutrinoApp * neutrino = NULL;
CPluginList * games = NULL;
#if 0
CPluginList * tools = NULL;
CPluginList * scripts = NULL;
#if ENABLE_LUA
CPluginList * lua = NULL;
#endif
CPluginList * lua = NULL;
std::string txt = g_settings.usermenu_text[button];
neutrino_locale_t caption = user_menu[button].caption;
@@ -301,6 +302,7 @@ bool CUserMenu::showUserMenu(int button)
menu_item = new CMenuForwarder(LOCALE_MAINMENU_GAMES, g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME), NULL, games, "-1", key, icon );
menu->addItem(menu_item, false);
break;
#if 0
case SNeutrinoSettings::ITEM_TOOLS:
menu_items++;
menu_prev = SNeutrinoSettings::ITEM_TOOLS;
@@ -317,16 +319,16 @@ bool CUserMenu::showUserMenu(int button)
menu_item = new CMenuForwarder(LOCALE_MAINMENU_SCRIPTS, g_PluginList->hasPlugin(CPlugins::P_TYPE_SCRIPT), NULL, scripts, "-1", key, icon );
menu->addItem(menu_item, false);
break;
#if ENABLE_LUA
#endif
case SNeutrinoSettings::ITEM_LUA:
menu_items++;
menu_prev = SNeutrinoSettings::ITEM_LUA;
lua = new CPluginList(LOCALE_MAINMENU_LUA,CPlugins::P_TYPE_LUA);
lua = new CPluginList(LOCALE_MAINMENU_LUA, CPlugins::P_TYPE_NO_GAME);
keyhelper.get(&key,&icon);
menu_item = new CMenuForwarder(LOCALE_MAINMENU_LUA, g_PluginList->hasPlugin(CPlugins::P_TYPE_LUA), NULL, lua, "-1", key, icon );
menu_item = new CMenuForwarder(LOCALE_MAINMENU_LUA, g_PluginList->hasPlugin(CPlugins::P_TYPE_NO_GAME), NULL, lua, "-1", key, icon );
menu->addItem(menu_item, false);
break;
#endif
#if 0
case SNeutrinoSettings::ITEM_PLUGIN_TYPES:
{
char id[5];
@@ -359,7 +361,7 @@ bool CUserMenu::showUserMenu(int button)
}
}
break;
#endif
case SNeutrinoSettings::ITEM_VTXT:
menu_items++;
menu_prev = SNeutrinoSettings::ITEM_VTXT;
@@ -463,7 +465,11 @@ bool CUserMenu::showUserMenu(int button)
if (imageinfo) delete imageinfo;
if (boxinfo) delete boxinfo;
if (games) delete games;
#if 0
if (scripts) delete scripts;
if (tools) delete tools;
#endif
if (lua) delete lua;
if (menu) delete menu;
InfoClock->enableInfoClock(true);