mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 08:21:07 +02:00
personalize.cpp: resort usermenu
Origin commit data
------------------
Commit: c80f73c2c5
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-08 (Mon, 08 Sep 2014)
Origin message was:
------------------
- personalize.cpp: resort usermenu
This commit is contained in:
@@ -477,6 +477,9 @@ void CPersonalizeGui::ShowUserMenu()
|
||||
{
|
||||
uMenu->addIntroItems(LOCALE_USERMENU_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));
|
||||
|
||||
uMenu->addItem(GenericMenuSeparatorLine);
|
||||
//define usermenu items
|
||||
std::vector<CMenuForwarder*> v_umenu_fw;
|
||||
for (uint i = 0; i<USERMENU_ITEMS_COUNT; i++)
|
||||
@@ -492,8 +495,14 @@ void CPersonalizeGui::ShowUserMenu()
|
||||
for (int i = 0; i < USERMENU_ITEMS_COUNT; i++)
|
||||
uMenu->addItem(new CMenuOptionChooser(usermenu[i].menue_title, &g_settings.personalize[buttons[i]], PERSONALIZE_ACTIVE_MODE_OPTIONS, PERSONALIZE_ACTIVE_MODE_MAX, true, user_menu_notifier));
|
||||
|
||||
//add usermenu items
|
||||
uMenu->addItem(new CMenuSeparator(CMenuSeparator::ALIGN_RIGHT | CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_USERMENU_NAME));
|
||||
user_menu_notifier->changeNotify();
|
||||
for (uint j = 0; j<USERMENU_ITEMS_COUNT; j++)
|
||||
uMenu->addItem(v_umenu_fw[j]);
|
||||
|
||||
uMenu->addItem(GenericMenuSeparatorLine);
|
||||
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));
|
||||
//add plugin selection menu
|
||||
CMenuWidget *pluginSelectionMenu = new CMenuWidget(LOCALE_PERSONALIZE_USERMENU_PLUGIN_TYPES, NEUTRINO_ICON_SETTINGS);
|
||||
pluginSelectionMenu->addIntroItems(LOCALE_MAINMENU_SETTINGS);
|
||||
|
||||
@@ -516,12 +525,6 @@ void CPersonalizeGui::ShowUserMenu()
|
||||
|
||||
uMenu->addItem(new CMenuDForwarder(LOCALE_PERSONALIZE_USERMENU_PLUGIN_TYPES, true, NULL, pluginSelectionMenu));
|
||||
|
||||
//add usermenu items
|
||||
uMenu->addItem(new CMenuSeparator(CMenuSeparator::ALIGN_RIGHT | CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_USERMENU_NAME));
|
||||
user_menu_notifier->changeNotify();
|
||||
for (uint j = 0; j<USERMENU_ITEMS_COUNT; j++)
|
||||
uMenu->addItem(v_umenu_fw[j]);
|
||||
|
||||
uMenu->addItem(GenericMenuSeparatorLine);
|
||||
//non-standard usermenu keys
|
||||
customkey_offset = uMenu->getItemsCount();
|
||||
|
Reference in New Issue
Block a user