From ec6cb635c033ed16fb0893853a169c7131e25531 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 7 Nov 2014 12:20:47 +0100 Subject: [PATCH] user_menue: allow colored keys from plugin.cfg Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/19f7e04c77bf30f83324e98e23b74dc0611c3cef Author: vanhofen Date: 2014-11-07 (Fri, 07 Nov 2014) Origin message was: ------------------ - user_menue: allow colored keys from plugin.cfg ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/user_menue.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index c817bf5cf..fc0009f2a 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -272,22 +272,28 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) menu_item->setHint(NEUTRINO_ICON_HINT_STREAMINFO, LOCALE_MENU_HINT_STREAMINFO); break; case SNeutrinoSettings::ITEM_GAMES: - keyhelper.get(&key,&icon); + neutrino_msg_t d_key = g_PluginList->getKey(count); + 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->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES); break; case SNeutrinoSettings::ITEM_TOOLS: - keyhelper.get(&key,&icon); + neutrino_msg_t d_key = g_PluginList->getKey(count); + 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 ); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; case SNeutrinoSettings::ITEM_SCRIPTS: - keyhelper.get(&key,&icon); + neutrino_msg_t d_key = g_PluginList->getKey(count); + 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->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS); break; case SNeutrinoSettings::ITEM_LUA: - keyhelper.get(&key,&icon); + neutrino_msg_t d_key = g_PluginList->getKey(count); + 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 ); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; case SNeutrinoSettings::ITEM_PLUGIN_TYPES: { @@ -433,7 +439,8 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) const char *pname = g_PluginList->getFileName(count); if (pname && (std::string(pname) == *it) && !g_PluginList->isHidden(count)) { sprintf(id, "%d", count); - keyhelper.get(&key,&icon); + neutrino_msg_t d_key = g_PluginList->getKey(count); + keyhelper.get(&key,&icon, d_key); menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, &plugins, id, key, icon); menu_item->setHint(g_PluginList->getHintIcon(count), g_PluginList->getDescription(count)); break;