From 242ded4cc64d74664eb53fe9c5a28c55bdbcf4b3 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 30 Sep 2014 12:24:59 +0200 Subject: [PATCH] plugins: don't show integrated plugins in usermenu Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c166fc28af14f26c6ac124ab6931a0b89f8936ed Author: vanhofen Date: 2014-09-30 (Tue, 30 Sep 2014) Origin message was: ------------------ - plugins: don't show integrated plugins in usermenu ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/pluginlist.cpp | 2 +- src/gui/user_menue.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/pluginlist.cpp b/src/gui/pluginlist.cpp index 92af63578..d696c3730 100644 --- a/src/gui/pluginlist.cpp +++ b/src/gui/pluginlist.cpp @@ -109,7 +109,7 @@ int CPluginList::exec(CMenuTarget* parent, const std::string &actionKey) int shortcut = 1; for(int count = 0; count < nop; count++) { - if ((g_PluginList->getType(count) & pluginlisttype) && !g_PluginList->isHidden(count)) { + if ((g_PluginList->getType(count) & pluginlisttype) && !g_PluginList->isHidden(count) && (g_PluginList->getIntegration(count) == CPlugins::I_TYPE_DISABLED)) { CMenuForwarder *f = new CMenuForwarder(std::string(g_PluginList->getName(count)), true, "", this, to_string(count).c_str(), CRCInput::convertDigitToKey(shortcut++)); //TODO: use hint-icons; header-icons are to small f->setHint("", g_PluginList->getDescription(count)); diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index 5bae03ebb..c0841c9f0 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -309,7 +309,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) if (g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_LUA]) show = show || g_PluginList->getType(count) == CPlugins::P_TYPE_LUA; - if (show && !g_PluginList->isHidden(count)) + if (show && !g_PluginList->isHidden(count) && (g_PluginList->getIntegration(count) == CPlugins::I_TYPE_DISABLED)) { sprintf(id, "%d", count); menu_items++;