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

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

Browse Source 
Conflicts:
	src/gui/plugins.cpp
	src/gui/plugins.h


Origin commit data
------------------
Commit: a11e7df409
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)
This commit is contained in:
vanhofen
2017-09-08 12:24:32 +02:00
parent 4250a45ea5 d3bd8b5725
commit 7650e3e748
14 changed files with 86 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/neutrino_menue.cpp
View File

@@ -114,16 +114,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