Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-09-14 13:54:04 +02:00
61 changed files with 50439 additions and 713 deletions

View File

@@ -111,16 +111,16 @@ void CNeutrinoApp::InitMenu()
personalize.addPersonalizedItems();
//add I_TYPE_SETTING plugins
//add PLUGIN_INTEGRATION_SETTING plugins
unsigned int nextShortcut;
CMenuWidget &menuSettings = personalize.getWidget(MENU_SETTINGS);
nextShortcut = (unsigned int)menuSettings.getNextShortcut();
menuSettings.integratePlugins(CPlugins::I_TYPE_SETTING, nextShortcut);
menuSettings.integratePlugins(PLUGIN_INTEGRATION_SETTING, nextShortcut);
//add I_TYPE_SERVICE plugins
//add PLUGIN_INTEGRATION_SERVICE plugins
CMenuWidget &menuService = personalize.getWidget(MENU_SERVICE);
nextShortcut = (unsigned int)menuService.getNextShortcut();
menuService.integratePlugins(CPlugins::I_TYPE_SERVICE, nextShortcut);
menuService.integratePlugins(PLUGIN_INTEGRATION_SERVICE, nextShortcut);
}
//init main menu