diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index 2392cc794..02f8bf4fc 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -441,6 +441,7 @@ int CMiscMenue::showMiscSettingsMenuEnergy() void CMiscMenue::showMiscSettingsMenuEpg(CMenuWidget *ms_epg) { ms_epg->addIntroItems(LOCALE_MISCSETTINGS_EPG_HEAD); + ms_epg->addKey(CRCInput::RC_help, this, "info"); ms_epg->addKey(CRCInput::RC_info, this, "info"); epg_save = new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SAVE, &g_settings.epg_save, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this); diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp index 5cd8e4288..24426a588 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -288,7 +288,11 @@ int CNetworkSetup::showNetworkSetup() mf->setHint("", LOCALE_MENU_HINT_NET_TEST); networkSettings->addItem(mf); //test +#if BOXMODEL_VUPLUS + mf = new CMenuForwarder(LOCALE_NETWORKMENU_SHOW, true, NULL, this, "networkshow", CRCInput::RC_help); +#else mf = new CMenuForwarder(LOCALE_NETWORKMENU_SHOW, true, NULL, this, "networkshow", CRCInput::RC_info); +#endif mf->setHint("", LOCALE_MENU_HINT_NET_SHOW); networkSettings->addItem(mf); //show settings diff --git a/src/gui/opkg_manager.cpp b/src/gui/opkg_manager.cpp index 88659bf7a..529a01b53 100644 --- a/src/gui/opkg_manager.cpp +++ b/src/gui/opkg_manager.cpp @@ -568,6 +568,7 @@ int COPKGManager::showMenu() menu_offset = menu->getItemsCount(); + menu->addKey(CRCInput::RC_help, this, "rc_info"); menu->addKey(CRCInput::RC_info, this, "rc_info"); menu->addKey(CRCInput::RC_blue, this, "rc_blue"); menu->addKey(CRCInput::RC_yellow, this, "rc_yellow"); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 1e1cb14f6..59628acb6 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3019,6 +3019,22 @@ void CNeutrinoApp::RealRun() } if( ( mode == NeutrinoModes::mode_tv ) || ( mode == NeutrinoModes::mode_radio ) || ( mode == NeutrinoModes::mode_webtv ) || ( mode == NeutrinoModes::mode_webradio ) ) { +#if 0 + if (blank_screen) { + if (!videoDecoder->getBlank()) { + INFO("blank_screen auto off"); + blank_screen = false; + } + else if (msg <= CRCInput::RC_MaxRC) { + INFO("blank_screen manual off"); + blank_screen = false; + videoDecoder->setBlank(blank_screen); + //eat key - just leave blank screen + g_RCInput->clearRCMsg(); + continue; + } + } +#endif if( (msg == NeutrinoMessages::SHOW_EPG) /* || (msg == CRCInput::RC_info) */ ) { InfoClock->enableInfoClock(false); @@ -3148,14 +3164,14 @@ void CNeutrinoApp::RealRun() if (mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio) tvMode(); else if (!g_InfoViewer->is_visible) - g_RCInput->postMsg(NeutrinoMessages::SHOW_INFOBAR, 0); + g_RCInput->postMsg(CRCInput::RC_info, 0); } else if (msg == CRCInput::RC_radio) { if (mode == NeutrinoModes::mode_tv || mode == NeutrinoModes::mode_webtv) radioMode(); else if (!g_InfoViewer->is_visible) - g_RCInput->postMsg(NeutrinoMessages::SHOW_INFOBAR, 0); + g_RCInput->postMsg(CRCInput::RC_info, 0); } else #endif