gui/user_menue.cpp: add network settings and software update as user-menu items

Origin commit data
------------------
Commit: 5d6ea715d8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)
This commit is contained in:
[CST] Focus
2014-10-16 13:40:10 +04:00
parent 2793e55793
commit 7e6a96df05
3 changed files with 19 additions and 2 deletions

View File

@@ -67,6 +67,9 @@
#include <mymenu.h> #include <mymenu.h>
#include <gui/widget/icons.h> #include <gui/widget/icons.h>
#include <gui/network_setup.h>
#include <gui/update_menue.h>
#include <gui/hdd_menu.h>
#include <driver/radiotext.h> #include <driver/radiotext.h>
#include <driver/record.h> #include <driver/record.h>
@@ -406,9 +409,19 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
break; break;
case SNeutrinoSettings::ITEM_HDDMENU: case SNeutrinoSettings::ITEM_HDDMENU:
keyhelper.get(&key,&icon); keyhelper.get(&key,&icon);
menu_item = new CMenuForwarder(LOCALE_HDD_SETTINGS, true, NULL, neutrino, "hddmenu", key, icon); menu_item = new CMenuForwarder(LOCALE_HDD_SETTINGS, true, NULL, CHDDMenuHandler::getInstance(), NULL, key, icon);
menu_item->setHint(NEUTRINO_ICON_HINT_HDD, LOCALE_MENU_HINT_HDD); menu_item->setHint(NEUTRINO_ICON_HINT_HDD, LOCALE_MENU_HINT_HDD);
break; break;
case SNeutrinoSettings::ITEM_NETSETTINGS:
keyhelper.get(&key,&icon);
menu_item = new CMenuForwarder(LOCALE_MAINSETTINGS_NETWORK, true, NULL, CNetworkSetup::getInstance(), NULL, key, icon);
menu_item->setHint(NEUTRINO_ICON_HINT_NETWORK, LOCALE_MENU_HINT_NETWORK);
break;
case SNeutrinoSettings::ITEM_SWUPDATE:
keyhelper.get(&key,&icon);
menu_item = new CMenuDForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, new CSoftwareUpdate(), NULL, key, icon);
menu_item->setHint(NEUTRINO_ICON_HINT_SW_UPDATE, LOCALE_MENU_HINT_SW_UPDATE);
break;
case -1: // plugin case -1: // plugin
{ {
int number_of_plugins = g_PluginList->getNumberOfPlugins(); int number_of_plugins = g_PluginList->getNumberOfPlugins();

View File

@@ -108,6 +108,8 @@ static keyvals usermenu_items[] =
{ SNeutrinoSettings::ITEM_YOUTUBE, LOCALE_MOVIEPLAYER_YTPLAYBACK, usermenu_show }, { SNeutrinoSettings::ITEM_YOUTUBE, LOCALE_MOVIEPLAYER_YTPLAYBACK, usermenu_show },
{ SNeutrinoSettings::ITEM_RECORD, LOCALE_TIMERLIST_TYPE_RECORD, usermenu_show }, { SNeutrinoSettings::ITEM_RECORD, LOCALE_TIMERLIST_TYPE_RECORD, usermenu_show },
{ SNeutrinoSettings::ITEM_HDDMENU, LOCALE_HDD_SETTINGS, usermenu_show }, { SNeutrinoSettings::ITEM_HDDMENU, LOCALE_HDD_SETTINGS, usermenu_show },
{ SNeutrinoSettings::ITEM_NETSETTINGS, LOCALE_MAINSETTINGS_NETWORK, usermenu_show },
{ SNeutrinoSettings::ITEM_SWUPDATE, LOCALE_SERVICEMENU_UPDATE, usermenu_show },
{ SNeutrinoSettings::ITEM_MAX, NONEXISTANT_LOCALE, usermenu_show } { SNeutrinoSettings::ITEM_MAX, NONEXISTANT_LOCALE, usermenu_show }
}; };

View File

@@ -698,8 +698,8 @@ struct SNeutrinoSettings
ITEM_RECORD = 8, ITEM_RECORD = 8,
ITEM_MOVIEPLAYER_MB = 9, ITEM_MOVIEPLAYER_MB = 9,
ITEM_TIMERLIST = 10, ITEM_TIMERLIST = 10,
ITEM_FAVORITS = 12,
ITEM_VTXT = 11, ITEM_VTXT = 11,
ITEM_FAVORITS = 12,
ITEM_TECHINFO = 13, ITEM_TECHINFO = 13,
ITEM_REMOTE = 14, ITEM_REMOTE = 14,
ITEM_PLUGIN_TYPES = 15, ITEM_PLUGIN_TYPES = 15,
@@ -717,6 +717,8 @@ struct SNeutrinoSettings
ITEM_HDDMENU = 26, ITEM_HDDMENU = 26,
ITEM_AUDIOPLAY = 27, ITEM_AUDIOPLAY = 27,
ITEM_INETPLAY = 28, ITEM_INETPLAY = 28,
ITEM_NETSETTINGS = 29,
ITEM_SWUPDATE = 30,
ITEM_MAX // MUST be always the last in the list ITEM_MAX // MUST be always the last in the list
} USER_ITEM; } USER_ITEM;