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

Merge remote-tracking branch 'check/cst-next'

Browse Source 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)
This commit is contained in:
Stefan Seyfried
2014-12-28 12:32:12 +01:00
parent b6e2fb9527 d410f1c54f
commit d1e2143fd6
112 changed files with 2783 additions and 928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/neutrino_menue.cpp
View File

@@ -125,12 +125,12 @@ void CNeutrinoApp::InitMenu()
unsigned int nextShortcut;
CMenuWidget &menuSettings = personalize.getWidget(MENU_SETTINGS);
nextShortcut = (unsigned int)menuSettings.getNextShortcut();
menuSettings.integratePlugins(&pluginsExec, CPlugins::I_TYPE_SETTING, nextShortcut);
menuSettings.integratePlugins(CPlugins::I_TYPE_SETTING, nextShortcut);
//add I_TYPE_SERVICE plugins
CMenuWidget &menuService = personalize.getWidget(MENU_SERVICE);
nextShortcut = (unsigned int)menuService.getNextShortcut();
menuService.integratePlugins(&pluginsExec, CPlugins::I_TYPE_SERVICE, nextShortcut);
menuService.integratePlugins(CPlugins::I_TYPE_SERVICE, nextShortcut);
}
//init main menu
@@ -425,11 +425,9 @@ void CNeutrinoApp::InitMenuSettings()
}
// lcd
if (CVFD::getInstance()->has_lcd) {
mf = new CMenuForwarder(LOCALE_MAINSETTINGS_LCD, true, NULL, new CVfdSetup());
mf->setHint(NEUTRINO_ICON_HINT_VFD, LOCALE_MENU_HINT_VFD);
personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_VFD]);
}
mf = new CMenuForwarder(LOCALE_MAINSETTINGS_LCD, true, NULL, new CVfdSetup());
mf->setHint(NEUTRINO_ICON_HINT_VFD, LOCALE_MENU_HINT_VFD);
personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_VFD]);
// drive settings
if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) {