mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 00:11:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Commit: c3ed2ed700
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
This commit is contained in:
vanhofen
2017-03-01 13:10:36 +01:00
parent 68e2832f96 55cf6232f7
commit a360c99a70
27 changed files with 143 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/gui/personalize.cpp
View File

@@ -392,7 +392,7 @@ int CPersonalizeGui::ShowPersonalizationMenu()
ShowUserMenu();
}
CMenuWidget* plMenu = NULL;
int pcount = g_PluginList->getNumberOfPlugins();
int pcount = g_Plugins->getNumberOfPlugins();
std::string pldesc[pcount];
int pltype[pcount];
if (show_pluginmenu)
@@ -420,31 +420,31 @@ int CPersonalizeGui::ShowPersonalizationMenu()
if (pltype[i] & CPlugins::P_TYPE_DISABLED) {
if (!g_settings.plugins_disabled.empty())
g_settings.plugins_disabled += ",";
g_settings.plugins_disabled += g_PluginList->getFileName(i);
g_PluginList->setType(i, CPlugins::P_TYPE_DISABLED);
g_settings.plugins_disabled += g_Plugins->getFileName(i);
g_Plugins->setType(i, CPlugins::P_TYPE_DISABLED);
} else if (pltype[i] & CPlugins::P_TYPE_GAME) {
if (!g_settings.plugins_game.empty())
g_settings.plugins_game += ",";
g_settings.plugins_game += g_PluginList->getFileName(i);
g_PluginList->setType(i, CPlugins::P_TYPE_GAME);
g_settings.plugins_game += g_Plugins->getFileName(i);
g_Plugins->setType(i, CPlugins::P_TYPE_GAME);
} else if (pltype[i] & CPlugins::P_TYPE_TOOL) {
if (!g_settings.plugins_tool.empty())
g_settings.plugins_tool += ",";
g_settings.plugins_tool += g_PluginList->getFileName(i);
g_PluginList->setType(i, CPlugins::P_TYPE_TOOL);
g_settings.plugins_tool += g_Plugins->getFileName(i);
g_Plugins->setType(i, CPlugins::P_TYPE_TOOL);
} else if (pltype[i] & CPlugins::P_TYPE_SCRIPT) {
if (!g_settings.plugins_script.empty())
g_settings.plugins_script += ",";
g_settings.plugins_script += g_PluginList->getFileName(i);
g_PluginList->setType(i, CPlugins::P_TYPE_SCRIPT);
g_settings.plugins_script += g_Plugins->getFileName(i);
g_Plugins->setType(i, CPlugins::P_TYPE_SCRIPT);
} else if (pltype[i] & CPlugins::P_TYPE_LUA) {
if (!g_settings.plugins_lua.empty())
g_settings.plugins_lua += ",";
g_settings.plugins_lua += g_PluginList->getFileName(i);
g_PluginList->setType(i, CPlugins::P_TYPE_LUA);
g_settings.plugins_lua += g_Plugins->getFileName(i);
g_Plugins->setType(i, CPlugins::P_TYPE_LUA);
}
}
g_PluginList->loadPlugins();
g_Plugins->loadPlugins();
}
if (show_usermenu)
@@ -573,18 +573,18 @@ void CPersonalizeGui::ShowPluginMenu(CMenuWidget* p_widget, std::string da[], in
p_widget->addIntroItems(LOCALE_PERSONALIZE_PLUGINS);
uint d_key = 1;
int pcount = g_PluginList->getNumberOfPlugins();
int pcount = g_Plugins->getNumberOfPlugins();
for (int i = 0; i < pcount; i++)
{
ia[i] = g_PluginList->getType(i);
da[i] = g_PluginList->getName(i);
ia[i] = g_Plugins->getType(i);
da[i] = g_Plugins->getName(i);
if (da[i].empty())
continue;
std::string pluginDesc = g_PluginList->getDescription(i);
std::string pluginDesc = g_Plugins->getDescription(i);
if (!pluginDesc.empty())
da[i] += " (" + pluginDesc + ")";
p_widget->addItem(new CMenuOptionChooser(da[i].c_str(), &ia[i], PERSONALIZE_PLUGINTYPE_OPTIONS, PERSONALIZE_PLUGINTYPE_MAX,
!g_PluginList->isHidden(i), NULL, getShortcut(d_key++)));
!g_Plugins->isHidden(i), NULL, getShortcut(d_key++)));
}
}