mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

- usermenu: rename/resort some items

Browse Source 
Conflicts:
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-12-31 00:25:55 +01:00
committed by Thilo Graf
parent 5e974d5dc3
commit 035c3c3a89
4 changed files with 153 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

226
src/gui/user_menue.cpp
View File

@@ -226,21 +226,21 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
menu->addItem(GenericMenuSeparatorLine); menu->addItem(GenericMenuSeparatorLine);
break; break;
} }
case SNeutrinoSettings::ITEM_EPG_LIST: case SNeutrinoSettings::ITEM_EVENTLIST:
{ {
keyhelper.get(&key, &icon, CRCInput::RC_red); keyhelper.get(&key, &icon, CRCInput::RC_red);
menu_item = new CMenuDForwarder(LOCALE_EPGMENU_EVENTLIST, true, NULL, new CEventListHandler, "-1", key, icon); menu_item = new CMenuDForwarder(LOCALE_EPGMENU_EVENTLIST, true, NULL, new CEventListHandler, "-1", key, icon);
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE); // FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
break; break;
} }
case SNeutrinoSettings::ITEM_EPG_SUPER: case SNeutrinoSettings::ITEM_EPGPLUS:
{ {
keyhelper.get(&key, &icon, CRCInput::RC_green); keyhelper.get(&key, &icon, CRCInput::RC_green);
menu_item = new CMenuDForwarder(LOCALE_EPGMENU_EPGPLUS, true, NULL, new CEPGplusHandler, "-1", key, icon); menu_item = new CMenuDForwarder(LOCALE_EPGMENU_EPGPLUS, true, NULL, new CEPGplusHandler, "-1", key, icon);
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE); // FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
break; break;
} }
case SNeutrinoSettings::ITEM_EPG_INFO: case SNeutrinoSettings::ITEM_EVENTINFO:
{ {
keyhelper.get(&key, &icon, CRCInput::RC_yellow); keyhelper.get(&key, &icon, CRCInput::RC_yellow);
menu_item = new CMenuDForwarder(LOCALE_EPGMENU_EVENTINFO, true, NULL, new CEPGDataHandler, "-1", key, icon); 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); // FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
break; break;
} }
case SNeutrinoSettings::ITEM_MOVIEPLAYER_MB: case SNeutrinoSettings::ITEM_MOVIEBROWSER:
{ {
if (g_settings.recording_type == CNeutrinoApp::RECORDING_OFF) if (g_settings.recording_type == CNeutrinoApp::RECORDING_OFF)
break; break;
@@ -324,70 +324,27 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
menu_item->setHint(NEUTRINO_ICON_HINT_TIMERS, LOCALE_MENU_HINT_TIMERS); menu_item->setHint(NEUTRINO_ICON_HINT_TIMERS, LOCALE_MENU_HINT_TIMERS);
break; break;
} }
// case SNeutrinoSettings::ITEM_VTXT: case SNeutrinoSettings::ITEM_VTXT:
// { {
// keyhelper.get(&key, &icon, feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_VTXT]].key); // CRCInput::RC_blue 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 = new CMenuForwarder(LOCALE_USERMENU_ITEM_VTXT, true, NULL, CPluginsExec::getInstance(), "teletext", key, icon);
// menu_item->setHint(NEUTRINO_ICON_HINT_VTXT, LOCALE_USERMENU_ITEM_VTXT); // menu_item->setHint(NEUTRINO_ICON_HINT_VTXT, LOCALE_USERMENU_ITEM_VTXT);
// break; break;
// } }
case SNeutrinoSettings::ITEM_FAVORITS: case SNeutrinoSettings::ITEM_FAVORITES:
{ {
keyhelper.get(&key, &icon, feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_FAVORIT]].key); // CRCInput::RC_green 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); menu_item = new CMenuDForwarder(LOCALE_FAVORITES_MENUEADD, true, NULL, new CFavorites, "-1", key, icon);
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE); // FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
break; break;
} }
case SNeutrinoSettings::ITEM_TECHINFO: case SNeutrinoSettings::ITEM_STREAMINFO:
{ {
keyhelper.get(&key, &icon, CRCInput::RC_blue); 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 = 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); menu_item->setHint(NEUTRINO_ICON_HINT_STREAMINFO, LOCALE_MENU_HINT_STREAMINFO);
break; 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: case SNeutrinoSettings::ITEM_IMAGEINFO:
{ {
keyhelper.get(&key, &icon); 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); menu_item->setHint(NEUTRINO_ICON_HINT_DBOXINFO, LOCALE_MENU_HINT_DBOXINFO);
break; 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: case SNeutrinoSettings::ITEM_CAM:
{ {
keyhelper.get(&key, &icon); keyhelper.get(&key, &icon);
@@ -416,41 +380,28 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
menu_item->setHint("", LOCALE_MENU_HINT_CLOCK_MODE); menu_item->setHint("", LOCALE_MENU_HINT_CLOCK_MODE);
break; break;
} }
case SNeutrinoSettings::ITEM_GAMES: case SNeutrinoSettings::ITEM_USER_MENU_22:
{ {
keyhelper.get(&key, &icon); 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 = new CMenuForwarder(PLACEHOLDER);
menu_item->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES); // menu_item->setHint("", NONEXISTANT_LOCALE);
break; break;
} }
case SNeutrinoSettings::ITEM_SCRIPTS: case SNeutrinoSettings::ITEM_USER_MENU_23:
{ {
keyhelper.get(&key, &icon); 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 = new CMenuForwarder(PLACEHOLDER);
menu_item->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS); // 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; 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 #if ENABLE_YOUTUBE_PLAYER
case SNeutrinoSettings::ITEM_YOUTUBE: 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); menu_item->setHint(NEUTRINO_ICON_HINT_FILEPLAY, LOCALE_MENU_HINT_FILEPLAY_AUDIO);
break; break;
} }
case SNeutrinoSettings::ITEM_TOOLS: case SNeutrinoSettings::ITEM_AUDIOPLAYER:
{
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:
{ {
keyhelper.get(&key, &icon); keyhelper.get(&key, &icon);
menu_item = new CMenuForwarder(LOCALE_AUDIOPLAYER_NAME, true, NULL, neutrino, "audioplayer", 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); menu_item->setHint(NEUTRINO_ICON_HINT_APLAY, LOCALE_MENU_HINT_APLAY);
break; break;
} }
case SNeutrinoSettings::ITEM_INETPLAY: case SNeutrinoSettings::ITEM_INETPLAYER:
{ {
keyhelper.get(&key, &icon); keyhelper.get(&key, &icon);
menu_item = new CMenuForwarder(LOCALE_INETRADIO_NAME, true, NULL, neutrino, "inetplayer", 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); menu_item->setHint(NEUTRINO_ICON_HINT_INET_RADIO, LOCALE_MENU_HINT_INET_RADIO);
break; 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: case SNeutrinoSettings::ITEM_NETSETTINGS:
{ {
keyhelper.get(&key, &icon); keyhelper.get(&key, &icon);
@@ -562,6 +500,70 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE); // FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
break; 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 case -1: // plugin
{ {
int number_of_plugins = g_Plugins->getNumberOfPlugins(); int number_of_plugins = g_Plugins->getNumberOfPlugins();

39
src/gui/user_menue_setup.cpp
View File

@@ -67,43 +67,46 @@ static keyvals usermenu_items[] =
{ {
{ SNeutrinoSettings::ITEM_NONE, LOCALE_USERMENU_ITEM_NONE, usermenu_show }, { SNeutrinoSettings::ITEM_NONE, LOCALE_USERMENU_ITEM_NONE, usermenu_show },
{ SNeutrinoSettings::ITEM_BAR, LOCALE_USERMENU_ITEM_BAR, usermenu_show }, { SNeutrinoSettings::ITEM_BAR, LOCALE_USERMENU_ITEM_BAR, usermenu_show },
{ SNeutrinoSettings::ITEM_EPG_LIST, LOCALE_EPGMENU_EVENTLIST, usermenu_show }, { SNeutrinoSettings::ITEM_EVENTLIST, LOCALE_EPGMENU_EVENTLIST, usermenu_show },
{ SNeutrinoSettings::ITEM_EPG_SUPER, LOCALE_EPGMENU_EPGPLUS, usermenu_show }, { SNeutrinoSettings::ITEM_EPGPLUS, LOCALE_EPGMENU_EPGPLUS, usermenu_show },
{ SNeutrinoSettings::ITEM_EPG_INFO, LOCALE_EPGMENU_EVENTINFO, usermenu_show }, { SNeutrinoSettings::ITEM_EVENTINFO, LOCALE_EPGMENU_EVENTINFO, usermenu_show },
{ SNeutrinoSettings::ITEM_EPG_MISC, LOCALE_USERMENU_ITEM_EPG_MISC, usermenu_show }, { SNeutrinoSettings::ITEM_EPG_MISC, LOCALE_USERMENU_ITEM_EPG_MISC, usermenu_show },
{ SNeutrinoSettings::ITEM_AUDIO_SELECT, LOCALE_AUDIOSELECTMENUE_HEAD, usermenu_show }, { SNeutrinoSettings::ITEM_AUDIO_SELECT, LOCALE_AUDIOSELECTMENUE_HEAD, usermenu_show },
{ SNeutrinoSettings::ITEM_SUBCHANNEL, LOCALE_NVODSELECTOR_HEAD, usermenu_show }, { SNeutrinoSettings::ITEM_SUBCHANNEL, LOCALE_NVODSELECTOR_HEAD, usermenu_show },
{ SNeutrinoSettings::ITEM_RECORD, LOCALE_TIMERLIST_TYPE_RECORD, 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_TIMERLIST, LOCALE_TIMERLIST_NAME, usermenu_show },
{ SNeutrinoSettings::ITEM_VTXT, LOCALE_USERMENU_ITEM_VTXT, usermenu_show }, { SNeutrinoSettings::ITEM_VTXT, LOCALE_USERMENU_ITEM_VTXT, usermenu_show },
{ SNeutrinoSettings::ITEM_FAVORITS, LOCALE_FAVORITES_MENUEADD, usermenu_show }, { SNeutrinoSettings::ITEM_FAVORITES, LOCALE_FAVORITES_MENUEADD, usermenu_show },
{ SNeutrinoSettings::ITEM_TECHINFO, LOCALE_EPGMENU_STREAMINFO, usermenu_show }, { SNeutrinoSettings::ITEM_STREAMINFO, 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_IMAGEINFO, LOCALE_SERVICEMENU_IMAGEINFO, usermenu_show }, { SNeutrinoSettings::ITEM_IMAGEINFO, LOCALE_SERVICEMENU_IMAGEINFO, usermenu_show },
{ SNeutrinoSettings::ITEM_BOXINFO, LOCALE_EXTRA_DBOXINFO, 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_CAM, LOCALE_CI_SETTINGS, usermenu_show_cam },
{ SNeutrinoSettings::ITEM_CLOCK, LOCALE_CLOCK_SWITCH_ON, usermenu_show }, { SNeutrinoSettings::ITEM_CLOCK, LOCALE_CLOCK_SWITCH_ON, usermenu_show },
{ SNeutrinoSettings::ITEM_GAMES, LOCALE_MAINMENU_GAMES, usermenu_show }, { SNeutrinoSettings::ITEM_USER_MENU_22, NONEXISTANT_LOCALE, usermenu_show },
{ SNeutrinoSettings::ITEM_SCRIPTS, LOCALE_MAINMENU_SCRIPTS, 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_YOUTUBE, LOCALE_MOVIEPLAYER_YTPLAYBACK, usermenu_show },
{ SNeutrinoSettings::ITEM_FILEPLAY_VIDEO, LOCALE_MOVIEPLAYER_FILEPLAYBACK_VIDEO, usermenu_show }, { SNeutrinoSettings::ITEM_FILEPLAY_VIDEO, LOCALE_MOVIEPLAYER_FILEPLAYBACK_VIDEO, usermenu_show },
{ SNeutrinoSettings::ITEM_TOOLS, LOCALE_MAINMENU_TOOLS, usermenu_show }, { SNeutrinoSettings::ITEM_FILEPLAY_AUDIO, LOCALE_MOVIEPLAYER_FILEPLAYBACK_AUDIO, usermenu_show },
{ SNeutrinoSettings::ITEM_LUA, LOCALE_MAINMENU_LUA, 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_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 }, { SNeutrinoSettings::ITEM_NETSETTINGS, LOCALE_MAINSETTINGS_NETWORK, usermenu_show },
#ifdef ENABLE_LCD4LINUX
{ SNeutrinoSettings::ITEM_LCD4LINUX, LOCALE_LCD4L_SUPPORT, usermenu_show }, { SNeutrinoSettings::ITEM_LCD4LINUX, LOCALE_LCD4L_SUPPORT, usermenu_show },
#endif
{ SNeutrinoSettings::ITEM_SWUPDATE, LOCALE_SERVICEMENU_UPDATE, usermenu_show }, { SNeutrinoSettings::ITEM_SWUPDATE, LOCALE_SERVICEMENU_UPDATE, usermenu_show },
{ SNeutrinoSettings::ITEM_LIVESTREAM_RESOLUTION, LOCALE_LIVESTREAM_RESOLUTION, usermenu_show }, { SNeutrinoSettings::ITEM_LIVESTREAM_RESOLUTION, LOCALE_LIVESTREAM_RESOLUTION, usermenu_show },
{ SNeutrinoSettings::ITEM_ADZAP, LOCALE_USERMENU_ITEM_ADZAP, usermenu_show }, { SNeutrinoSettings::ITEM_ADZAP, LOCALE_USERMENU_ITEM_ADZAP, usermenu_show },
{ SNeutrinoSettings::ITEM_TESTMENU, LOCALE_TESTMENU, 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 } { SNeutrinoSettings::ITEM_MAX, NONEXISTANT_LOCALE, usermenu_show }
}; };

26
src/system/settings.h
View File

@@ -1122,19 +1122,19 @@ struct SNeutrinoSettings
// Do not change ordering of members, add new item just before ITEM_MAX! // Do not change ordering of members, add new item just before ITEM_MAX!
ITEM_NONE = 0, ITEM_NONE = 0,
ITEM_BAR = 1, ITEM_BAR = 1,
ITEM_EPG_LIST = 2, ITEM_EVENTLIST = 2,
ITEM_EPG_SUPER = 3, ITEM_EPGPLUS = 3,
ITEM_EPG_INFO = 4, ITEM_EVENTINFO = 4,
ITEM_EPG_MISC = 5, ITEM_EPG_MISC = 5,
ITEM_AUDIO_SELECT = 6, ITEM_AUDIO_SELECT = 6,
ITEM_SUBCHANNEL = 7, ITEM_SUBCHANNEL = 7,
ITEM_RECORD = 8, ITEM_RECORD = 8,
ITEM_MOVIEPLAYER_MB = 9, ITEM_MOVIEBROWSER = 9,
ITEM_TIMERLIST = 10, ITEM_TIMERLIST = 10,
ITEM_VTXT = 11, ITEM_VTXT = 11,
ITEM_FAVORITS = 12, ITEM_FAVORITES = 12,
ITEM_TECHINFO = 13, ITEM_STREAMINFO = 13,
ITEM_REMOTE = 14, ITEM_RCLOCK = 14,
ITEM_PLUGIN_TYPES = 15, ITEM_PLUGIN_TYPES = 15,
ITEM_IMAGEINFO = 16, ITEM_IMAGEINFO = 16,
ITEM_BOXINFO = 17, ITEM_BOXINFO = 17,
@@ -1142,17 +1142,17 @@ struct SNeutrinoSettings
ITEM_CLOCK = 19, ITEM_CLOCK = 19,
ITEM_GAMES = 20, ITEM_GAMES = 20,
ITEM_SCRIPTS = 21, ITEM_SCRIPTS = 21,
ITEM_USER_MENU_22 = 22,
ITEM_USER_MENU_23 = 23,
ITEM_USER_MENU_24 = 24,
ITEM_YOUTUBE = 25, ITEM_YOUTUBE = 25,
ITEM_FILEPLAY_VIDEO = 26, ITEM_FILEPLAY_VIDEO = 26,
ITEM_TOOLS = 27, ITEM_TOOLS = 27,
ITEM_LUA = 28, ITEM_LUA = 28,
ITEM_TUNER_RESTART = 29, ITEM_USER_MENU_29 = 29,
ITEM_HDDMENU = 30, ITEM_HDDMENU = 30,
ITEM_AUDIOPLAY = 31, ITEM_AUDIOPLAYER = 31,
ITEM_INETPLAY = 32, ITEM_INETPLAYER = 32,
ITEM_NETSETTINGS = 33, ITEM_NETSETTINGS = 33,
ITEM_SWUPDATE = 34, ITEM_SWUPDATE = 34,
ITEM_LIVESTREAM_RESOLUTION = 35, ITEM_LIVESTREAM_RESOLUTION = 35,