- user_menue: fix wrong changes in 19f7e04c77

This commit is contained in:
svenhoefer
2014-11-07 13:55:05 +01:00
parent 19f7e04c77
commit 5ec409b264

View File

@@ -272,26 +272,22 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
menu_item->setHint(NEUTRINO_ICON_HINT_STREAMINFO, LOCALE_MENU_HINT_STREAMINFO); menu_item->setHint(NEUTRINO_ICON_HINT_STREAMINFO, LOCALE_MENU_HINT_STREAMINFO);
break; break;
case SNeutrinoSettings::ITEM_GAMES: case SNeutrinoSettings::ITEM_GAMES:
neutrino_msg_t d_key = g_PluginList->getKey(count); keyhelper.get(&key,&icon);
keyhelper.get(&key,&icon, d_key);
menu_item = new CMenuDForwarder(LOCALE_MAINMENU_GAMES, g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME), NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME), "-1", key, icon ); menu_item = new CMenuDForwarder(LOCALE_MAINMENU_GAMES, g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME), NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME), "-1", key, icon );
menu_item->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES); menu_item->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES);
break; break;
case SNeutrinoSettings::ITEM_TOOLS: case SNeutrinoSettings::ITEM_TOOLS:
neutrino_msg_t d_key = g_PluginList->getKey(count); keyhelper.get(&key,&icon);
keyhelper.get(&key,&icon, d_key);
menu_item = new CMenuDForwarder(LOCALE_MAINMENU_TOOLS, g_PluginList->hasPlugin(CPlugins::P_TYPE_TOOL), NULL, new CPluginList(LOCALE_MAINMENU_TOOLS,CPlugins::P_TYPE_TOOL), "-1", key, icon ); menu_item = new CMenuDForwarder(LOCALE_MAINMENU_TOOLS, g_PluginList->hasPlugin(CPlugins::P_TYPE_TOOL), NULL, new CPluginList(LOCALE_MAINMENU_TOOLS,CPlugins::P_TYPE_TOOL), "-1", key, icon );
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE); // FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
break; break;
case SNeutrinoSettings::ITEM_SCRIPTS: case SNeutrinoSettings::ITEM_SCRIPTS:
neutrino_msg_t d_key = g_PluginList->getKey(count); keyhelper.get(&key,&icon);
keyhelper.get(&key,&icon, d_key);
menu_item = new CMenuDForwarder(LOCALE_MAINMENU_SCRIPTS, g_PluginList->hasPlugin(CPlugins::P_TYPE_SCRIPT), NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT), "-1", key, icon ); menu_item = new CMenuDForwarder(LOCALE_MAINMENU_SCRIPTS, g_PluginList->hasPlugin(CPlugins::P_TYPE_SCRIPT), NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT), "-1", key, icon );
menu_item->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS); menu_item->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS);
break; break;
case SNeutrinoSettings::ITEM_LUA: case SNeutrinoSettings::ITEM_LUA:
neutrino_msg_t d_key = g_PluginList->getKey(count); keyhelper.get(&key,&icon);
keyhelper.get(&key,&icon, d_key);
menu_item = new CMenuDForwarder(LOCALE_MAINMENU_LUA, g_PluginList->hasPlugin(CPlugins::P_TYPE_LUA), NULL, new CPluginList(LOCALE_MAINMENU_LUA,CPlugins::P_TYPE_LUA), "-1", key, icon ); menu_item = new CMenuDForwarder(LOCALE_MAINMENU_LUA, g_PluginList->hasPlugin(CPlugins::P_TYPE_LUA), NULL, new CPluginList(LOCALE_MAINMENU_LUA,CPlugins::P_TYPE_LUA), "-1", key, icon );
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE); // FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
break; break;