From d00a45e34f714ea4f028d5af92a92e2218a5a31e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 9 Dec 2019 23:01:54 +0100 Subject: [PATCH] add some mor help keys; fix bf1412a5c512f65b902227c6a929fa0a124e46dc Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/08b5b192b2e785d7f401bb6fe7199a2c3773c3a7 Author: vanhofen Date: 2019-12-09 (Mon, 09 Dec 2019) Origin message was: ------------------ - add some mor help keys; fix bf1412a5c512f65b902227c6a929fa0a124e46dc ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/miscsettings_menu.cpp | 1 + src/gui/network_setup.cpp | 4 ++++ src/gui/opkg_manager.cpp | 1 + src/neutrino.cpp | 6 +++--- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index 72f1fa1c7..7ac66dd2f 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -438,6 +438,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 9e76f4969..2c301aeff 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -289,7 +289,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 bb8624b6f..4155dd2fd 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 bf13e3e90..68763738e 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3138,7 +3138,7 @@ void CNeutrinoApp::RealRun() continue; } } - if( (msg == NeutrinoMessages::SHOW_EPG) /* || (msg == CRCInput::RC_info) */ ) { + if (msg == NeutrinoMessages::SHOW_EPG) { InfoClock->enableInfoClock(false); InfoIcons->enableInfoIcons(false); //NI InfoIcons StopSubtitles(); @@ -3275,14 +3275,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