diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index f102009c1..02ef4eaf2 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -67,6 +67,9 @@ #include #include +#include +#include +#include #include #include @@ -406,9 +409,19 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) break; case SNeutrinoSettings::ITEM_HDDMENU: 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); 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 { int number_of_plugins = g_PluginList->getNumberOfPlugins(); diff --git a/src/gui/user_menue_setup.cpp b/src/gui/user_menue_setup.cpp index d51202955..09f2b6833 100644 --- a/src/gui/user_menue_setup.cpp +++ b/src/gui/user_menue_setup.cpp @@ -108,6 +108,8 @@ static keyvals usermenu_items[] = { SNeutrinoSettings::ITEM_YOUTUBE, LOCALE_MOVIEPLAYER_YTPLAYBACK, usermenu_show }, { SNeutrinoSettings::ITEM_RECORD, LOCALE_TIMERLIST_TYPE_RECORD, 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 } }; diff --git a/src/system/settings.h b/src/system/settings.h index dfc78fc71..c32b1d7f4 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -698,8 +698,8 @@ struct SNeutrinoSettings ITEM_RECORD = 8, ITEM_MOVIEPLAYER_MB = 9, ITEM_TIMERLIST = 10, - ITEM_FAVORITS = 12, ITEM_VTXT = 11, + ITEM_FAVORITS = 12, ITEM_TECHINFO = 13, ITEM_REMOTE = 14, ITEM_PLUGIN_TYPES = 15, @@ -717,6 +717,8 @@ struct SNeutrinoSettings ITEM_HDDMENU = 26, ITEM_AUDIOPLAY = 27, ITEM_INETPLAY = 28, + ITEM_NETSETTINGS = 29, + ITEM_SWUPDATE = 30, ITEM_MAX // MUST be always the last in the list } USER_ITEM;