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

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

Browse Source 
Origin commit data
------------------
Commit: 98ed3d9448
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)
This commit is contained in:
vanhofen
2016-12-19 17:23:28 +01:00
parent b05f7c1df1 21d74cee97
commit cf7fc39a1a
17 changed files with 54 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/personalize.cpp
View File

@@ -387,7 +387,7 @@ int CPersonalizeGui::ShowPersonalizationMenu()
{
pMenu->addItem(GenericMenuSeparatorLine);
uMenu = new CMenuWidget(LOCALE_PERSONALIZE_HEAD, NEUTRINO_ICON_PERSONALIZE, width, MN_WIDGET_ID_PERSONALIZE_USERMENU);
pMenu->addItem(new CMenuForwarder(LOCALE_USERMENU_HEAD, true, NULL, uMenu, NULL, CRCInput::RC_green));
pMenu->addItem(new CMenuForwarder(LOCALE_USERMENUS_HEAD, true, NULL, uMenu, NULL, CRCInput::RC_green));
ShowUserMenu();
}
@@ -490,7 +490,7 @@ void CPersonalizeGui::ShowUserMenu()
{
int uMenu_shortcut = 1;
uMenu->addIntroItems(LOCALE_USERMENU_HEAD);
uMenu->addIntroItems(LOCALE_USERMENUS_HEAD);
uMenu->addItem(new CMenuOptionChooser(LOCALE_PERSONALIZE_USERMENU_SHOW_CANCEL, &g_settings.personalize[SNeutrinoSettings::P_UMENU_SHOW_CANCEL], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));