diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index b3381b45c..3ec727ed9 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -226,21 +226,21 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) menu->addItem(GenericMenuSeparatorLine); break; } - case SNeutrinoSettings::ITEM_EPG_LIST: + case SNeutrinoSettings::ITEM_EVENTLIST: { keyhelper.get(&key, &icon, CRCInput::RC_red); menu_item = new CMenuDForwarder(LOCALE_EPGMENU_EVENTLIST, true, NULL, new CEventListHandler, "-1", key, icon); // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; } - case SNeutrinoSettings::ITEM_EPG_SUPER: + case SNeutrinoSettings::ITEM_EPGPLUS: { keyhelper.get(&key, &icon, CRCInput::RC_green); menu_item = new CMenuDForwarder(LOCALE_EPGMENU_EPGPLUS, true, NULL, new CEPGplusHandler, "-1", key, icon); // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; } - case SNeutrinoSettings::ITEM_EPG_INFO: + case SNeutrinoSettings::ITEM_EVENTINFO: { keyhelper.get(&key, &icon, CRCInput::RC_yellow); menu_item = new CMenuDForwarder(LOCALE_EPGMENU_EVENTINFO, true, NULL, new CEPGDataHandler, "-1", key, icon); @@ -308,7 +308,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; } - case SNeutrinoSettings::ITEM_MOVIEPLAYER_MB: + case SNeutrinoSettings::ITEM_MOVIEBROWSER: { if (g_settings.recording_type == CNeutrinoApp::RECORDING_OFF) break; @@ -324,70 +324,27 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) menu_item->setHint(NEUTRINO_ICON_HINT_TIMERS, LOCALE_MENU_HINT_TIMERS); break; } -// case SNeutrinoSettings::ITEM_VTXT: -// { -// keyhelper.get(&key, &icon, feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_VTXT]].key); // CRCInput::RC_blue -// menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_VTXT, true, NULL, CPluginsExec::getInstance(), "teletext", key, icon); + case SNeutrinoSettings::ITEM_VTXT: + { + keyhelper.get(&key, &icon, feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_VTXT]].key); // CRCInput::RC_blue + menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_VTXT, true, NULL, CPluginsExec::getInstance(), "teletext", key, icon); // menu_item->setHint(NEUTRINO_ICON_HINT_VTXT, LOCALE_USERMENU_ITEM_VTXT); -// break; -// } - case SNeutrinoSettings::ITEM_FAVORITS: + break; + } + case SNeutrinoSettings::ITEM_FAVORITES: { keyhelper.get(&key, &icon, feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_FAVORIT]].key); // CRCInput::RC_green menu_item = new CMenuDForwarder(LOCALE_FAVORITES_MENUEADD, true, NULL, new CFavorites, "-1", key, icon); // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; } - case SNeutrinoSettings::ITEM_TECHINFO: + case SNeutrinoSettings::ITEM_STREAMINFO: { keyhelper.get(&key, &icon, CRCInput::RC_blue); menu_item = new CMenuDForwarder(LOCALE_EPGMENU_STREAMINFO, _mode_ts || !neutrino->channelList->isEmpty(), NULL, new CStreamInfo2, "-1", key, icon); menu_item->setHint(NEUTRINO_ICON_HINT_STREAMINFO, LOCALE_MENU_HINT_STREAMINFO); break; } - case SNeutrinoSettings::ITEM_REMOTE: - { - keyhelper.get(&key, &icon, feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_RC_LOCK]].key); // CRCInput::RC_nokey); - menu_item = new CMenuForwarder(LOCALE_RCLOCK_TITLE, true, NULL, CRCLock::getInstance(), "-1", key, icon); - // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); - break; - } - case SNeutrinoSettings::ITEM_PLUGIN_TYPES: - { - unsigned int number_of_plugins = (unsigned int) g_Plugins->getNumberOfPlugins(); - if (!number_of_plugins) - continue; - for (unsigned int count = 0; count < number_of_plugins; count++) - { -#if 0 - bool show = g_Plugins->getType(count) == CPlugins::P_TYPE_TOOL || - g_Plugins->getType(count) == CPlugins::P_TYPE_LUA; -#endif - bool show = false; - if (g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_GAMES]) - show = show || g_Plugins->getType(count) == CPlugins::P_TYPE_GAME; - if (g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_TOOLS]) - show = show || g_Plugins->getType(count) == CPlugins::P_TYPE_TOOL; - if (g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_SCRIPTS]) - show = show || g_Plugins->getType(count) == CPlugins::P_TYPE_SCRIPT; - if (g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_LUA]) - show = show || g_Plugins->getType(count) == CPlugins::P_TYPE_LUA; - - if (show && !g_Plugins->isHidden(count) && (g_Plugins->getIntegration(count) == PLUGIN_INTEGRATION_DISABLED)) - { - menu_items++; - neutrino_msg_t d_key = g_Plugins->getKey(count); - //printf("[neutrino usermenu] plugin %d, set key %d...\n", count, g_Plugins->getKey(count)); - keyhelper.get(&key, &icon, d_key); - menu_item = new CMenuForwarder(g_Plugins->getName(count), true, NULL, CPluginsExec::getInstance(), to_string(count).c_str(), key, icon); - menu_item->setHint(g_Plugins->getHintIcon(count), g_Plugins->getDescription(count)); - - menu->addItem(menu_item, false); - } - } - menu_item = NULL; - break; - } case SNeutrinoSettings::ITEM_IMAGEINFO: { keyhelper.get(&key, &icon); @@ -402,6 +359,13 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) menu_item->setHint(NEUTRINO_ICON_HINT_DBOXINFO, LOCALE_MENU_HINT_DBOXINFO); break; } + case SNeutrinoSettings::ITEM_RCLOCK: + { + keyhelper.get(&key, &icon, feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_RC_LOCK]].key); // CRCInput::RC_nokey); + menu_item = new CMenuForwarder(LOCALE_RCLOCK_TITLE, true, NULL, CRCLock::getInstance(), "-1", key, icon); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); + break; + } case SNeutrinoSettings::ITEM_CAM: { keyhelper.get(&key, &icon); @@ -416,41 +380,28 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) menu_item->setHint("", LOCALE_MENU_HINT_CLOCK_MODE); break; } - case SNeutrinoSettings::ITEM_GAMES: + case SNeutrinoSettings::ITEM_USER_MENU_22: { keyhelper.get(&key, &icon); - menu_item = new CMenuDForwarder(LOCALE_MAINMENU_GAMES, g_Plugins->hasPlugin(CPlugins::P_TYPE_GAME), NULL, new CPluginList(LOCALE_MAINMENU_GAMES, CPlugins::P_TYPE_GAME), "-1", key, icon); - menu_item->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES); + // menu_item = new CMenuForwarder(PLACEHOLDER); + // menu_item->setHint("", NONEXISTANT_LOCALE); break; } - case SNeutrinoSettings::ITEM_SCRIPTS: + case SNeutrinoSettings::ITEM_USER_MENU_23: { keyhelper.get(&key, &icon); - menu_item = new CMenuDForwarder(LOCALE_MAINMENU_SCRIPTS, g_Plugins->hasPlugin(CPlugins::P_TYPE_SCRIPT), NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS, CPlugins::P_TYPE_SCRIPT), "-1", key, icon); - menu_item->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS); + // menu_item = new CMenuForwarder(PLACEHOLDER); + // menu_item->setHint("", NONEXISTANT_LOCALE); + break; + } + case SNeutrinoSettings::ITEM_USER_MENU_24: + { + keyhelper.get(&key, &icon); + // menu_item = new CMenuForwarder(PLACEHOLDER); + // menu_item->setHint("", NONEXISTANT_LOCALE) +; break; } -// case SNeutrinoSettings::ITEM_ECMINFO: -// { -// keyhelper.get(&key, &icon); -// menu_item = new CMenuForwarder(LOCALE_ECMINFO_SHOW, file_size("/tmp/ecm.info"), NULL, neutrino, "ecmInfo", key, icon); -// // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); -// break; -// } -// case SNeutrinoSettings::ITEM_CAMD_RESET: -// { -// keyhelper.get(&key, &icon); -// menu_item = new CMenuForwarder(LOCALE_CAMD_RESET, !rec_mode, NULL, neutrino, "camd_reset", key, icon); -// // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); -// break; -// } -// case SNeutrinoSettings::ITEM_INFOICONS: -// { -// keyhelper.get(&key, &icon); -// menu_item = new CMenuForwarder(!g_settings.mode_icons ? LOCALE_INFOICONS_SWITCH_ON : LOCALE_INFOICONS_SWITCH_OFF, g_settings.mode_icons_skin != INFOICONS_INFOVIEWER, NULL, new CInfoIconsSetup, "infoicons_switch", key, icon); -// // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); -// break; -// } #if ENABLE_YOUTUBE_PLAYER case SNeutrinoSettings::ITEM_YOUTUBE: { @@ -474,48 +425,35 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) menu_item->setHint(NEUTRINO_ICON_HINT_FILEPLAY, LOCALE_MENU_HINT_FILEPLAY_AUDIO); break; } - case SNeutrinoSettings::ITEM_TOOLS: - { - keyhelper.get(&key, &icon); - menu_item = new CMenuDForwarder(LOCALE_MAINMENU_TOOLS, g_Plugins->hasPlugin(CPlugins::P_TYPE_TOOL), NULL, new CPluginList(LOCALE_MAINMENU_TOOLS, CPlugins::P_TYPE_TOOL), "-1", key, icon); - // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); - break; - } - case SNeutrinoSettings::ITEM_LUA: - { - keyhelper.get(&key, &icon); - menu_item = new CMenuDForwarder(LOCALE_MAINMENU_LUA, g_Plugins->hasPlugin(CPlugins::P_TYPE_LUA), NULL, new CPluginList(LOCALE_MAINMENU_LUA, CPlugins::P_TYPE_LUA), "-1", key, icon); - // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); - break; - } -// case SNeutrinoSettings::ITEM_TUNER_RESTART: -// { -// keyhelper.get(&key, &icon); -// menu_item = new CMenuForwarder(LOCALE_SERVICEMENU_RESTART_TUNER, true, NULL, neutrino, "restarttuner", key, icon); -// menu_item->setHint(NEUTRINO_ICON_HINT_RELOAD_CHANNELS, LOCALE_MENU_HINT_RESTART_TUNER); -// break; -// } - case SNeutrinoSettings::ITEM_HDDMENU: - { - keyhelper.get(&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_AUDIOPLAY: + case SNeutrinoSettings::ITEM_AUDIOPLAYER: { keyhelper.get(&key, &icon); menu_item = new CMenuForwarder(LOCALE_AUDIOPLAYER_NAME, true, NULL, neutrino, "audioplayer", key, icon); menu_item->setHint(NEUTRINO_ICON_HINT_APLAY, LOCALE_MENU_HINT_APLAY); break; } - case SNeutrinoSettings::ITEM_INETPLAY: + case SNeutrinoSettings::ITEM_INETPLAYER: { keyhelper.get(&key, &icon); menu_item = new CMenuForwarder(LOCALE_INETRADIO_NAME, true, NULL, neutrino, "inetplayer", key, icon); menu_item->setHint(NEUTRINO_ICON_HINT_INET_RADIO, LOCALE_MENU_HINT_INET_RADIO); break; } + case SNeutrinoSettings::ITEM_USER_MENU_29: + { + keyhelper.get(&key, &icon); + // menu_item = new CMenuForwarder(PLACEHOLDER); + // menu_item->setHint("", NONEXISTANT_LOCALE) +; + break; + } + case SNeutrinoSettings::ITEM_HDDMENU: + { + keyhelper.get(&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); @@ -562,6 +500,70 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; } + case SNeutrinoSettings::ITEM_GAMES: + { + keyhelper.get(&key, &icon); + menu_item = new CMenuDForwarder(LOCALE_MAINMENU_GAMES, g_Plugins->hasPlugin(CPlugins::P_TYPE_GAME), NULL, new CPluginList(LOCALE_MAINMENU_GAMES, CPlugins::P_TYPE_GAME), "-1", key, icon); + menu_item->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES); + break; + } + case SNeutrinoSettings::ITEM_TOOLS: + { + keyhelper.get(&key, &icon); + menu_item = new CMenuDForwarder(LOCALE_MAINMENU_TOOLS, g_Plugins->hasPlugin(CPlugins::P_TYPE_TOOL), NULL, new CPluginList(LOCALE_MAINMENU_TOOLS, CPlugins::P_TYPE_TOOL), "-1", key, icon); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); + break; + } + case SNeutrinoSettings::ITEM_SCRIPTS: + { + keyhelper.get(&key, &icon); + menu_item = new CMenuDForwarder(LOCALE_MAINMENU_SCRIPTS, g_Plugins->hasPlugin(CPlugins::P_TYPE_SCRIPT), NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS, CPlugins::P_TYPE_SCRIPT), "-1", key, icon); + menu_item->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS); + break; + } + case SNeutrinoSettings::ITEM_LUA: + { + keyhelper.get(&key, &icon); + menu_item = new CMenuDForwarder(LOCALE_MAINMENU_LUA, g_Plugins->hasPlugin(CPlugins::P_TYPE_LUA), NULL, new CPluginList(LOCALE_MAINMENU_LUA, CPlugins::P_TYPE_LUA), "-1", key, icon); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); + break; + } + case SNeutrinoSettings::ITEM_PLUGIN_TYPES: + { + unsigned int number_of_plugins = (unsigned int) g_Plugins->getNumberOfPlugins(); + if (!number_of_plugins) + continue; + for (unsigned int count = 0; count < number_of_plugins; count++) + { +#if 0 + bool show = g_Plugins->getType(count) == CPlugins::P_TYPE_TOOL || + g_Plugins->getType(count) == CPlugins::P_TYPE_LUA; +#endif + bool show = false; + if (g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_GAMES]) + show = show || g_Plugins->getType(count) == CPlugins::P_TYPE_GAME; + if (g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_TOOLS]) + show = show || g_Plugins->getType(count) == CPlugins::P_TYPE_TOOL; + if (g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_SCRIPTS]) + show = show || g_Plugins->getType(count) == CPlugins::P_TYPE_SCRIPT; + if (g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_LUA]) + show = show || g_Plugins->getType(count) == CPlugins::P_TYPE_LUA; + + if (show && !g_Plugins->isHidden(count) && (g_Plugins->getIntegration(count) == PLUGIN_INTEGRATION_DISABLED)) + { + menu_items++; + neutrino_msg_t d_key = g_Plugins->getKey(count); + //printf("[neutrino usermenu] plugin %d, set key %d...\n", count, g_Plugins->getKey(count)); + keyhelper.get(&key, &icon, d_key); + menu_item = new CMenuForwarder(g_Plugins->getName(count), true, NULL, CPluginsExec::getInstance(), to_string(count).c_str(), key, icon); + menu_item->setHint(g_Plugins->getHintIcon(count), g_Plugins->getDescription(count)); + + menu->addItem(menu_item, false); + } + } + menu_item = NULL; + break; + } case -1: // plugin { int number_of_plugins = g_Plugins->getNumberOfPlugins(); diff --git a/src/gui/user_menue.h b/src/gui/user_menue.h index 9595b4039..d826f5e6e 100644 --- a/src/gui/user_menue.h +++ b/src/gui/user_menue.h @@ -57,10 +57,10 @@ typedef struct user_menu_data_t #define COL_BUTTONMAX SNeutrinoSettings::BUTTON_MAX static user_menu_data_t user_menu[COL_BUTTONMAX] = { - {LOCALE_USERMENU_TITLE_RED , CRCInput::RC_red , NEUTRINO_ICON_BUTTON_RED , NEUTRINO_ICON_RED, -1}, - {LOCALE_USERMENU_TITLE_GREEN , CRCInput::RC_green , NEUTRINO_ICON_BUTTON_GREEN , NEUTRINO_ICON_GREEN, -1}, - {NONEXISTANT_LOCALE , CRCInput::RC_yellow , NEUTRINO_ICON_BUTTON_YELLOW , NEUTRINO_ICON_YELLOW, -1}, - {LOCALE_USERMENU_TITLE_BLUE , CRCInput::RC_blue , NEUTRINO_ICON_BUTTON_BLUE , NEUTRINO_ICON_BLUE, -1} + { LOCALE_USERMENU_TITLE_RED, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED, NEUTRINO_ICON_RED, -1 }, + { LOCALE_USERMENU_TITLE_GREEN, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN, NEUTRINO_ICON_GREEN, -1 }, + { NONEXISTANT_LOCALE, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW, NEUTRINO_ICON_YELLOW, -1 }, + { LOCALE_USERMENU_TITLE_BLUE, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE, NEUTRINO_ICON_BLUE, -1 } }; // const neutrino_msg_t col_key_helper_msg_def[COL_BUTTONMAX]={ CRCInput::RC_red, CRCInput::RC_green, CRCInput::RC_yellow, CRCInput::RC_blue }; diff --git a/src/gui/user_menue_setup.cpp b/src/gui/user_menue_setup.cpp index 15fc53e00..07e33fe38 100644 --- a/src/gui/user_menue_setup.cpp +++ b/src/gui/user_menue_setup.cpp @@ -67,43 +67,46 @@ static keyvals usermenu_items[] = { { SNeutrinoSettings::ITEM_NONE, LOCALE_USERMENU_ITEM_NONE, usermenu_show }, { SNeutrinoSettings::ITEM_BAR, LOCALE_USERMENU_ITEM_BAR, usermenu_show }, - { SNeutrinoSettings::ITEM_EPG_LIST, LOCALE_EPGMENU_EVENTLIST, usermenu_show }, - { SNeutrinoSettings::ITEM_EPG_SUPER, LOCALE_EPGMENU_EPGPLUS, usermenu_show }, - { SNeutrinoSettings::ITEM_EPG_INFO, LOCALE_EPGMENU_EVENTINFO, usermenu_show }, + { SNeutrinoSettings::ITEM_EVENTLIST, LOCALE_EPGMENU_EVENTLIST, usermenu_show }, + { SNeutrinoSettings::ITEM_EPGPLUS, LOCALE_EPGMENU_EPGPLUS, usermenu_show }, + { SNeutrinoSettings::ITEM_EVENTINFO, LOCALE_EPGMENU_EVENTINFO, usermenu_show }, { SNeutrinoSettings::ITEM_EPG_MISC, LOCALE_USERMENU_ITEM_EPG_MISC, usermenu_show }, { SNeutrinoSettings::ITEM_AUDIO_SELECT, LOCALE_AUDIOSELECTMENUE_HEAD, usermenu_show }, { SNeutrinoSettings::ITEM_SUBCHANNEL, LOCALE_NVODSELECTOR_HEAD, usermenu_show }, { SNeutrinoSettings::ITEM_RECORD, LOCALE_TIMERLIST_TYPE_RECORD, usermenu_show }, - { SNeutrinoSettings::ITEM_MOVIEPLAYER_MB, LOCALE_MOVIEBROWSER_HEAD, usermenu_show }, + { SNeutrinoSettings::ITEM_TIMESHIFT, LOCALE_RECORDINGMENU_TIMESHIFT, usermenu_show }, + { SNeutrinoSettings::ITEM_MOVIEBROWSER, LOCALE_MOVIEBROWSER_HEAD, usermenu_show }, { SNeutrinoSettings::ITEM_TIMERLIST, LOCALE_TIMERLIST_NAME, usermenu_show }, { SNeutrinoSettings::ITEM_VTXT, LOCALE_USERMENU_ITEM_VTXT, usermenu_show }, - { SNeutrinoSettings::ITEM_FAVORITS, LOCALE_FAVORITES_MENUEADD, usermenu_show }, - { SNeutrinoSettings::ITEM_TECHINFO, LOCALE_EPGMENU_STREAMINFO, usermenu_show }, - { SNeutrinoSettings::ITEM_REMOTE, LOCALE_RCLOCK_TITLE, usermenu_show }, - { SNeutrinoSettings::ITEM_PLUGIN_TYPES, LOCALE_USERMENU_ITEM_PLUGIN_TYPES, usermenu_show }, + { SNeutrinoSettings::ITEM_FAVORITES, LOCALE_FAVORITES_MENUEADD, usermenu_show }, + { SNeutrinoSettings::ITEM_STREAMINFO, LOCALE_EPGMENU_STREAMINFO, usermenu_show }, { SNeutrinoSettings::ITEM_IMAGEINFO, LOCALE_SERVICEMENU_IMAGEINFO, usermenu_show }, { SNeutrinoSettings::ITEM_BOXINFO, LOCALE_EXTRA_DBOXINFO, usermenu_show }, + { SNeutrinoSettings::ITEM_RCLOCK, LOCALE_RCLOCK_TITLE, usermenu_show }, { SNeutrinoSettings::ITEM_CAM, LOCALE_CI_SETTINGS, usermenu_show_cam }, { SNeutrinoSettings::ITEM_CLOCK, LOCALE_CLOCK_SWITCH_ON, usermenu_show }, - { SNeutrinoSettings::ITEM_GAMES, LOCALE_MAINMENU_GAMES, usermenu_show }, - { SNeutrinoSettings::ITEM_SCRIPTS, LOCALE_MAINMENU_SCRIPTS, usermenu_show }, + { SNeutrinoSettings::ITEM_USER_MENU_22, NONEXISTANT_LOCALE, usermenu_show }, + { SNeutrinoSettings::ITEM_USER_MENU_23, NONEXISTANT_LOCALE, usermenu_show }, + { SNeutrinoSettings::ITEM_USER_MENU_24, NONEXISTANT_LOCALE, usermenu_show }, { SNeutrinoSettings::ITEM_YOUTUBE, LOCALE_MOVIEPLAYER_YTPLAYBACK, usermenu_show }, { SNeutrinoSettings::ITEM_FILEPLAY_VIDEO, LOCALE_MOVIEPLAYER_FILEPLAYBACK_VIDEO, usermenu_show }, - { SNeutrinoSettings::ITEM_TOOLS, LOCALE_MAINMENU_TOOLS, usermenu_show }, - { SNeutrinoSettings::ITEM_LUA, LOCALE_MAINMENU_LUA, usermenu_show }, + { SNeutrinoSettings::ITEM_FILEPLAY_AUDIO, LOCALE_MOVIEPLAYER_FILEPLAYBACK_AUDIO, usermenu_show }, + { SNeutrinoSettings::ITEM_AUDIOPLAYER, LOCALE_AUDIOPLAYER_NAME, usermenu_show }, + { SNeutrinoSettings::ITEM_INETPLAYER, LOCALE_INETRADIO_NAME, usermenu_show }, + { SNeutrinoSettings::ITEM_USER_MENU_29, NONEXISTANT_LOCALE, usermenu_show }, { SNeutrinoSettings::ITEM_HDDMENU, LOCALE_HDD_SETTINGS, usermenu_show }, - { SNeutrinoSettings::ITEM_AUDIOPLAY, LOCALE_AUDIOPLAYER_NAME, usermenu_show }, - { SNeutrinoSettings::ITEM_INETPLAY, LOCALE_INETRADIO_NAME, usermenu_show }, { SNeutrinoSettings::ITEM_NETSETTINGS, LOCALE_MAINSETTINGS_NETWORK, usermenu_show }, -#ifdef ENABLE_LCD4LINUX - { SNeutrinoSettings::ITEM_LCD4LINUX, LOCALE_LCD4L_SUPPORT, usermenu_show }, -#endif + { SNeutrinoSettings::ITEM_LCD4LINUX, LOCALE_LCD4L_SUPPORT, usermenu_show }, { SNeutrinoSettings::ITEM_SWUPDATE, LOCALE_SERVICEMENU_UPDATE, usermenu_show }, { SNeutrinoSettings::ITEM_LIVESTREAM_RESOLUTION, LOCALE_LIVESTREAM_RESOLUTION, usermenu_show }, { SNeutrinoSettings::ITEM_ADZAP, LOCALE_USERMENU_ITEM_ADZAP, usermenu_show }, { SNeutrinoSettings::ITEM_TESTMENU, LOCALE_TESTMENU, usermenu_show }, - { SNeutrinoSettings::ITEM_FILEPLAY_AUDIO, LOCALE_MOVIEPLAYER_FILEPLAYBACK_AUDIO, usermenu_show }, - { SNeutrinoSettings::ITEM_TIMESHIFT, LOCALE_RECORDINGMENU_TIMESHIFT, usermenu_show }, + + { SNeutrinoSettings::ITEM_GAMES, LOCALE_MAINMENU_GAMES, usermenu_show }, + { SNeutrinoSettings::ITEM_TOOLS, LOCALE_MAINMENU_TOOLS, usermenu_show }, + { SNeutrinoSettings::ITEM_SCRIPTS, LOCALE_MAINMENU_SCRIPTS, usermenu_show }, + { SNeutrinoSettings::ITEM_LUA, LOCALE_MAINMENU_LUA, usermenu_show }, + { SNeutrinoSettings::ITEM_PLUGIN_TYPES, LOCALE_USERMENU_ITEM_PLUGIN_TYPES, usermenu_show }, { SNeutrinoSettings::ITEM_MAX, NONEXISTANT_LOCALE, usermenu_show } }; diff --git a/src/system/settings.h b/src/system/settings.h index d7ebed9fd..75bda1a43 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -1122,19 +1122,19 @@ struct SNeutrinoSettings // Do not change ordering of members, add new item just before ITEM_MAX! ITEM_NONE = 0, ITEM_BAR = 1, - ITEM_EPG_LIST = 2, - ITEM_EPG_SUPER = 3, - ITEM_EPG_INFO = 4, + ITEM_EVENTLIST = 2, + ITEM_EPGPLUS = 3, + ITEM_EVENTINFO = 4, ITEM_EPG_MISC = 5, ITEM_AUDIO_SELECT = 6, ITEM_SUBCHANNEL = 7, ITEM_RECORD = 8, - ITEM_MOVIEPLAYER_MB = 9, + ITEM_MOVIEBROWSER = 9, ITEM_TIMERLIST = 10, ITEM_VTXT = 11, - ITEM_FAVORITS = 12, - ITEM_TECHINFO = 13, - ITEM_REMOTE = 14, + ITEM_FAVORITES = 12, + ITEM_STREAMINFO = 13, + ITEM_RCLOCK = 14, ITEM_PLUGIN_TYPES = 15, ITEM_IMAGEINFO = 16, ITEM_BOXINFO = 17, @@ -1142,17 +1142,17 @@ struct SNeutrinoSettings ITEM_CLOCK = 19, ITEM_GAMES = 20, ITEM_SCRIPTS = 21, - - - + ITEM_USER_MENU_22 = 22, + ITEM_USER_MENU_23 = 23, + ITEM_USER_MENU_24 = 24, ITEM_YOUTUBE = 25, ITEM_FILEPLAY_VIDEO = 26, ITEM_TOOLS = 27, ITEM_LUA = 28, - ITEM_TUNER_RESTART = 29, + ITEM_USER_MENU_29 = 29, ITEM_HDDMENU = 30, - ITEM_AUDIOPLAY = 31, - ITEM_INETPLAY = 32, + ITEM_AUDIOPLAYER = 31, + ITEM_INETPLAYER = 32, ITEM_NETSETTINGS = 33, ITEM_SWUPDATE = 34, ITEM_LIVESTREAM_RESOLUTION = 35,