From 816de89898a2bc989cfeb89094c8985e723ffd79 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 12 Sep 2017 23:42:52 +0200 Subject: [PATCH] - drop easymenu --- data/locale/deutsch.locale | 2 - data/locale/english.locale | 2 - src/gui/audio_select.cpp | 10 +- src/gui/audio_setup.cpp | 72 ++++--- src/gui/cam_menu.cpp | 57 +++--- src/gui/info_menue.cpp | 6 - src/gui/mediaplayer.cpp | 82 +++----- src/gui/miscsettings_menu.cpp | 6 - src/gui/movieplayer.cpp | 14 +- src/gui/network_setup.cpp | 40 ++-- src/gui/parentallock_setup.cpp | 20 +- src/gui/personalize.cpp | 44 +---- src/gui/record_setup.cpp | 77 +++----- src/gui/scan_setup.cpp | 37 +--- src/gui/settings_manager.cpp | 41 ++-- src/gui/start_wizard.cpp | 2 +- src/gui/update_menue.cpp | 33 ++-- src/gui/videosettings.cpp | 71 +++---- src/neutrino.cpp | 37 +--- src/neutrino_menue.cpp | 330 +++++++++++---------------------- src/neutrino_menue.h | 1 - src/system/locals.h | 2 - src/system/locals_intern.h | 2 - src/system/settings.h | 1 - version_pseudo.h | 2 +- 25 files changed, 338 insertions(+), 653 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 1319f74a8..022192b09 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -942,7 +942,6 @@ mainmenu.scripts Skripte mainmenu.service Service mainmenu.settings Einstellungen mainmenu.shutdown Ausschalten -mainmenu.shutdown_menu Ausschalt Optionen mainmenu.sleeptimer SleepTimer mainmenu.standby Standby mainmenu.tools Werkzeuge @@ -1424,7 +1423,6 @@ menu.hint_shoutcast_enabled Schaltet die SHOUTcast-Unterstützung ein oder aus menu.hint_show_mute_icon Definiert, ob bei einem Lautstärkewert von 0 das Stumm-Symbol eingeblendet werden soll menu.hint_shutdown Setzen Sie Ihre Box in den Standby-Modus oder schalten Sie die Box komplett aus menu.hint_shutdown_count Die Zeit zum Herunterfahren in den Deep-Standby, wenn die Box im Standby-Modus ist -menu.hint_shutdown_menu Versetzen des Receivers in den Standby Modus, ausschalten des Receivers, setzen des Sleep Timers menu.hint_shutdown_rcdelay Aktiviert den Deep-Standby, wenn die Power-Taste länger als 1 Sekunde betätigt wird menu.hint_shutdown_real Aktiviert den Standby-Modus. Ist diese Option deaktiviert, fährt die Box in den Deep-Standby menu.hint_sleeptimer Zeitschaltuhr auf Ihrer Box aktivieren\nDie Box fährt dann in den Standby-Modus diff --git a/data/locale/english.locale b/data/locale/english.locale index 474aeeed7..c6c774507 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -942,7 +942,6 @@ mainmenu.scripts Scripts mainmenu.service Installation (service) mainmenu.settings System settings mainmenu.shutdown Shutdown (deep standby) -mainmenu.shutdown_menu Shutdown mainmenu.sleeptimer SleepTimer mainmenu.standby Standby mainmenu.tools Tools @@ -1424,7 +1423,6 @@ menu.hint_shoutcast_enabled Enable or disable SHOUTcast support menu.hint_show_mute_icon Show mute icon, when volume set to 0 menu.hint_shutdown Put your box in deep standby mode\nNo confirmation menu.hint_shutdown_count Time to put box in deep-standby\nfrom soft-standby mode -menu.hint_shutdown_menu Put you receiver in sleep or deep standby mode, set sleep timer menu.hint_shutdown_rcdelay Enable deep-standby, if power button\npressed more than 1 second menu.hint_shutdown_real Enable soft-standby mode\nIf disabled, power button put box to deep-standby menu.hint_sleeptimer Set timer to put your box\nin sleep mode diff --git a/src/gui/audio_select.cpp b/src/gui/audio_select.cpp index 8d2adfba9..e94501c3b 100644 --- a/src/gui/audio_select.cpp +++ b/src/gui/audio_select.cpp @@ -134,12 +134,10 @@ int CAudioSelectMenuHandler::doMenu () AudioSelector.addItem( oj ); - if (!g_settings.easymenu) { - oj = new CMenuOptionChooser(LOCALE_AUDIOMENU_ANALOG_OUT, &g_settings.analog_out, - OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, - true, audioSetupNotifier, CRCInput::RC_green); - AudioSelector.addItem( oj ); - } + oj = new CMenuOptionChooser(LOCALE_AUDIOMENU_ANALOG_OUT, &g_settings.analog_out, + OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, + true, audioSetupNotifier, CRCInput::RC_green); + AudioSelector.addItem( oj ); CChannelList *channelList = CNeutrinoApp::getInstance ()->channelList; int curnum = channelList->getActiveChannelNumber(); diff --git a/src/gui/audio_setup.cpp b/src/gui/audio_setup.cpp index 848a747e3..82d658877 100644 --- a/src/gui/audio_setup.cpp +++ b/src/gui/audio_setup.cpp @@ -158,20 +158,19 @@ int CAudioSetup::showAudioSetup() CMenuOptionChooser * as_oj_avsync = NULL; CMenuOptionNumberChooser * as_oj_vsteps = NULL; CMenuOptionNumberChooser * st = NULL; - if (!g_settings.easymenu) { - //av synch - as_oj_avsync = new CMenuOptionChooser(LOCALE_AUDIOMENU_AVSYNC, &g_settings.avsync, AUDIOMENU_AVSYNC_OPTIONS, AUDIOMENU_AVSYNC_OPTION_COUNT, true, audioSetupNotifier); - as_oj_avsync->setHint("", LOCALE_MENU_HINT_AUDIO_AVSYNC); - //volume steps - as_oj_vsteps = new CMenuOptionNumberChooser(LOCALE_AUDIOMENU_VOLUME_STEP, (int *)&g_settings.current_volume_step, true, 1, 25, NULL); - as_oj_vsteps->setHint("", LOCALE_MENU_HINT_AUDIO_VOLSTEP); + //av synch + as_oj_avsync = new CMenuOptionChooser(LOCALE_AUDIOMENU_AVSYNC, &g_settings.avsync, AUDIOMENU_AVSYNC_OPTIONS, AUDIOMENU_AVSYNC_OPTION_COUNT, true, audioSetupNotifier); + as_oj_avsync->setHint("", LOCALE_MENU_HINT_AUDIO_AVSYNC); - st = new CMenuOptionNumberChooser(LOCALE_AUDIOMENU_VOLUME_START, &g_settings.start_volume, true, -1, 100, NULL, CRCInput::RC_nokey, NULL, 0, -1, LOCALE_OPTIONS_OFF); - st->setHint("", LOCALE_MENU_HINT_AUDIO_VOLSTART); - //clock rec - //CMenuOptionChooser * as_oj_clockrec new CMenuOptionChooser(LOCALE_AUDIOMENU_CLOCKREC, &g_settings.clockrec, AUDIOMENU_CLOCKREC_OPTIONS, AUDIOMENU_CLOCKREC_OPTION_COUNT, true, audioSetupNotifier); - } + //volume steps + as_oj_vsteps = new CMenuOptionNumberChooser(LOCALE_AUDIOMENU_VOLUME_STEP, (int *)&g_settings.current_volume_step, true, 1, 25, NULL); + as_oj_vsteps->setHint("", LOCALE_MENU_HINT_AUDIO_VOLSTEP); + + st = new CMenuOptionNumberChooser(LOCALE_AUDIOMENU_VOLUME_START, &g_settings.start_volume, true, -1, 100, NULL, CRCInput::RC_nokey, NULL, 0, -1, LOCALE_OPTIONS_OFF); + st->setHint("", LOCALE_MENU_HINT_AUDIO_VOLSTART); + //clock rec + //CMenuOptionChooser * as_oj_clockrec new CMenuOptionChooser(LOCALE_AUDIOMENU_CLOCKREC, &g_settings.clockrec, AUDIOMENU_CLOCKREC_OPTIONS, AUDIOMENU_CLOCKREC_OPTION_COUNT, true, audioSetupNotifier); //SRS //SRS algo @@ -194,20 +193,20 @@ int CAudioSetup::showAudioSetup() // ac3,pcm and clear volume adjustment CMenuOptionNumberChooser *adj_ac3 = NULL, *adj_pcm = NULL; CMenuForwarder *adj_clear = NULL; - if (!g_settings.easymenu) { - adj_ac3 = new CMenuOptionNumberChooser(LOCALE_AUDIOMENU_VOLUME_ADJUSTMENT_AC3, - (int *)&g_settings.audio_volume_percent_ac3, true, 0, 100, audioSetupNotifier); - adj_ac3->setNumberFormat("%d%%"); - adj_ac3->setHint("", LOCALE_MENU_HINT_AUDIO_ADJUST_VOL_AC3); - adj_pcm = new CMenuOptionNumberChooser(LOCALE_AUDIOMENU_VOLUME_ADJUSTMENT_PCM, - (int *)&g_settings.audio_volume_percent_pcm, true, 0, 100, audioSetupNotifier); - adj_pcm->setNumberFormat("%d%%"); - adj_pcm->setHint("", LOCALE_MENU_HINT_AUDIO_ADJUST_VOL_PCM); + adj_ac3 = new CMenuOptionNumberChooser(LOCALE_AUDIOMENU_VOLUME_ADJUSTMENT_AC3, + (int *)&g_settings.audio_volume_percent_ac3, true, 0, 100, audioSetupNotifier); + adj_ac3->setNumberFormat("%d%%"); + adj_ac3->setHint("", LOCALE_MENU_HINT_AUDIO_ADJUST_VOL_AC3); + + adj_pcm = new CMenuOptionNumberChooser(LOCALE_AUDIOMENU_VOLUME_ADJUSTMENT_PCM, + (int *)&g_settings.audio_volume_percent_pcm, true, 0, 100, audioSetupNotifier); + adj_pcm->setNumberFormat("%d%%"); + adj_pcm->setHint("", LOCALE_MENU_HINT_AUDIO_ADJUST_VOL_PCM); + + adj_clear = new CMenuForwarder(LOCALE_AUDIOMENU_VOLUME_ADJUSTMENT_CLEAR, true, NULL, this, "clear_vol_map"); + adj_clear->setHint("", LOCALE_MENU_HINT_AUDIO_ADJUST_VOL_CLEAR); - adj_clear = new CMenuForwarder(LOCALE_AUDIOMENU_VOLUME_ADJUSTMENT_CLEAR, true, NULL, this, "clear_vol_map"); - adj_clear->setHint("", LOCALE_MENU_HINT_AUDIO_ADJUST_VOL_CLEAR); - } //paint items audioSettings->addIntroItems(LOCALE_MAINSETTINGS_AUDIO); //--------------------------------------------------------- @@ -218,13 +217,11 @@ int CAudioSetup::showAudioSetup() audioSettings->addItem(as_oj_dd_spdif); audioSettings->addItem(as_oj_ddsubchn); //--------------------------------------------------------- - if (!g_settings.easymenu) { - audioSettings->addItem(GenericMenuSeparatorLine); - audioSettings->addItem(as_oj_avsync); - audioSettings->addItem(as_oj_vsteps); - audioSettings->addItem(st); - //audioSettings->addItem(as_clockrec); - } + audioSettings->addItem(GenericMenuSeparatorLine); + audioSettings->addItem(as_oj_avsync); + audioSettings->addItem(as_oj_vsteps); + audioSettings->addItem(st); + //audioSettings->addItem(as_clockrec); //--------------------------------------------------------- audioSettings->addItem(GenericMenuSeparatorLine); audioSettings->addItem(as_oj_srsonoff); @@ -236,12 +233,10 @@ int CAudioSetup::showAudioSetup() #if 0 audioSettings->addItem(mf); #endif - if (!g_settings.easymenu) { - audioSettings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_AUDIOMENU_VOLUME_ADJUSTMENT)); - audioSettings->addItem(adj_ac3); - audioSettings->addItem(adj_pcm); - audioSettings->addItem(adj_clear); - } + audioSettings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_AUDIOMENU_VOLUME_ADJUSTMENT)); + audioSettings->addItem(adj_ac3); + audioSettings->addItem(adj_pcm); + audioSettings->addItem(adj_clear); int res = audioSettings->exec(NULL, ""); selected = audioSettings->getSelected(); @@ -249,8 +244,7 @@ int CAudioSetup::showAudioSetup() #ifdef BOXMODEL_CS_HD2 delete as_oj_noise; #endif - if (!g_settings.easymenu) - CZapit::getInstance()->SetVolumePercent(g_settings.audio_volume_percent_ac3, g_settings.audio_volume_percent_pcm); + CZapit::getInstance()->SetVolumePercent(g_settings.audio_volume_percent_ac3, g_settings.audio_volume_percent_pcm); return res; } diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp index 9b2a9755a..c4c586966 100644 --- a/src/gui/cam_menu.cpp +++ b/src/gui/cam_menu.cpp @@ -104,44 +104,41 @@ int CCAMMenuHandler::doMainMenu() char name1[255]={0}; char str1[255]={0}; - int CiSlots = ca ? ca->GetNumberCISlots() : 0; - CMenuWidget* cammenu = new CMenuWidget(LOCALE_CI_SETTINGS, NEUTRINO_ICON_SETTINGS); cammenu->addIntroItems(); + + int CiSlots = ca ? ca->GetNumberCISlots() : 0; + if(CiSlots) { + cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_RESET_STANDBY, &g_settings.ci_standby_reset, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + cammenu->addItem( new CMenuOptionNumberChooser(LOCALE_CI_CLOCK, &g_settings.ci_clock, true, 6, 12, this)); + } + cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_IGNORE_MSG, &g_settings.ci_ignore_messages, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_SAVE_PINCODE, &g_settings.ci_save_pincode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); + #ifdef BOXMODEL_CS_HD2 int fecount = CFEManager::getInstance()->getFrontendCount(); char fename[fecount+1][255]; -#endif - if (!g_settings.easymenu) { - if(CiSlots) { - cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_RESET_STANDBY, &g_settings.ci_standby_reset, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); - cammenu->addItem( new CMenuOptionNumberChooser(LOCALE_CI_CLOCK, &g_settings.ci_clock, true, 6, 12, this)); - } - cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_IGNORE_MSG, &g_settings.ci_ignore_messages, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); - cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_SAVE_PINCODE, &g_settings.ci_save_pincode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); -#ifdef BOXMODEL_CS_HD2 - CMenuOptionChooser::keyval_ext feselect[fecount+1]; - feselect[0].key = -1; - feselect[0].value = NONEXISTANT_LOCALE; - feselect[0].valname = g_Locale->getText(LOCALE_OPTIONS_OFF); - int select_count = 1; + CMenuOptionChooser::keyval_ext feselect[fecount+1]; + feselect[0].key = -1; + feselect[0].value = NONEXISTANT_LOCALE; + feselect[0].valname = g_Locale->getText(LOCALE_OPTIONS_OFF); + int select_count = 1; - for (int i = 0; i < fecount; i++) { - CFrontend * fe = CFEManager::getInstance()->getFE(i); - int num = fe->getNumber(); - snprintf(fename[select_count], sizeof(fename[select_count]), "%d: %s", num+1, fe->getName()); - feselect[select_count].key = num; - feselect[select_count].value = NONEXISTANT_LOCALE; - feselect[select_count].valname = fename[select_count]; - select_count++; - } - CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_CI_TUNER, &g_settings.ci_tuner, feselect, select_count, true, this); - cammenu->addItem(mc); -#endif - - cammenu->addItem( GenericMenuSeparatorLine ); + for (int i = 0; i < fecount; i++) { + CFrontend * fe = CFEManager::getInstance()->getFE(i); + int num = fe->getNumber(); + snprintf(fename[select_count], sizeof(fename[select_count]), "%d: %s", num+1, fe->getName()); + feselect[select_count].key = num; + feselect[select_count].value = NONEXISTANT_LOCALE; + feselect[select_count].valname = fename[select_count]; + select_count++; } + CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_CI_TUNER, &g_settings.ci_tuner, feselect, select_count, true, this); + cammenu->addItem(mc); +#endif + + cammenu->addItem( GenericMenuSeparatorLine ); CMenuWidget * tempMenu; int i = 0; diff --git a/src/gui/info_menue.cpp b/src/gui/info_menue.cpp index 79df911fd..e5282d2d7 100644 --- a/src/gui/info_menue.cpp +++ b/src/gui/info_menue.cpp @@ -98,12 +98,6 @@ int CInfoMenu::showMenu() info->addItem(mf); #endif - if (g_settings.easymenu) { - mf = new CMenuForwarder(LOCALE_CI_SETTINGS, true, NULL, g_CamHandler, NULL, CRCInput::RC_blue); - mf->setHint(NEUTRINO_ICON_HINT_CI, LOCALE_MENU_HINT_CI); - info->addItem(mf); - } - //add I_TYPE_INFORMATION plugins info->integratePlugins(CPlugins::I_TYPE_INFORMATION, 1); diff --git a/src/gui/mediaplayer.cpp b/src/gui/mediaplayer.cpp index 7d25e73a3..aec2a061b 100644 --- a/src/gui/mediaplayer.cpp +++ b/src/gui/mediaplayer.cpp @@ -158,12 +158,12 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p) if (usage_mode != MODE_VIDEO) { //audio player - neutrino_msg_t audio_rc = usage_mode == MODE_AUDIO ? CRCInput::RC_audio : g_settings.easymenu ? CRCInput::RC_green : CRCInput::RC_red; + neutrino_msg_t audio_rc = usage_mode == MODE_AUDIO ? CRCInput::RC_audio : CRCInput::RC_red; fw_audio = new CMenuForwarder(LOCALE_MAINMENU_AUDIOPLAYER, enabled, NULL, this, "audioplayer", audio_rc); fw_audio->setHint(NEUTRINO_ICON_HINT_APLAY, LOCALE_MENU_HINT_APLAY); //internet player - neutrino_msg_t inet_rc = usage_mode == MODE_AUDIO ? CRCInput::RC_www : g_settings.easymenu ? CRCInput::RC_blue : CRCInput::RC_green; + neutrino_msg_t inet_rc = usage_mode == MODE_AUDIO ? CRCInput::RC_www : CRCInput::RC_green; fw_inet = new CMenuForwarder(LOCALE_INETRADIO_NAME, enabled, NULL, this, "inetplayer", inet_rc); fw_inet->setHint(NEUTRINO_ICON_HINT_INET_RADIO, LOCALE_MENU_HINT_INET_RADIO); } @@ -174,28 +174,20 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p) if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) { moviePlayer = new CMenuWidget(LOCALE_MAINMENU_MOVIEPLAYER, NEUTRINO_ICON_MULTIMEDIA, width, MN_WIDGET_ID_MEDIA_MOVIEPLAYER); personalize->addWidget(moviePlayer); - if (g_settings.easymenu) - fw_mp = new CMenuForwarder(LOCALE_MAINMENU_MOVIEPLAYER, enabled, NULL, moviePlayer, NULL, CRCInput::RC_red); - else - fw_mp = new CMenuForwarder(LOCALE_MAINMENU_MOVIEPLAYER, enabled, NULL, moviePlayer, NULL, CRCInput::RC_yellow); + fw_mp = new CMenuForwarder(LOCALE_MAINMENU_MOVIEPLAYER, enabled, NULL, moviePlayer, NULL, CRCInput::RC_yellow); fw_mp->setHint(NEUTRINO_ICON_HINT_MOVIE, LOCALE_MENU_HINT_MOVIE); } //pictureviewer pictureviewergui = new CPictureViewerGui(); - if (g_settings.easymenu) - fw_pviewer = new CMenuForwarder(LOCALE_MAINMENU_PICTUREVIEWER, true, NULL, pictureviewergui, NULL, CRCInput::RC_1); - else - fw_pviewer = new CMenuForwarder(LOCALE_MAINMENU_PICTUREVIEWER, true, NULL, pictureviewergui, NULL, CRCInput::RC_blue); + fw_pviewer = new CMenuForwarder(LOCALE_MAINMENU_PICTUREVIEWER, true, NULL, pictureviewergui, NULL, CRCInput::RC_blue); fw_pviewer->setHint(NEUTRINO_ICON_HINT_PICVIEW, LOCALE_MENU_HINT_PICVIEW); #if ENABLE_UPNP //upnp browser - if (!g_settings.easymenu) { - if (!upnpbrowsergui) - upnpbrowsergui = new CUpnpBrowserGui(); - fw_upnp = new CMenuForwarder(LOCALE_UPNPBROWSER_HEAD, enabled, NULL, upnpbrowsergui, NULL, CRCInput::RC_0); - fw_upnp->setHint(NEUTRINO_ICON_HINT_A_PIC, LOCALE_MENU_HINT_UPNP); - } + if (!upnpbrowsergui) + upnpbrowsergui = new CUpnpBrowserGui(); + fw_upnp = new CMenuForwarder(LOCALE_UPNPBROWSER_HEAD, enabled, NULL, upnpbrowsergui, NULL, CRCInput::RC_0); + fw_upnp->setHint(NEUTRINO_ICON_HINT_A_PIC, LOCALE_MENU_HINT_UPNP); #endif // media->addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, usage_mode == MODE_AUDIO ? CMenuWidget::BTN_TYPE_CANCEL : CMenuWidget::BTN_TYPE_BACK); } @@ -214,43 +206,24 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p) } else { - if (g_settings.easymenu) { - //movieplayer - if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) { - showMoviePlayer(moviePlayer, personalize); - personalize->addItem(media, fw_mp, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_MPLAYER]); - } - //audio player - personalize->addItem(media, fw_audio, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_AUDIO]); - if (g_settings.easymenu) { - CMenuForwarder *fw_yt = new CMenuForwarder(LOCALE_MOVIEPLAYER_YTPLAYBACK, true, NULL, &CMoviePlayerGui::getInstance(), "ytplayback", CRCInput::RC_yellow); - fw_yt->setHint(NEUTRINO_ICON_HINT_YTPLAY, LOCALE_MENU_HINT_YTPLAY); - personalize->addItem(media, fw_yt, &g_settings.personalize[SNeutrinoSettings::P_MPLAYER_YTPLAY]); - } - //internet player - personalize->addItem(media, fw_inet, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_INETPLAY]); - //picture viewer - personalize->addItem(media, fw_pviewer, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_PVIEWER]); - } else { - //audio player - personalize->addItem(media, fw_audio, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_AUDIO]); + //audio player + personalize->addItem(media, fw_audio, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_AUDIO]); - //internet player - personalize->addItem(media, fw_inet, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_INETPLAY]); + //internet player + personalize->addItem(media, fw_inet, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_INETPLAY]); - //movieplayer - if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) { - showMoviePlayer(moviePlayer, personalize); - personalize->addItem(media, fw_mp, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_MPLAYER], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION); - } - - //picture viewer - personalize->addItem(media, fw_pviewer, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_PVIEWER]); -#if ENABLE_UPNP - //upnp browser - personalize->addItem(media, fw_upnp, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_UPNP]); -#endif + //movieplayer + if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) { + showMoviePlayer(moviePlayer, personalize); + personalize->addItem(media, fw_mp, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_MPLAYER], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION); } + + //picture viewer + personalize->addItem(media, fw_pviewer, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_PVIEWER]); +#if ENABLE_UPNP + //upnp browser + personalize->addItem(media, fw_upnp, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_UPNP]); +#endif } int res = menu_return::RETURN_NONE; @@ -293,12 +266,11 @@ void CMediaPlayerMenu::showMoviePlayer(CMenuWidget *moviePlayer, CPersonalizeGui //fileplayback p->addItem(moviePlayer, fw_file, &g_settings.personalize[SNeutrinoSettings::P_MPLAYER_FILEPLAY]); + //ytplayback - if (!g_settings.easymenu) { - CMenuForwarder *fw_yt = new CMenuForwarder(LOCALE_MOVIEPLAYER_YTPLAYBACK, g_settings.youtube_enabled, NULL, &CMoviePlayerGui::getInstance(), "ytplayback", CRCInput::RC_yellow); - fw_yt->setHint(NEUTRINO_ICON_HINT_YTPLAY, LOCALE_MENU_HINT_YTPLAY); - p->addItem(moviePlayer, fw_yt, &g_settings.personalize[SNeutrinoSettings::P_MPLAYER_YTPLAY]); - } + CMenuForwarder *fw_yt = new CMenuForwarder(LOCALE_MOVIEPLAYER_YTPLAYBACK, g_settings.youtube_enabled, NULL, &CMoviePlayerGui::getInstance(), "ytplayback", CRCInput::RC_yellow); + fw_yt->setHint(NEUTRINO_ICON_HINT_YTPLAY, LOCALE_MENU_HINT_YTPLAY); + p->addItem(moviePlayer, fw_yt, &g_settings.personalize[SNeutrinoSettings::P_MPLAYER_YTPLAY]); // #if 0 // //moviePlayer->addItem(new CMenuForwarder(LOCALE_MOVIEPLAYER_PESPLAYBACK, true, NULL, moviePlayerGui, "pesplayback")); diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index ba352cd63..3034385ad 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -391,12 +391,6 @@ int CMiscMenue::showMiscSettingsMenuEnergy() m4->setHint("", LOCALE_MENU_HINT_SLEEPTIMER_MIN); ms_energy->addItem(m4); - if (g_settings.easymenu) { - CMenuOptionChooser *cec_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_CEC, &g_settings.hdmi_cec_mode, VIDEOMENU_HDMI_CEC_MODE_OPTIONS, VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT, true, this); - cec_ch->setHint("", LOCALE_MENU_HINT_CEC_MODE); - ms_energy->addItem(cec_ch); - } - int res = ms_energy->exec(NULL, ""); g_settings.shutdown_count = atoi(shutdown_count.c_str()); diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index e00c8c430..22f7d892c 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1946,13 +1946,13 @@ void CMoviePlayerGui::selectAudioPid() 0, 999, CVolume::getInstance())); } } - if (!g_settings.easymenu) { - APIDSelector.addItem(new CMenuSeparator(CMenuSeparator::LINE)); - extern CAudioSetupNotifier * audioSetupNotifier; - APIDSelector.addItem( new CMenuOptionChooser(LOCALE_AUDIOMENU_ANALOG_OUT, &g_settings.analog_out, - OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, - true, audioSetupNotifier, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN) ); - } + + APIDSelector.addItem(new CMenuSeparator(CMenuSeparator::LINE)); + extern CAudioSetupNotifier * audioSetupNotifier; + APIDSelector.addItem( new CMenuOptionChooser(LOCALE_AUDIOMENU_ANALOG_OUT, &g_settings.analog_out, + OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, + true, audioSetupNotifier, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN) ); + APIDSelector.exec(NULL, ""); delete selector; printf("CMoviePlayerGui::selectAudioPid: selected %d (%x) current %x\n", select, (select >= 0) ? apids[select] : -1, currentapid); diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp index c6748f23f..05eb80617 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -359,33 +359,31 @@ int CNetworkSetup::showNetworkSetup() CProxySetup proxy(LOCALE_MAINSETTINGS_NETWORK); CNetworkServiceSetup services; - if (!g_settings.easymenu) { - //ntp submenu - sectionsdConfigNotifier = new CSectionsdConfigNotifier; - mf = new CMenuForwarder(LOCALE_NETWORKMENU_NTPTITLE, true, NULL, &ntp, NULL, CRCInput::RC_yellow); - mf->setHint("", LOCALE_MENU_HINT_NET_NTP); - networkSettings->addItem(mf); + //ntp submenu + sectionsdConfigNotifier = new CSectionsdConfigNotifier; + mf = new CMenuForwarder(LOCALE_NETWORKMENU_NTPTITLE, true, NULL, &ntp, NULL, CRCInput::RC_yellow); + mf->setHint("", LOCALE_MENU_HINT_NET_NTP); + networkSettings->addItem(mf); - showNetworkNTPSetup(&ntp); + showNetworkNTPSetup(&ntp); #ifdef ENABLE_GUI_MOUNT - //nfs mount submenu - mf = new CMenuForwarder(LOCALE_NETWORKMENU_MOUNT, true, NULL, &networkmounts, NULL, CRCInput::RC_blue); - mf->setHint("", LOCALE_MENU_HINT_NET_MOUNT); - networkSettings->addItem(mf); - showNetworkNFSMounts(&networkmounts); + //nfs mount submenu + mf = new CMenuForwarder(LOCALE_NETWORKMENU_MOUNT, true, NULL, &networkmounts, NULL, CRCInput::RC_blue); + mf->setHint("", LOCALE_MENU_HINT_NET_MOUNT); + networkSettings->addItem(mf); + showNetworkNFSMounts(&networkmounts); #endif - //proxyserver submenu - mf = new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYSERVER_SEP, true, NULL, &proxy, NULL, CRCInput::RC_0); - mf->setHint("", LOCALE_MENU_HINT_NET_PROXY); - networkSettings->addItem(mf); + //proxyserver submenu + mf = new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYSERVER_SEP, true, NULL, &proxy, NULL, CRCInput::RC_0); + mf->setHint("", LOCALE_MENU_HINT_NET_PROXY); + networkSettings->addItem(mf); - //services - mf = new CMenuForwarder(LOCALE_NETWORKMENU_SERVICES, true, NULL, &services, NULL, CRCInput::RC_1); - mf->setHint("", LOCALE_MENU_HINT_NET_SERVICES); - networkSettings->addItem(mf); - } + //services + mf = new CMenuForwarder(LOCALE_NETWORKMENU_SERVICES, true, NULL, &services, NULL, CRCInput::RC_1); + mf->setHint("", LOCALE_MENU_HINT_NET_SERVICES); + networkSettings->addItem(mf); int ret = 0; while(true) { diff --git a/src/gui/parentallock_setup.cpp b/src/gui/parentallock_setup.cpp index ca4ab7359..1c77e3800 100644 --- a/src/gui/parentallock_setup.cpp +++ b/src/gui/parentallock_setup.cpp @@ -110,31 +110,17 @@ int CParentalSetup::showParentalSetup() CMenuForwarder * mf; CPersonalizeGui &p = CNeutrinoApp::getInstance()->getPersonalizeGui(); - if (g_settings.easymenu) { - mf = new CMenuForwarder(LOCALE_PARENTALLOCK_MENU, true, NULL, &p, NULL, CRCInput::RC_red); - mf->setHint("", LOCALE_MENU_HINT_PARENTALLOCK_MENU); - plock->addItem(mf); - } CMenuOptionChooser * mc; - if (g_settings.easymenu) - mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_PROMPT , &g_settings.parentallock_prompt , PARENTALLOCK_PROMPT_OPTIONS, PARENTALLOCK_PROMPT_OPTION_COUNT , !parentallocked, NULL, CRCInput::RC_green); - else - mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_PROMPT , &g_settings.parentallock_prompt , PARENTALLOCK_PROMPT_OPTIONS, PARENTALLOCK_PROMPT_OPTION_COUNT , !parentallocked); + mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_PROMPT , &g_settings.parentallock_prompt , PARENTALLOCK_PROMPT_OPTIONS, PARENTALLOCK_PROMPT_OPTION_COUNT , !parentallocked); mc->setHint("", LOCALE_MENU_HINT_PARENTALLOCK_PROMPT); plock->addItem(mc); - if (g_settings.easymenu) - mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_LOCKAGE, &g_settings.parentallock_lockage, PARENTALLOCK_LOCKAGE_OPTIONS, PARENTALLOCK_LOCKAGE_OPTION_COUNT, !parentallocked, NULL, CRCInput::RC_yellow); - else - mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_LOCKAGE, &g_settings.parentallock_lockage, PARENTALLOCK_LOCKAGE_OPTIONS, PARENTALLOCK_LOCKAGE_OPTION_COUNT, !parentallocked); + mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_LOCKAGE, &g_settings.parentallock_lockage, PARENTALLOCK_LOCKAGE_OPTIONS, PARENTALLOCK_LOCKAGE_OPTION_COUNT, !parentallocked); mc->setHint("", LOCALE_MENU_HINT_PARENTALLOCK_LOCKAGE); plock->addItem(mc); - if (g_settings.easymenu) - mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_BOUQUETMODE, &g_settings.parentallock_defaultlocked, PARENTALLOCK_DEFAULTLOCKED_OPTIONS, PARENTALLOCK_DEFAULTLOCKED_OPTION_COUNT, !parentallocked, NULL, CRCInput::RC_blue); - else - mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_BOUQUETMODE, &g_settings.parentallock_defaultlocked, PARENTALLOCK_DEFAULTLOCKED_OPTIONS, PARENTALLOCK_DEFAULTLOCKED_OPTION_COUNT, !parentallocked); + mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_BOUQUETMODE, &g_settings.parentallock_defaultlocked, PARENTALLOCK_DEFAULTLOCKED_OPTIONS, PARENTALLOCK_DEFAULTLOCKED_OPTION_COUNT, !parentallocked); plock->addItem(mc); plock->addItem(new CMenuOptionNumberChooser(LOCALE_PARENTALLOCK_ZAPTIME, (int *)&g_settings.parentallock_zaptime, !parentallocked, 0, 10000)); diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp index 0cf748993..8eb87b935 100644 --- a/src/gui/personalize.cpp +++ b/src/gui/personalize.cpp @@ -310,7 +310,7 @@ int CPersonalizeGui::exec(CMenuTarget* parent, const string & actionKey) //pin protected access to personalize menu also if found any pin protected items bool is_pin_protected = g_settings.personalize[SNeutrinoSettings::P_MAIN_PINSTATUS]; - if (!g_settings.easymenu && (is_pin_protected || hasPinItems())) { + if (is_pin_protected || hasPinItems()) { setHint(LOCALE_PERSONALIZE_PINHINT); //from CPINProtection is_pin_protected = true; if (check()) @@ -330,41 +330,14 @@ int CPersonalizeGui::ShowPersonalizationMenu() { width = 40; - CMenuWidget* pMenu = new CMenuWidget(g_settings.easymenu ? LOCALE_PARENTALLOCK_MENU : LOCALE_PERSONALIZE_HEAD, NEUTRINO_ICON_PERSONALIZE, width, MN_WIDGET_ID_PERSONALIZE); + CMenuWidget* pMenu = new CMenuWidget(LOCALE_PERSONALIZE_HEAD, NEUTRINO_ICON_PERSONALIZE, width, MN_WIDGET_ID_PERSONALIZE); pMenu->addIntroItems(NONEXISTANT_LOCALE, LOCALE_PERSONALIZE_ACCESS); //pin CPINChangeWidget *pinChangeWidget = NULL; - if (!g_settings.easymenu && show_pin_setup) + if (show_pin_setup) ShowPinSetup(pMenu, pinChangeWidget); - int res; - if (g_settings.easymenu) { - int count = 0; - for (uint j = 0; jgetName()); - //pin protected items only - if (v_item[j].item_mode == PERSONALIZE_SHOW_AS_ACCESS_OPTION) - { - const neutrino_msg_t key = (count == 0) ? CRCInput::RC_red : - (count == 1) ? CRCInput::RC_green : - (count == 2) ? CRCInput::RC_yellow : - (count == 3) ? CRCInput::RC_blue : CRCInput::RC_nokey; - count++; - string itm_name = g_Locale->getText(v_item[j].locale_name); - itm_name += " "; - itm_name += g_Locale->getText(LOCALE_PERSONALIZE_PINSTATUS); - - if (v_item[j].personalize_mode != NULL) - pMenu->addItem(new CMenuOptionChooser(itm_name.c_str(), v_item[j].personalize_mode, PERSONALIZE_PROTECT_MODE_OPTIONS, PERSONALIZE_PROTECT_MODE_MAX, v_item[j].menuItem->active, NULL, key)); - } - } - res = pMenu->exec(NULL, ""); - delete pMenu; - delete pinChangeWidget; - return res; - } - //personalized menues CMenuForwarder *p_mn[widget_count]; for (int i = 0; i<(widget_count); i++) @@ -378,7 +351,6 @@ int CPersonalizeGui::ShowPersonalizationMenu() pMenu->addItem(p_mn[i]); } - //usermenu uMenu = NULL; if (show_usermenu) @@ -407,7 +379,7 @@ int CPersonalizeGui::ShowPersonalizationMenu() pMenu->addItem(GenericMenuSeparatorLine); pMenu->addItem(new CMenuForwarder(LOCALE_PERSONALIZE_HELP, true, NULL, this, "personalize_help", CRCInput::RC_help)); - res = pMenu->exec(NULL, ""); + int res = pMenu->exec(NULL, ""); if (show_pluginmenu) { g_settings.plugins_disabled = ""; g_settings.plugins_game = ""; @@ -761,10 +733,6 @@ void CPersonalizeGui::SaveAndExit() // Save the settings and left menu, if user wants to! if (haveChangedSettings()) { - if (g_settings.easymenu) { - ApplySettings(); - return; - } if (ShowMsg(LOCALE_PERSONALIZE_HEAD, g_Locale->getText(LOCALE_PERSONALIZE_APPLY_SETTINGS), CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_QUESTION) == CMsgBox::mbrYes) { CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_MAINSETTINGS_SAVESETTINGSNOW_HINT)); // UTF-8 @@ -959,7 +927,7 @@ void CPersonalizeGui::addPersonalizedItems() use_pin = true; //set pinmode for personalize menu or for settings manager menu and if any item is pin protected - if (!g_settings.easymenu && (in_pinmode && !use_pin)) + if (in_pinmode && !use_pin) if (v_item[i].personalize_mode == &g_settings.personalize[SNeutrinoSettings::P_MAIN_PINSTATUS] || v_item[i].personalize_mode == &g_settings.personalize[SNeutrinoSettings::P_MSET_SETTINGS_MANAGER]) { use_pin = true; @@ -968,7 +936,7 @@ void CPersonalizeGui::addPersonalizedItems() //convert item to locked forwarder and use generated pin mode for usage as ask parameter v_item[i].menuItem = new CLockedMenuForwarder(fw->getTextLocale(), - g_settings.easymenu ? g_settings.parentallock_pincode : g_settings.personalize_pincode, + g_settings.personalize_pincode, use_pin, fw->active, NULL, fw->getTarget(), fw->getActionKey(), d_key, NULL, lock_icon); v_item[i].menuItem->hintIcon = fw->hintIcon; v_item[i].menuItem->hint = fw->hint; diff --git a/src/gui/record_setup.cpp b/src/gui/record_setup.cpp index fae191c0e..a5148e5e1 100644 --- a/src/gui/record_setup.cpp +++ b/src/gui/record_setup.cpp @@ -201,33 +201,15 @@ int CRecordSetup::showRecordSetup() CMenuWidget recordingTimerSettings(LOCALE_MAINSETTINGS_RECORDING, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_RECORDSETUP_TIMERSETTINGS); showRecordTimerSetup(&recordingTimerSettings); - if (g_settings.easymenu) { - //timeshift - mf = new CMenuForwarder(LOCALE_RECORDINGMENU_TIMESHIFT, true, NULL, &recordingTsSettings, NULL, CRCInput::RC_red); - mf->setHint("", LOCALE_MENU_HINT_RECORD_TIMESHIFT); - recordingSettings->addItem(mf); - - //timersettings - mf = new CMenuForwarder(LOCALE_TIMERSETTINGS_SEPARATOR, true, NULL, &recordingTimerSettings, NULL, CRCInput::RC_green); - mf->setHint("", LOCALE_MENU_HINT_RECORD_TIMER); - recordingSettings->addItem(mf); - } - bool recstatus = CNeutrinoApp::getInstance()->recordingstatus; //record dir CMenuForwarder* fRecDir; - if (g_settings.easymenu) - fRecDir = new CMenuForwarder(LOCALE_RECORDINGMENU_DEFDIR, !recstatus, g_settings.network_nfs_recordingdir, this, "recordingdir", CRCInput::RC_yellow); - else - fRecDir = new CMenuForwarder(LOCALE_RECORDINGMENU_DEFDIR, !recstatus, g_settings.network_nfs_recordingdir, this, "recordingdir"); + fRecDir = new CMenuForwarder(LOCALE_RECORDINGMENU_DEFDIR, !recstatus, g_settings.network_nfs_recordingdir, this, "recordingdir"); fRecDir->setHint("", LOCALE_MENU_HINT_RECORD_DIR); recordingSettings->addItem(fRecDir); CMenuOptionChooser* channel_rec_dir; - if (g_settings.easymenu) - channel_rec_dir = new CMenuOptionChooser(LOCALE_RECORDINGMENU_SAVE_IN_CHANNELDIR, &g_settings.recording_save_in_channeldir, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::RC_blue); - else - channel_rec_dir = new CMenuOptionChooser(LOCALE_RECORDINGMENU_SAVE_IN_CHANNELDIR, &g_settings.recording_save_in_channeldir, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + channel_rec_dir = new CMenuOptionChooser(LOCALE_RECORDINGMENU_SAVE_IN_CHANNELDIR, &g_settings.recording_save_in_channeldir, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); channel_rec_dir->setHint("", LOCALE_MENU_HINT_RECORD_CHANDIR); recordingSettings->addItem(channel_rec_dir); @@ -247,15 +229,13 @@ int CRecordSetup::showRecordSetup() already_found->setHint("", LOCALE_MENU_HINT_RECORD_ALREADY_FOUND_CHECK); recordingSettings->addItem(already_found); - if (!g_settings.easymenu) { - CMenuOptionChooser* slow_warn = new CMenuOptionChooser(LOCALE_RECORDINGMENU_SLOW_WARN, &g_settings.recording_slow_warning, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); - slow_warn->setHint("", LOCALE_MENU_HINT_RECORD_SLOW_WARN); - recordingSettings->addItem(slow_warn); + CMenuOptionChooser* slow_warn = new CMenuOptionChooser(LOCALE_RECORDINGMENU_SLOW_WARN, &g_settings.recording_slow_warning, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + slow_warn->setHint("", LOCALE_MENU_HINT_RECORD_SLOW_WARN); + recordingSettings->addItem(slow_warn); - CMenuOptionChooser* startstop_msg = new CMenuOptionChooser(LOCALE_RECORDING_STARTSTOP_MSG, &g_settings.recording_startstop_msg, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); - startstop_msg->setHint("", LOCALE_MENU_HINT_RECORD_STARTSTOP_MSG); - recordingSettings->addItem(startstop_msg); - } + CMenuOptionChooser* startstop_msg = new CMenuOptionChooser(LOCALE_RECORDING_STARTSTOP_MSG, &g_settings.recording_startstop_msg, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + startstop_msg->setHint("", LOCALE_MENU_HINT_RECORD_STARTSTOP_MSG); + recordingSettings->addItem(startstop_msg); //filename template CKeyboardInput* filename_template = new CKeyboardInput(LOCALE_RECORDINGMENU_FILENAME_TEMPLATE, &g_settings.recording_filename_template, 0, NULL, NULL, LOCALE_RECORDINGMENU_FILENAME_TEMPLATE_HINT, LOCALE_RECORDINGMENU_FILENAME_TEMPLATE_HINT2); @@ -269,33 +249,30 @@ int CRecordSetup::showRecordSetup() recordingSettings->addItem(GenericMenuSeparatorLine); - if (!g_settings.easymenu) { - //timeshift - mf = new CMenuForwarder(LOCALE_RECORDINGMENU_TIMESHIFT, true, NULL, &recordingTsSettings, NULL, CRCInput::RC_green); - mf->setHint("", LOCALE_MENU_HINT_RECORD_TIMESHIFT); - recordingSettings->addItem(mf); + //timeshift + mf = new CMenuForwarder(LOCALE_RECORDINGMENU_TIMESHIFT, true, NULL, &recordingTsSettings, NULL, CRCInput::RC_green); + mf->setHint("", LOCALE_MENU_HINT_RECORD_TIMESHIFT); + recordingSettings->addItem(mf); - //timersettings - mf = new CMenuForwarder(LOCALE_TIMERSETTINGS_SEPARATOR, true, NULL, &recordingTimerSettings, NULL, CRCInput::RC_yellow); - mf->setHint("", LOCALE_MENU_HINT_RECORD_TIMER); - recordingSettings->addItem(mf); - } + //timersettings + mf = new CMenuForwarder(LOCALE_TIMERSETTINGS_SEPARATOR, true, NULL, &recordingTimerSettings, NULL, CRCInput::RC_yellow); + mf->setHint("", LOCALE_MENU_HINT_RECORD_TIMER); + recordingSettings->addItem(mf); CMenuWidget recordingaAudioSettings(LOCALE_MAINSETTINGS_RECORDING, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_RECORDSETUP_AUDIOSETTINGS); CMenuWidget recordingaDataSettings(LOCALE_MAINSETTINGS_RECORDING, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_RECORDSETUP_DATASETTINGS); - if (!g_settings.easymenu) { - //audiosettings - showRecordAudioSetup(&recordingaAudioSettings); - mf = new CMenuForwarder(LOCALE_RECORDINGMENU_APIDS, true, NULL, &recordingaAudioSettings, NULL, CRCInput::RC_blue); - mf->setHint("", LOCALE_MENU_HINT_RECORD_APIDS); - recordingSettings->addItem(mf); - //datasettings - showRecordDataSetup(&recordingaDataSettings); - mf = new CMenuForwarder(LOCALE_RECORDINGMENU_DATA_PIDS, true, NULL, &recordingaDataSettings, NULL, CRCInput::RC_2); - mf->setHint("", LOCALE_MENU_HINT_RECORD_DATA); - recordingSettings->addItem(mf); - } + //audiosettings + showRecordAudioSetup(&recordingaAudioSettings); + mf = new CMenuForwarder(LOCALE_RECORDINGMENU_APIDS, true, NULL, &recordingaAudioSettings, NULL, CRCInput::RC_blue); + mf->setHint("", LOCALE_MENU_HINT_RECORD_APIDS); + recordingSettings->addItem(mf); + + //datasettings + showRecordDataSetup(&recordingaDataSettings); + mf = new CMenuForwarder(LOCALE_RECORDINGMENU_DATA_PIDS, true, NULL, &recordingaDataSettings, NULL, CRCInput::RC_2); + mf->setHint("", LOCALE_MENU_HINT_RECORD_DATA); + recordingSettings->addItem(mf); int res = recordingSettings->exec(NULL, ""); delete recordingSettings; diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index e7f0e0654..a70036a49 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -729,19 +729,12 @@ int CScanSetup::showScanMenuFrontendSetup() snprintf(tmp, sizeof(tmp), "config_frontend%d", i); char name[255]; - if (g_settings.easymenu) - snprintf(name, sizeof(name), "%s %d: %s", g_Locale->getText(LOCALE_SATSETUP_FE_SETUP), i+1, - fe->isHybrid() ? g_Locale->getText(LOCALE_SCANTS_ACTHYBRID) - : fe->hasSat() ? g_Locale->getText(LOCALE_SCANTS_ACTSATELLITE) - : fe->hasTerr() ? g_Locale->getText(LOCALE_SCANTS_ACTTERRESTRIAL) - : g_Locale->getText(LOCALE_SCANTS_ACTCABLE)); - else - snprintf(name, sizeof(name), "%s %d: %s %s", g_Locale->getText(LOCALE_SATSETUP_FE_SETUP), i+1, - fe->isHybrid() ? g_Locale->getText(LOCALE_SCANTS_ACTHYBRID) - : fe->hasSat() ? g_Locale->getText(LOCALE_SCANTS_ACTSATELLITE) - : fe->hasTerr()? g_Locale->getText(LOCALE_SCANTS_ACTTERRESTRIAL) - : g_Locale->getText(LOCALE_SCANTS_ACTCABLE), - fe->getName()); + snprintf(name, sizeof(name), "%s %d: %s %s", g_Locale->getText(LOCALE_SATSETUP_FE_SETUP), i+1, + fe->isHybrid() ? g_Locale->getText(LOCALE_SCANTS_ACTHYBRID) + : fe->hasSat() ? g_Locale->getText(LOCALE_SCANTS_ACTSATELLITE) + : fe->hasTerr()? g_Locale->getText(LOCALE_SCANTS_ACTTERRESTRIAL) + : g_Locale->getText(LOCALE_SCANTS_ACTCABLE), + fe->getName()); neutrino_msg_t key = CRCInput::RC_nokey; if (i == 0) @@ -875,14 +868,7 @@ int CScanSetup::showFrontendSetup(int number) dmode = fe_config.diseqcType; char name[255]; - if (g_settings.easymenu) - snprintf(name, sizeof(name), "%s %d: %s", g_Locale->getText(LOCALE_SATSETUP_FE_SETUP), number+1, - fe->isHybrid() ? g_Locale->getText(LOCALE_SCANTS_ACTHYBRID) - : fe->hasSat() ? g_Locale->getText(LOCALE_SCANTS_ACTSATELLITE) - : fe->hasTerr() ? g_Locale->getText(LOCALE_SCANTS_ACTTERRESTRIAL) - : g_Locale->getText(LOCALE_SCANTS_ACTCABLE)); - else - snprintf(name, sizeof(name), "%s %d: %s", g_Locale->getText(LOCALE_SATSETUP_FE_SETUP), number+1, fe->getName()); + snprintf(name, sizeof(name), "%s %d: %s", g_Locale->getText(LOCALE_SATSETUP_FE_SETUP), number+1, fe->getName()); CMenuWidget * setupMenu = new CMenuWidget(name, NEUTRINO_ICON_SETTINGS, width); setupMenu->setSelected(feselected); @@ -1481,12 +1467,9 @@ void CScanSetup::addScanMenuFastScan(CMenuWidget *fast_ScanMenu) mf->setHint("", LOCALE_MENU_HINT_SCAN_FASTDISEQC); fast_ScanMenu->addItem(mf); - if (1 /* !g_settings.easymenu */) - { - mf = new CMenuForwarder(LOCALE_SCANTS_STARTNOW, allow_start, NULL, this, "sfast", CRCInput::RC_blue); - mf->setHint("", LOCALE_MENU_HINT_SCAN_START); - fast_ScanMenu->addItem(mf); - } + mf = new CMenuForwarder(LOCALE_SCANTS_STARTNOW, allow_start, NULL, this, "sfast", CRCInput::RC_blue); + mf->setHint("", LOCALE_MENU_HINT_SCAN_START); + fast_ScanMenu->addItem(mf); } int CScanSetup::showFastscanDiseqcSetup() diff --git a/src/gui/settings_manager.cpp b/src/gui/settings_manager.cpp index 5c5ff7a4f..dc3b81b13 100644 --- a/src/gui/settings_manager.cpp +++ b/src/gui/settings_manager.cpp @@ -176,50 +176,35 @@ int CSettingsManager::showMenu() mset->addIntroItems(LOCALE_MAINSETTINGS_MANAGE); CMenuForwarder * mf; - if (g_settings.easymenu) - mf = new CMenuForwarder(LOCALE_RESET_SETTINGS, true, NULL, resetNotifier, "settings", CRCInput::RC_red); - else - mf = new CMenuForwarder(LOCALE_RESET_SETTINGS, true, NULL, resetNotifier, "settings", CRCInput::RC_recall); + mf = new CMenuForwarder(LOCALE_RESET_SETTINGS, true, NULL, resetNotifier, "settings", CRCInput::RC_recall); mf->setHint(NEUTRINO_ICON_HINT_RESET, LOCALE_MENU_HINT_RESET); // FIXME: RC-button RECALL is broken mset->addItem(mf); - if (!g_settings.easymenu) { - mset->addItem(GenericMenuSeparatorLine); + mset->addItem(GenericMenuSeparatorLine); - mf = new CMenuForwarder(LOCALE_EXTRA_SAVECONFIG, true, NULL, this, "saveconfig", CRCInput::RC_red); - mf->setHint(NEUTRINO_ICON_HINT_SAVEAS, LOCALE_MENU_HINT_SAVEAS); - mset->addItem(mf); + mf = new CMenuForwarder(LOCALE_EXTRA_SAVECONFIG, true, NULL, this, "saveconfig", CRCInput::RC_red); + mf->setHint(NEUTRINO_ICON_HINT_SAVEAS, LOCALE_MENU_HINT_SAVEAS); + mset->addItem(mf); - mf = new CMenuForwarder(LOCALE_EXTRA_LOADCONFIG, true, NULL, this, "loadconfig", CRCInput::RC_green); - mf->setHint(NEUTRINO_ICON_HINT_LOAD, LOCALE_MENU_HINT_LOAD); - mset->addItem(mf); + mf = new CMenuForwarder(LOCALE_EXTRA_LOADCONFIG, true, NULL, this, "loadconfig", CRCInput::RC_green); + mf->setHint(NEUTRINO_ICON_HINT_LOAD, LOCALE_MENU_HINT_LOAD); + mset->addItem(mf); - mset->addItem(GenericMenuSeparatorLine); - } + mset->addItem(GenericMenuSeparatorLine); - if (g_settings.easymenu) - mf = new CMenuForwarder(LOCALE_SETTINGS_BACKUP, true, NULL, this, "backup", CRCInput::RC_green); - else - mf = new CMenuForwarder(LOCALE_SETTINGS_BACKUP, true, NULL, this, "backup", CRCInput::RC_yellow); + mf = new CMenuForwarder(LOCALE_SETTINGS_BACKUP, true, NULL, this, "backup", CRCInput::RC_yellow); mf->setHint(NEUTRINO_ICON_HINT_BACKUP, LOCALE_MENU_HINT_BACKUP); mset->addItem(mf); - if (g_settings.easymenu) - mf = new CMenuForwarder(LOCALE_SETTINGS_RESTORE, true, NULL, this, "restore", CRCInput::RC_yellow); - else - mf = new CMenuForwarder(LOCALE_SETTINGS_RESTORE, true, NULL, this, "restore", CRCInput::RC_blue); + mf = new CMenuForwarder(LOCALE_SETTINGS_RESTORE, true, NULL, this, "restore", CRCInput::RC_blue); mf->setHint(NEUTRINO_ICON_HINT_RESTORE, LOCALE_MENU_HINT_RESTORE); mset->addItem(mf); - if (g_settings.easymenu) { - mf = new CMenuForwarder(LOCALE_RESET_ALL, true, NULL, resetNotifier, "all", CRCInput::RC_blue); - } else { - mset->addItem(GenericMenuSeparatorLine); - mf = new CMenuForwarder(LOCALE_RESET_ALL, true, NULL, resetNotifier, "all", CRCInput::RC_standby); - } + mset->addItem(GenericMenuSeparatorLine); + mf = new CMenuForwarder(LOCALE_RESET_ALL, true, NULL, resetNotifier, "all", CRCInput::RC_standby); mf->setHint(NEUTRINO_ICON_HINT_FACTORY, LOCALE_MENU_HINT_FACTORY); mset->addItem(mf); diff --git a/src/gui/start_wizard.cpp b/src/gui/start_wizard.cpp index ffe812ca8..fa911a14c 100644 --- a/src/gui/start_wizard.cpp +++ b/src/gui/start_wizard.cpp @@ -114,7 +114,7 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/) res = g_videoSettings->exec(NULL, ""); g_videoSettings->setWizardMode(SNeutrinoSettings::WIZARD_OFF); } - if(!g_settings.easymenu && advanced && res != menu_return::RETURN_EXIT_ALL) + if(advanced && res != menu_return::RETURN_EXIT_ALL) { COsdSetup osdSettings(SNeutrinoSettings::WIZARD_ON); res = osdSettings.exec(NULL, ""); diff --git a/src/gui/update_menue.cpp b/src/gui/update_menue.cpp index 598ecdc10..4a78fa772 100644 --- a/src/gui/update_menue.cpp +++ b/src/gui/update_menue.cpp @@ -103,34 +103,29 @@ int CSoftwareUpdate::showSoftwareUpdate() CUpdateSettings update_settings; CMenuWidget mtdexpert(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, NEUTRINO_ICON_UPDATE, width, MN_WIDGET_ID_MTDEXPERT); //settings - if (!g_settings.easymenu) { - mf = new CMenuForwarder(LOCALE_FLASHUPDATE_SETTINGS, true, NULL, &update_settings, NULL, CRCInput::RC_yellow); - mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_SETTINGS); - softUpdate.addItem(mf); + mf = new CMenuForwarder(LOCALE_FLASHUPDATE_SETTINGS, true, NULL, &update_settings, NULL, CRCInput::RC_yellow); + mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_SETTINGS); + softUpdate.addItem(mf); - softUpdate.addItem(GenericMenuSeparatorLine); + softUpdate.addItem(GenericMenuSeparatorLine); - //expert-functions - showSoftwareUpdateExpert(&mtdexpert); - mf = new CMenuForwarder(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, true, NULL, &mtdexpert, NULL, CRCInput::RC_blue); - mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_EXPERT); - softUpdate.addItem(mf); + //expert-functions + showSoftwareUpdateExpert(&mtdexpert); + mf = new CMenuForwarder(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, true, NULL, &mtdexpert, NULL, CRCInput::RC_blue); + mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_EXPERT); + softUpdate.addItem(mf); #if 0 - //firmware update via opkg - mf = new CMenuDForwarder(LOCALE_OPKG_TITLE, COPKGManager::hasOpkgSupport(), NULL, new COPKGManager()); - mf->setHint(NEUTRINO_ICON_HINT_SW_UPDATE, LOCALE_MENU_HINT_OPKG); - softUpdate.addItem(mf); + //firmware update via opkg + mf = new CMenuDForwarder(LOCALE_OPKG_TITLE, COPKGManager::hasOpkgSupport(), NULL, new COPKGManager()); + mf->setHint(NEUTRINO_ICON_HINT_SW_UPDATE, LOCALE_MENU_HINT_OPKG); + softUpdate.addItem(mf); #endif - } #ifdef BOXMODEL_CS_HD2 softUpdate.addItem(GenericMenuSeparatorLine); - if (g_settings.easymenu) - mf = new CMenuDForwarder(LOCALE_FLASHUPDATE_CREATEIMAGE_MENU, true, NULL, new CFlashExpertSetup(), NULL, CRCInput::RC_yellow); - else - mf = new CMenuDForwarder(LOCALE_FLASHUPDATE_CREATEIMAGE_MENU, true, NULL, new CFlashExpertSetup(), NULL, CRCInput::convertDigitToKey(1)); + mf = new CMenuDForwarder(LOCALE_FLASHUPDATE_CREATEIMAGE_MENU, true, NULL, new CFlashExpertSetup(), NULL, CRCInput::convertDigitToKey(1)); mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CREATEIMAGE_MENU); softUpdate.addItem(mf); #endif diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index 6848628ae..4280f1cb4 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -283,30 +283,28 @@ int CVideoSettings::showVideoSetup() CMenuWidget automodes(LOCALE_MAINSETTINGS_VIDEO, NEUTRINO_ICON_SETTINGS); #endif CAutoModeNotifier anotify; - if (!g_settings.easymenu) { - //dbdr options - vs_dbdropt_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_DBDR, &g_settings.video_dbdr, VIDEOMENU_DBDR_OPTIONS, VIDEOMENU_DBDR_OPTION_COUNT, true, this); - vs_dbdropt_ch->setHint("", LOCALE_MENU_HINT_VIDEO_DBDR); + //dbdr options + vs_dbdropt_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_DBDR, &g_settings.video_dbdr, VIDEOMENU_DBDR_OPTIONS, VIDEOMENU_DBDR_OPTION_COUNT, true, this); + vs_dbdropt_ch->setHint("", LOCALE_MENU_HINT_VIDEO_DBDR); - //video system modes submenue - videomodes.addIntroItems(LOCALE_VIDEOMENU_ENABLED_MODES); + //video system modes submenue + videomodes.addIntroItems(LOCALE_VIDEOMENU_ENABLED_MODES); - for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) - videomodes.addItem(new CMenuOptionChooser(VIDEOMENU_VIDEOMODE_OPTIONS[i].valname, &g_settings.enabled_video_modes[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, &anotify)); + for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) + videomodes.addItem(new CMenuOptionChooser(VIDEOMENU_VIDEOMODE_OPTIONS[i].valname, &g_settings.enabled_video_modes[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, &anotify)); - vs_videomodes_fw = new CMenuForwarder(LOCALE_VIDEOMENU_ENABLED_MODES, true, NULL, &videomodes, NULL, CRCInput::RC_red); - vs_videomodes_fw->setHint("", LOCALE_MENU_HINT_VIDEO_MODES); + vs_videomodes_fw = new CMenuForwarder(LOCALE_VIDEOMENU_ENABLED_MODES, true, NULL, &videomodes, NULL, CRCInput::RC_red); + vs_videomodes_fw->setHint("", LOCALE_MENU_HINT_VIDEO_MODES); #ifdef BOXMODEL_CS_HD2 - automodes.addIntroItems(LOCALE_VIDEOMENU_ENABLED_MODES_AUTO); + automodes.addIntroItems(LOCALE_VIDEOMENU_ENABLED_MODES_AUTO); - for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT - 1; i++) - automodes.addItem(new CMenuOptionChooser(VIDEOMENU_VIDEOMODE_OPTIONS[i].valname, &g_settings.enabled_auto_modes[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, &anotify)); + for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT - 1; i++) + automodes.addItem(new CMenuOptionChooser(VIDEOMENU_VIDEOMODE_OPTIONS[i].valname, &g_settings.enabled_auto_modes[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, &anotify)); - vs_automodes_fw = new CMenuForwarder(LOCALE_VIDEOMENU_ENABLED_MODES_AUTO, true, NULL, &automodes, NULL, CRCInput::RC_green); - vs_automodes_fw->setHint("", LOCALE_MENU_HINT_VIDEO_MODES_AUTO); + vs_automodes_fw = new CMenuForwarder(LOCALE_VIDEOMENU_ENABLED_MODES_AUTO, true, NULL, &automodes, NULL, CRCInput::RC_green); + vs_automodes_fw->setHint("", LOCALE_MENU_HINT_VIDEO_MODES_AUTO); #endif - } //--------------------------------------- videosetup->addIntroItems(LOCALE_MAINSETTINGS_VIDEO /*, LOCALE_VIDEOMENU_TV_SCART*/); @@ -323,31 +321,27 @@ int CVideoSettings::showVideoSetup() videosetup->addItem(vs_43mode_ch); //4:3 mode videosetup->addItem(vs_dispformat_ch); //display format videosetup->addItem(vs_videomodes_ch); //video system - if (!g_settings.easymenu) { - videosetup->addItem(vs_dbdropt_ch); //dbdr options - videosetup->addItem(vs_videomodes_fw); //video modes submenue + videosetup->addItem(vs_dbdropt_ch); //dbdr options + videosetup->addItem(vs_videomodes_fw); //video modes submenue #ifdef BOXMODEL_CS_HD2 - videosetup->addItem(vs_automodes_fw); //video auto modes submenue + videosetup->addItem(vs_automodes_fw); //video auto modes submenue #endif - } #ifdef BOXMODEL_CS_HD2 - if (!g_settings.easymenu) { - /* values are from -128 to 127, but brightness really no sense after +/- 40. changeNotify multiply contrast and saturation to 3 */ - CMenuOptionNumberChooser * bcont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_BRIGHTNESS, &g_settings.brightness, true, -42, 42, this); - bcont->setHint("", LOCALE_MENU_HINT_VIDEO_BRIGHTNESS); - CMenuOptionNumberChooser * ccont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_CONTRAST, &g_settings.contrast, true, -42, 42, this); - ccont->setHint("", LOCALE_MENU_HINT_VIDEO_CONTRAST); - CMenuOptionNumberChooser * scont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_SATURATION, &g_settings.saturation, true, -42, 42, this); - scont->setHint("", LOCALE_MENU_HINT_VIDEO_SATURATION); - videosetup->addItem(bcont); - videosetup->addItem(ccont); - videosetup->addItem(scont); + /* values are from -128 to 127, but brightness really no sense after +/- 40. changeNotify multiply contrast and saturation to 3 */ + CMenuOptionNumberChooser * bcont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_BRIGHTNESS, &g_settings.brightness, true, -42, 42, this); + bcont->setHint("", LOCALE_MENU_HINT_VIDEO_BRIGHTNESS); + CMenuOptionNumberChooser * ccont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_CONTRAST, &g_settings.contrast, true, -42, 42, this); + ccont->setHint("", LOCALE_MENU_HINT_VIDEO_CONTRAST); + CMenuOptionNumberChooser * scont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_SATURATION, &g_settings.saturation, true, -42, 42, this); + scont->setHint("", LOCALE_MENU_HINT_VIDEO_SATURATION); + videosetup->addItem(bcont); + videosetup->addItem(ccont); + videosetup->addItem(scont); - CMenuOptionChooser * sd = new CMenuOptionChooser(LOCALE_VIDEOMENU_SDOSD, &g_settings.enable_sd_osd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this); - sd->setHint("", LOCALE_MENU_HINT_VIDEO_SDOSD); - videosetup->addItem(sd); - } + CMenuOptionChooser * sd = new CMenuOptionChooser(LOCALE_VIDEOMENU_SDOSD, &g_settings.enable_sd_osd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this); + sd->setHint("", LOCALE_MENU_HINT_VIDEO_SDOSD); + videosetup->addItem(sd); #endif #ifdef ENABLE_PIP CPipSetup pip; @@ -355,11 +349,6 @@ int CVideoSettings::showVideoSetup() pipsetup->setHint("", LOCALE_MENU_HINT_VIDEO_PIP); videosetup->addItem(pipsetup); #endif - if (g_settings.easymenu) { - CMenuForwarder * mf = new CMenuDForwarder(LOCALE_FONTMENU_SCALING, true, NULL, new COsdSetup(), "font_scaling"); - mf->setHint("", LOCALE_MENU_HINT_FONT_SCALING); - videosetup->addItem(mf); - } int res = videosetup->exec(NULL, ""); selected = videosetup->getSelected(); delete videosetup; diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 15a73d540..15023c717 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -344,14 +344,7 @@ int CNeutrinoApp::loadSetup(const char * fname) //theme/color options CThemes::getTheme(configfile); - g_settings.easymenu = configfile.getInt32("easymenu", 0); g_settings.softupdate_autocheck = configfile.getBool("softupdate_autocheck" , false); - /* if file present and no config file found, force easy mode */ - if (erg && !access("/var/etc/.easymenu", F_OK)) { - g_settings.easymenu = 1; - g_settings.softupdate_autocheck = 1; - } - dprintf(DEBUG_NORMAL, "g_settings.easymenu %d\n", g_settings.easymenu); // video g_settings.video_Mode = configfile.getInt32("video_Mode", VIDEO_STD_1080I50); // VIDEO_STD_720P50 @@ -650,8 +643,7 @@ int CNeutrinoApp::loadSetup(const char * fname) //recording (server + vcr) g_settings.recording_type = configfile.getInt32("recording_type", RECORDING_FILE); g_settings.recording_stopsectionsd = configfile.getBool("recording_stopsectionsd" , false ); - g_settings.recording_audio_pids_default = configfile.getInt32("recording_audio_pids_default", - g_settings.easymenu ? TIMERD_APIDS_ALL : TIMERD_APIDS_STD | TIMERD_APIDS_AC3); + g_settings.recording_audio_pids_default = configfile.getInt32("recording_audio_pids_default", TIMERD_APIDS_STD | TIMERD_APIDS_AC3); g_settings.recording_zap_on_announce = configfile.getBool("recording_zap_on_announce" , false); g_settings.shutdown_timer_record_type = configfile.getBool("shutdown_timer_record_type" , false); @@ -1078,6 +1070,11 @@ void CNeutrinoApp::saveSetup(const char * fname) if(!scansettings.saveSettings(NEUTRINO_SCAN_SETTINGS_FILE)) { dprintf(DEBUG_NORMAL, "error while saving scan-settings!\n"); } + if (g_settings.version_pseudo < "20170913110000") + { + //remove easymenu + configfile.deleteKey("easymenu"); + } //theme/color options CThemes::setTheme(configfile); @@ -1526,7 +1523,6 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32("infoClockFontSize", g_settings.infoClockFontSize); configfile.setInt32("infoClockBackground", g_settings.infoClockBackground); configfile.setInt32("infoClockSeconds", g_settings.infoClockSeconds); - configfile.setInt32("easymenu", g_settings.easymenu); configfile.setInt32("livestreamResolution", g_settings.livestreamResolution); configfile.setString("livestreamScriptPath", g_settings.livestreamScriptPath); @@ -2893,12 +2889,6 @@ _repeat: adjustToChannelID(live_channel_id);//FIXME what if deleted ? hintBox.hide(); } - if (g_settings.easymenu) { - CBouquetList * blist = (mode == mode_radio) ? RADIOfavList : TVfavList; - t_channel_id live_channel_id = channelList->getActiveChannel_ChannelID(); - if (blist->hasChannelID(live_channel_id)) - SetChannelMode(LIST_MODE_FAV); - } channelList_painted = false; @@ -4311,21 +4301,6 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey) g_RCInput->postMsg(NeutrinoMessages::STANDBY_ON, 0); return menu_return::RETURN_EXIT_ALL; } - else if(actionKey == "easyswitch") { - INFO("easyswitch\n"); - CParentalSetup pin; - if (pin.checkPin()) { - if (parent) - parent->hide(); - - std::string text = "Easy menu switched " + string(g_settings.easymenu?"OFF":"ON") + string(", when restart box.\nRestart now?"); - if (ShowMsg(LOCALE_MESSAGEBOX_INFO, text, CMsgBox::mbrNo, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_INFO, 0) == CMsgBox::mbrYes) { - g_settings.easymenu = (g_settings.easymenu == 0) ? 1 : 0; - INFO("change easymenu to %d\n", g_settings.easymenu); - g_RCInput->postMsg(NeutrinoMessages::REBOOT, 0); - } - } - } return returnval; } diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index fc673329b..436556751 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -93,10 +93,9 @@ extern CCAMMenuHandler * g_CamHandler; const mn_widget_struct_t menu_widgets[MENU_MAX] = { - {LOCALE_MAINMENU_HEAD, NEUTRINO_ICON_MAINMENU, MENU_WIDTH}, /* 0 = MENU_MAIN*/ - {LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, MENU_WIDTH}, /* 1 = MENU_SETTINGS*/ - {LOCALE_SERVICEMENU_HEAD, NEUTRINO_ICON_SETTINGS, MENU_WIDTH}, /* 2 = MENU_SERVICE*/ - {LOCALE_MAINMENU_SHUTDOWN_MENU, NEUTRINO_ICON_BUTTON_POWER, MENU_WIDTH}, /* 3 = MENU_SHUTDOWN*/ + {LOCALE_MAINMENU_HEAD, NEUTRINO_ICON_MAINMENU, MENU_WIDTH}, /* 0 = MENU_MAIN */ + {LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, MENU_WIDTH}, /* 1 = MENU_SETTINGS */ + {LOCALE_SERVICEMENU_HEAD, NEUTRINO_ICON_SETTINGS, MENU_WIDTH} /* 2 = MENU_SERVICE */ }; //init all menues @@ -108,7 +107,7 @@ void CNeutrinoApp::InitMenu() personalize.enableUsermenu(); personalize.enablePluginMenu(); personalize.enablePinSetup(); - personalize.addWidgets(menu_widgets, g_settings.easymenu ? MENU_MAX : 3); + personalize.addWidgets(menu_widgets, MENU_MAX); InitMenuMain(); InitMenuSettings(); @@ -138,44 +137,25 @@ void CNeutrinoApp::InitMenuMain() // Dynamic renumbering personalize.setShortcut(); - CMenuWidget &menu = personalize.getWidget(MENU_MAIN); - menu.addKey(CRCInput::RC_stop, this, "easyswitch"); - //top personalize.addItem(MENU_MAIN, GenericMenuSeparator, NULL, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); //1st section*************************************************************************************************** - if (g_settings.easymenu) { - if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) { - CMenuForwarder *mb = new CMenuForwarder(LOCALE_MOVIEBROWSER_HEAD, true, NULL, CMediaPlayerMenu::getInstance(), "movieplayer", CRCInput::RC_red); - mb->setHint(NEUTRINO_ICON_HINT_MB, LOCALE_MENU_HINT_MB); - personalize.addItem(MENU_MAIN, mb, &g_settings.personalize[SNeutrinoSettings::P_MPLAYER_MBROWSER], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ITEM_OPTION, NULL, DCOND_MODE_TS); - } -#if 0 - CMenuForwarder *cl = new CMenuForwarder(LOCALE_MAINMENU_CHANNELS, true, NULL, this, "channels", CRCInput::RC_green); - cl->setHint(NEUTRINO_ICON_HINT_TVMODE, LOCALE_MENU_HINT_CHANNELS); - personalize.addItem(MENU_MAIN, cl); -#endif - CMenuForwarder * mf = new CMenuForwarder(LOCALE_BOUQUETEDITOR_NAME , true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_green); - mf->setHint(NEUTRINO_ICON_HINT_BEDIT, LOCALE_MENU_HINT_BEDIT); - personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_BOUQUET_EDIT], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION); - } else { - //tv <-> radio toggle - CMenuForwarder *tvradio_switch = new CMenuForwarder(LOCALE_MAINMENU_TVRADIO_SWITCH, true, NULL, this, "tv_radio_switch", CRCInput::RC_red); - tvradio_switch->setHint(NEUTRINO_ICON_HINT_TVRADIO_SWITCH, LOCALE_MENU_HINT_TVRADIO_SWITCH); - personalize.addItem(MENU_MAIN, tvradio_switch, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TV_RADIO_MODE], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ITEM_OPTION, NULL, DCOND_MODE_TS); + //tv <-> radio toggle + CMenuForwarder *tvradio_switch = new CMenuForwarder(LOCALE_MAINMENU_TVRADIO_SWITCH, true, NULL, this, "tv_radio_switch", CRCInput::RC_red); + tvradio_switch->setHint(NEUTRINO_ICON_HINT_TVRADIO_SWITCH, LOCALE_MENU_HINT_TVRADIO_SWITCH); + personalize.addItem(MENU_MAIN, tvradio_switch, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TV_RADIO_MODE], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ITEM_OPTION, NULL, DCOND_MODE_TS); - //tv-mode - CMenuForwarder *tvswitch = new CMenuForwarder(LOCALE_MAINMENU_TVMODE, true, NULL, this, "tv", CRCInput::RC_red); - tvswitch->setHint(NEUTRINO_ICON_HINT_TVMODE, LOCALE_MENU_HINT_TVMODE); - personalize.addItem(MENU_MAIN, tvswitch, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TV_MODE], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ITEM_OPTION, tvradio_switch, DCOND_MODE_TV | DCOND_MODE_TS); //observed + //tv-mode + CMenuForwarder *tvswitch = new CMenuForwarder(LOCALE_MAINMENU_TVMODE, true, NULL, this, "tv", CRCInput::RC_red); + tvswitch->setHint(NEUTRINO_ICON_HINT_TVMODE, LOCALE_MENU_HINT_TVMODE); + personalize.addItem(MENU_MAIN, tvswitch, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TV_MODE], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ITEM_OPTION, tvradio_switch, DCOND_MODE_TV | DCOND_MODE_TS); //observed - //radio-mode - CMenuForwarder *radioswitch = new CMenuForwarder(LOCALE_MAINMENU_RADIOMODE, true, NULL, this, "radio", CRCInput::RC_green); - radioswitch->setHint(NEUTRINO_ICON_HINT_RADIOMODE, LOCALE_MENU_HINT_RADIOMODE); - personalize.addItem(MENU_MAIN, radioswitch, &g_settings.personalize[SNeutrinoSettings::P_MAIN_RADIO_MODE], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ITEM_OPTION, tvradio_switch, DCOND_MODE_RADIO | DCOND_MODE_TS); //observed - } + //radio-mode + CMenuForwarder *radioswitch = new CMenuForwarder(LOCALE_MAINMENU_RADIOMODE, true, NULL, this, "radio", CRCInput::RC_green); + radioswitch->setHint(NEUTRINO_ICON_HINT_RADIOMODE, LOCALE_MENU_HINT_RADIOMODE); + personalize.addItem(MENU_MAIN, radioswitch, &g_settings.personalize[SNeutrinoSettings::P_MAIN_RADIO_MODE], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ITEM_OPTION, tvradio_switch, DCOND_MODE_RADIO | DCOND_MODE_TS); //observed //timer CMenuForwarder *timerlist = new CMenuForwarder(LOCALE_TIMERLIST_NAME, true, NULL, new CTimerList(), NULL, CRCInput::RC_yellow); @@ -185,37 +165,32 @@ void CNeutrinoApp::InitMenuMain() //multimedia menu CMenuForwarder *media = new CMenuForwarder(LOCALE_MAINMENU_MEDIA, true, NULL, CMediaPlayerMenu::getInstance(), NULL, CRCInput::RC_blue); media->setHint(NEUTRINO_ICON_HINT_MEDIA, LOCALE_MENU_HINT_MEDIA); - if (g_settings.easymenu) - personalize.addItem(MENU_MAIN, media, &g_settings.personalize[SNeutrinoSettings::P_MAIN_MEDIA], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION); - else - personalize.addItem(MENU_MAIN, media, &g_settings.personalize[SNeutrinoSettings::P_MAIN_MEDIA]); + personalize.addItem(MENU_MAIN, media, &g_settings.personalize[SNeutrinoSettings::P_MAIN_MEDIA]); - CMenuForwarder * mf; - if (!g_settings.easymenu) { - //games - bool show_games = g_Plugins->hasPlugin(CPlugins::P_TYPE_GAME); - mf = new CMenuForwarder(LOCALE_MAINMENU_GAMES, show_games, NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME)); - mf->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES); - personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_GAMES]); + CMenuForwarder *mf; + //games + bool show_games = g_Plugins->hasPlugin(CPlugins::P_TYPE_GAME); + mf = new CMenuForwarder(LOCALE_MAINMENU_GAMES, show_games, NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME)); + mf->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES); + personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_GAMES]); - //tools - bool show_tools = g_Plugins->hasPlugin(CPlugins::P_TYPE_TOOL); - mf = new CMenuForwarder(LOCALE_MAINMENU_TOOLS, show_tools, NULL, new CPluginList(LOCALE_MAINMENU_TOOLS,CPlugins::P_TYPE_TOOL)); - mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_TOOLS); - personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TOOLS]); + //tools + bool show_tools = g_Plugins->hasPlugin(CPlugins::P_TYPE_TOOL); + mf = new CMenuForwarder(LOCALE_MAINMENU_TOOLS, show_tools, NULL, new CPluginList(LOCALE_MAINMENU_TOOLS,CPlugins::P_TYPE_TOOL)); + mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_TOOLS); + personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TOOLS]); - //scripts - bool show_scripts = g_Plugins->hasPlugin(CPlugins::P_TYPE_SCRIPT); - mf = new CMenuForwarder(LOCALE_MAINMENU_SCRIPTS, show_scripts, NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT)); - mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS); - personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SCRIPTS]); + //scripts + bool show_scripts = g_Plugins->hasPlugin(CPlugins::P_TYPE_SCRIPT); + mf = new CMenuForwarder(LOCALE_MAINMENU_SCRIPTS, show_scripts, NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT)); + mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS); + personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SCRIPTS]); - //lua - bool show_lua = g_Plugins->hasPlugin(CPlugins::P_TYPE_LUA); - mf = new CMenuForwarder(LOCALE_MAINMENU_LUA, show_lua, NULL, new CPluginList(LOCALE_MAINMENU_LUA,CPlugins::P_TYPE_LUA)); - mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_LUA); - personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_LUA]); - } + //lua + bool show_lua = g_Plugins->hasPlugin(CPlugins::P_TYPE_LUA); + mf = new CMenuForwarder(LOCALE_MAINMENU_LUA, show_lua, NULL, new CPluginList(LOCALE_MAINMENU_LUA,CPlugins::P_TYPE_LUA)); + mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_LUA); + personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_LUA]); //separator personalize.addSeparator(MENU_MAIN); @@ -237,24 +212,22 @@ void CNeutrinoApp::InitMenuMain() //3rd section*************************************************************************************************** - if (!g_settings.easymenu) { - //10. -- only 10 shortcuts (1-9, 0), the next could be the last also!(10. => 0) - //sleeptimer - mf = new CMenuForwarder(LOCALE_MAINMENU_SLEEPTIMER, true, NULL, new CSleepTimerWidget); - mf->setHint(NEUTRINO_ICON_HINT_SLEEPTIMER, LOCALE_MENU_HINT_SLEEPTIMER); - personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SLEEPTIMER]); + //10. -- only 10 shortcuts (1-9, 0), the next could be the last also!(10. => 0) + //sleeptimer + mf = new CMenuForwarder(LOCALE_MAINMENU_SLEEPTIMER, true, NULL, new CSleepTimerWidget); + mf->setHint(NEUTRINO_ICON_HINT_SLEEPTIMER, LOCALE_MENU_HINT_SLEEPTIMER); + personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SLEEPTIMER]); - //reboot - mf = new CMenuForwarder(LOCALE_MAINMENU_REBOOT, true, NULL, this, "reboot"); - mf->setHint(NEUTRINO_ICON_HINT_REBOOT, LOCALE_MENU_HINT_REBOOT); - personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_REBOOT]); + //reboot + mf = new CMenuForwarder(LOCALE_MAINMENU_REBOOT, true, NULL, this, "reboot"); + mf->setHint(NEUTRINO_ICON_HINT_REBOOT, LOCALE_MENU_HINT_REBOOT); + personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_REBOOT]); - //shutdown - if (g_info.hw_caps->can_shutdown) { - mf = new CMenuForwarder(LOCALE_MAINMENU_SHUTDOWN, true, NULL, this, "shutdown", CRCInput::RC_standby); - mf->setHint(NEUTRINO_ICON_HINT_SHUTDOWN, LOCALE_MENU_HINT_SHUTDOWN); - personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SHUTDOWN]); - } + //shutdown + if (g_info.hw_caps->can_shutdown) { + mf = new CMenuForwarder(LOCALE_MAINMENU_SHUTDOWN, true, NULL, this, "shutdown", CRCInput::RC_standby); + mf->setHint(NEUTRINO_ICON_HINT_SHUTDOWN, LOCALE_MENU_HINT_SHUTDOWN); + personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SHUTDOWN]); } //separator @@ -268,40 +241,11 @@ void CNeutrinoApp::InitMenuMain() personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_INFOMENU]); //cisettings - if (!g_settings.easymenu && (cCA::GetInstance()->GetNumberCISlots() > 0 || cCA::GetInstance()->GetNumberSmartCardSlots() > 0)) { + if (cCA::GetInstance()->GetNumberCISlots() > 0 || cCA::GetInstance()->GetNumberSmartCardSlots() > 0) { mf = new CMenuForwarder(LOCALE_CI_SETTINGS, true, NULL, g_CamHandler); mf->setHint(NEUTRINO_ICON_HINT_CI, LOCALE_MENU_HINT_CI); personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_CISETTINGS]); } - if (g_settings.easymenu) { - personalize.addIntroItems(MENU_SHUTDOWN); - - mf = new CMenuForwarder(LOCALE_MAINMENU_SHUTDOWN_MENU, true, NULL, &personalize.getWidget(MENU_SHUTDOWN), NULL, CRCInput::RC_standby); - mf->setHint(NEUTRINO_ICON_HINT_SHUTDOWN, LOCALE_MENU_HINT_SHUTDOWN_MENU); - personalize.addItem(MENU_MAIN, mf); - - // standby - mf = new CMenuForwarder(LOCALE_MAINMENU_STANDBY, true, NULL, this, "standby", CRCInput::RC_red); - mf->setHint(NEUTRINO_ICON_HINT_SLEEPTIMER, LOCALE_MENU_HINT_STANDBY); - personalize.addItem(MENU_SHUTDOWN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_STANDBY]); - - //sleeptimer - mf = new CMenuForwarder(LOCALE_MAINMENU_SLEEPTIMER, true, NULL, new CSleepTimerWidget, NULL, CRCInput::RC_green); - mf->setHint(NEUTRINO_ICON_HINT_SLEEPTIMER, LOCALE_MENU_HINT_SLEEPTIMER); - personalize.addItem(MENU_SHUTDOWN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SLEEPTIMER]); - - //reboot - mf = new CMenuForwarder(LOCALE_MAINMENU_REBOOT, true, NULL, this, "reboot", CRCInput::RC_yellow); - mf->setHint(NEUTRINO_ICON_HINT_REBOOT, LOCALE_MENU_HINT_REBOOT); - personalize.addItem(MENU_SHUTDOWN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_REBOOT]); - - //shutdown - if (g_info.hw_caps->can_shutdown) { - mf = new CMenuForwarder(LOCALE_MAINMENU_SHUTDOWN, true, NULL, this, "shutdown", CRCInput::RC_blue); - mf->setHint(NEUTRINO_ICON_HINT_SHUTDOWN, LOCALE_MENU_HINT_SHUTDOWN); - personalize.addItem(MENU_SHUTDOWN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SHUTDOWN]); - } - } #ifdef ENABLE_TESTING personalize.addItem(MENU_MAIN, new CMenuForwarder("Test menu", true, NULL, new CTestMenu()), NULL, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); @@ -325,66 +269,42 @@ void CNeutrinoApp::InitMenuSettings() //*************************************************************************************************** // save CMenuForwarder * mf; - if (!g_settings.easymenu) { - mf = new CMenuForwarder(LOCALE_MAINSETTINGS_SAVESETTINGSNOW, true, NULL, this, "savesettings", CRCInput::RC_red); - mf->setHint(NEUTRINO_ICON_HINT_SAVE_SETTINGS, LOCALE_MENU_HINT_SAVE_SETTINGS); - personalize.addItem(MENU_SETTINGS, mf, &show, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); - } + mf = new CMenuForwarder(LOCALE_MAINSETTINGS_SAVESETTINGSNOW, true, NULL, this, "savesettings", CRCInput::RC_red); + mf->setHint(NEUTRINO_ICON_HINT_SAVE_SETTINGS, LOCALE_MENU_HINT_SAVE_SETTINGS); + personalize.addItem(MENU_SETTINGS, mf, &show, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); // settings manager - if (g_settings.easymenu) { - mf = new CMenuForwarder(LOCALE_MAINSETTINGS_MANAGE, true, NULL, new CSettingsManager(), NULL, CRCInput::RC_red); - personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_SETTINGS_MANAGER]); - } else { - mf = new CMenuForwarder(LOCALE_MAINSETTINGS_MANAGE, true, NULL, new CSettingsManager(), NULL, CRCInput::RC_green); - personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_SETTINGS_MANAGER], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION); - } + mf = new CMenuForwarder(LOCALE_MAINSETTINGS_MANAGE, true, NULL, new CSettingsManager(), NULL, CRCInput::RC_green); + personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_SETTINGS_MANAGER], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION); mf->setHint(NEUTRINO_ICON_HINT_MANAGE_SETTINGS, LOCALE_MENU_HINT_MANAGE_SETTINGS); // personalize - if (!g_settings.easymenu) { - mf = new CMenuForwarder(LOCALE_PERSONALIZE_HEAD, true, NULL, &personalize, NULL, CRCInput::RC_yellow, NULL, NEUTRINO_ICON_LOCK); - mf->setHint(NEUTRINO_ICON_HINT_PERSONALIZE, LOCALE_MENU_HINT_PERSONALIZE); - personalize.addItem(MENU_SETTINGS, mf, &show, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); - } + mf = new CMenuForwarder(LOCALE_PERSONALIZE_HEAD, true, NULL, &personalize, NULL, CRCInput::RC_yellow, NULL, NEUTRINO_ICON_LOCK); + mf->setHint(NEUTRINO_ICON_HINT_PERSONALIZE, LOCALE_MENU_HINT_PERSONALIZE); + personalize.addItem(MENU_SETTINGS, mf, &show, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); // miscSettings - if (!g_settings.easymenu) { - mf = new CMenuForwarder(LOCALE_MAINSETTINGS_MISC, true, NULL, new CMiscMenue() , NULL, CRCInput::RC_blue); - mf->setHint(NEUTRINO_ICON_HINT_EXTENDED, LOCALE_MENU_HINT_EXTENDED); - personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_MISC]); + mf = new CMenuForwarder(LOCALE_MAINSETTINGS_MISC, true, NULL, new CMiscMenue() , NULL, CRCInput::RC_blue); + mf->setHint(NEUTRINO_ICON_HINT_EXTENDED, LOCALE_MENU_HINT_EXTENDED); + personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_MISC]); - //separator - personalize.addSeparator(MENU_SETTINGS); - } + //separator + personalize.addSeparator(MENU_SETTINGS); //1st section*************************************************************************************************** //use only 10 shortcuts (1-9, 0), >9 means -> no shortcut // video. - if (g_settings.easymenu) - mf = new CMenuForwarder(LOCALE_MAINSETTINGS_VIDEO, true, NULL, g_videoSettings, NULL, CRCInput::RC_green); - else - mf = new CMenuForwarder(LOCALE_MAINSETTINGS_VIDEO, true, NULL, g_videoSettings); + mf = new CMenuForwarder(LOCALE_MAINSETTINGS_VIDEO, true, NULL, g_videoSettings); mf->setHint(NEUTRINO_ICON_HINT_VIDEO, LOCALE_MENU_HINT_VIDEO); personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_VIDEO]); // audio - if (g_settings.easymenu) - mf = new CMenuForwarder(LOCALE_MAINSETTINGS_AUDIO, true, NULL, new CAudioSetup(), NULL, CRCInput::RC_yellow); - else - mf = new CMenuForwarder(LOCALE_MAINSETTINGS_AUDIO, true, NULL, new CAudioSetup()); + mf = new CMenuForwarder(LOCALE_MAINSETTINGS_AUDIO, true, NULL, new CAudioSetup()); mf->setHint(NEUTRINO_ICON_HINT_AUDIO, LOCALE_MENU_HINT_AUDIO); personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_AUDIO]); - // channel list - if (g_settings.easymenu) { - mf = new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, new CMiscMenue(), "channellist", CRCInput::RC_blue); - mf->setHint("", LOCALE_MENU_HINT_MISC_CHANNELLIST); - personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_MISC]); - } - // parental lock mf = new CMenuForwarder(LOCALE_PARENTALLOCK_PARENTALLOCK, true, NULL, new CParentalSetup()); mf->setHint(NEUTRINO_ICON_HINT_PROTECTION, LOCALE_MENU_HINT_PROTECTION); @@ -408,11 +328,9 @@ void CNeutrinoApp::InitMenuSettings() personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_OSDLANG]); // osd - if (!g_settings.easymenu) { - mf = new CMenuForwarder(LOCALE_MAINSETTINGS_OSD, true, NULL, new COsdSetup()); - mf->setHint(NEUTRINO_ICON_HINT_OSD, LOCALE_MENU_HINT_OSD); - personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_OSD]); - } + mf = new CMenuForwarder(LOCALE_MAINSETTINGS_OSD, true, NULL, new COsdSetup()); + mf->setHint(NEUTRINO_ICON_HINT_OSD, LOCALE_MENU_HINT_OSD); + personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_OSD]); // lcd mf = new CMenuForwarder(LOCALE_MAINSETTINGS_LCD, true, NULL, new CVfdSetup()); @@ -426,29 +344,20 @@ void CNeutrinoApp::InitMenuSettings() personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_DRIVES]); } - // energy - if (g_settings.easymenu) { - mf = new CMenuForwarder(LOCALE_MISCSETTINGS_ENERGY, true, NULL, new CMiscMenue(), "energy"); - mf->setHint("", LOCALE_MENU_HINT_MISC_ENERGY); - personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_MISC]); - } + // cisettings + mf = new CMenuForwarder(LOCALE_CI_SETTINGS, true, NULL, g_CamHandler); + mf->setHint(NEUTRINO_ICON_HINT_CI, LOCALE_MENU_HINT_CI); + personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_CISETTINGS]); - if (!g_settings.easymenu) { - // cisettings - mf = new CMenuForwarder(LOCALE_CI_SETTINGS, true, NULL, g_CamHandler); - mf->setHint(NEUTRINO_ICON_HINT_CI, LOCALE_MENU_HINT_CI); - personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_CISETTINGS]); + // keybindings + mf = new CMenuForwarder(LOCALE_MAINSETTINGS_KEYBINDING, true, NULL, new CKeybindSetup()); + mf->setHint(NEUTRINO_ICON_HINT_KEYS, LOCALE_MENU_HINT_KEYS); + personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_KEYBINDING]); - // keybindings - mf = new CMenuForwarder(LOCALE_MAINSETTINGS_KEYBINDING, true, NULL, new CKeybindSetup()); - mf->setHint(NEUTRINO_ICON_HINT_KEYS, LOCALE_MENU_HINT_KEYS); - personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_KEYBINDING]); - - // multimedia settings - mf = new CMenuForwarder(LOCALE_MAINSETTINGS_MULTIMEDIA, true, NULL, new CMediaPlayerSetup()); - mf->setHint(NEUTRINO_ICON_HINT_A_PIC, LOCALE_MENU_HINT_A_PIC); - personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_MEDIAPLAYER]); - } + // multimedia settings + mf = new CMenuForwarder(LOCALE_MAINSETTINGS_MULTIMEDIA, true, NULL, new CMediaPlayerSetup()); + mf->setHint(NEUTRINO_ICON_HINT_A_PIC, LOCALE_MENU_HINT_A_PIC); + personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_MEDIAPLAYER]); } @@ -480,74 +389,55 @@ void CNeutrinoApp::InitMenuService() mf->setHint(NEUTRINO_ICON_HINT_SERVICE_SCAN, LOCALE_MENU_HINT_SERVICE_SCAN); personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_SCANTS], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ITEM_OPTION, NULL, DCOND_MODE_TS); - if (!g_settings.easymenu) { - //reload channels - mf = new CMenuForwarder(LOCALE_SERVICEMENU_RELOAD , true, NULL, CScanSetup::getInstance(), "reloadchannels", CRCInput::RC_yellow); - mf->setHint(NEUTRINO_ICON_HINT_RELOAD_CHANNELS, LOCALE_MENU_HINT_RELOAD_CHANNELS); - personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RELOAD_CHANNELS]); - } + //reload channels + mf = new CMenuForwarder(LOCALE_SERVICEMENU_RELOAD , true, NULL, CScanSetup::getInstance(), "reloadchannels", CRCInput::RC_yellow); + mf->setHint(NEUTRINO_ICON_HINT_RELOAD_CHANNELS, LOCALE_MENU_HINT_RELOAD_CHANNELS); + personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RELOAD_CHANNELS]); //bouquet edit - if (!g_settings.easymenu) { - mf = new CMenuForwarder(LOCALE_BOUQUETEDITOR_NAME , true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_blue); - - mf->setHint(NEUTRINO_ICON_HINT_BEDIT, LOCALE_MENU_HINT_BEDIT); - personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_BOUQUET_EDIT]); - } + mf = new CMenuForwarder(LOCALE_BOUQUETEDITOR_NAME , true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_blue); + mf->setHint(NEUTRINO_ICON_HINT_BEDIT, LOCALE_MENU_HINT_BEDIT); + personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_BOUQUET_EDIT]); //channel reset CDataResetNotifier *resetNotifier = new CDataResetNotifier(); - if (g_settings.easymenu) - mf = new CMenuForwarder(LOCALE_RESET_CHANNELS , true, NULL, resetNotifier, "channels", CRCInput::RC_yellow); - else - mf = new CMenuForwarder(LOCALE_RESET_CHANNELS , true, NULL, resetNotifier, "channels"); - + mf = new CMenuForwarder(LOCALE_RESET_CHANNELS , true, NULL, resetNotifier, "channels"); mf->setHint(NEUTRINO_ICON_HINT_DELETE_CHANNELS, LOCALE_MENU_HINT_DELETE_CHANNELS); personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RESET_CHANNELS]); - if (!g_settings.easymenu) { - /* todo: only show if (g_settings.make_removed_list) */ - mf = new CMenuForwarder(LOCALE_RESET_REMOVED, true, NULL, resetNotifier, "delete_removed"); - mf->setHint(NEUTRINO_ICON_HINT_DELETE_CHANNELS, LOCALE_MENU_HINT_DELETE_REMOVED); - personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RESET_CHANNELS]); - } + /* todo: only show if (g_settings.make_removed_list) */ + mf = new CMenuForwarder(LOCALE_RESET_REMOVED, true, NULL, resetNotifier, "delete_removed"); + mf->setHint(NEUTRINO_ICON_HINT_DELETE_CHANNELS, LOCALE_MENU_HINT_DELETE_REMOVED); + personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RESET_CHANNELS]); //separator personalize.addSeparator(MENU_SERVICE); - if (!g_settings.easymenu) { - personalize.addSeparator(MENU_SERVICE); + personalize.addSeparator(MENU_SERVICE); - //restart neutrino - mf = new CMenuForwarder(LOCALE_SERVICEMENU_RESTART , true, NULL, this, "restart", CRCInput::RC_standby); - mf->setHint(NEUTRINO_ICON_HINT_SOFT_RESTART, LOCALE_MENU_HINT_SOFT_RESTART); - personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RESTART]); + //restart neutrino + mf = new CMenuForwarder(LOCALE_SERVICEMENU_RESTART , true, NULL, this, "restart", CRCInput::RC_standby); + mf->setHint(NEUTRINO_ICON_HINT_SOFT_RESTART, LOCALE_MENU_HINT_SOFT_RESTART); + personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RESTART]); - //reload plugins - mf = new CMenuForwarder(LOCALE_SERVICEMENU_GETPLUGINS, true, NULL, this, "reloadplugins"); - mf->setHint(NEUTRINO_ICON_HINT_RELOAD_CHANNELS, LOCALE_MENU_HINT_RELOAD_PLUGINS); - personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RELOAD_PLUGINS]); + //reload plugins + mf = new CMenuForwarder(LOCALE_SERVICEMENU_GETPLUGINS, true, NULL, this, "reloadplugins"); + mf->setHint(NEUTRINO_ICON_HINT_RELOAD_CHANNELS, LOCALE_MENU_HINT_RELOAD_PLUGINS); + personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RELOAD_PLUGINS]); - //separator - personalize.addSeparator(MENU_SERVICE); - } + //separator + personalize.addSeparator(MENU_SERVICE); //2nd section*************************************************************************************************** //infomenu - if (!g_settings.easymenu) { - mf = new CMenuForwarder(LOCALE_MESSAGEBOX_INFO, true, NULL, new CInfoMenu(), NULL, CRCInput::RC_info); - mf->setHint(NEUTRINO_ICON_HINT_INFO, LOCALE_MENU_HINT_INFO); - personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_SERVICE_INFOMENU]); - } + mf = new CMenuForwarder(LOCALE_MESSAGEBOX_INFO, true, NULL, new CInfoMenu(), NULL, CRCInput::RC_info); + mf->setHint(NEUTRINO_ICON_HINT_INFO, LOCALE_MENU_HINT_INFO); + personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_SERVICE_INFOMENU]); //firmware update - if (g_settings.easymenu) - mf = new CMenuForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, new CSoftwareUpdate(), NULL, CRCInput::RC_blue); - else - mf = new CMenuForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, new CSoftwareUpdate()); - + mf = new CMenuForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, new CSoftwareUpdate()); mf->setHint(NEUTRINO_ICON_HINT_SW_UPDATE, LOCALE_MENU_HINT_SW_UPDATE); personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_SOFTUPDATE], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ITEM_OPTION, NULL, DCOND_MODE_TS); } diff --git a/src/neutrino_menue.h b/src/neutrino_menue.h index a1e37f4d9..ba7abdb2f 100644 --- a/src/neutrino_menue.h +++ b/src/neutrino_menue.h @@ -199,7 +199,6 @@ enum MENU_MAIN, MENU_SETTINGS, MENU_SERVICE, - MENU_SHUTDOWN, MENU_MAX }; diff --git a/src/system/locals.h b/src/system/locals.h index 9aee9e30b..02c2b53a6 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -969,7 +969,6 @@ typedef enum LOCALE_MAINMENU_SERVICE, LOCALE_MAINMENU_SETTINGS, LOCALE_MAINMENU_SHUTDOWN, - LOCALE_MAINMENU_SHUTDOWN_MENU, LOCALE_MAINMENU_SLEEPTIMER, LOCALE_MAINMENU_STANDBY, LOCALE_MAINMENU_TOOLS, @@ -1451,7 +1450,6 @@ typedef enum LOCALE_MENU_HINT_SHOW_MUTE_ICON, LOCALE_MENU_HINT_SHUTDOWN, LOCALE_MENU_HINT_SHUTDOWN_COUNT, - LOCALE_MENU_HINT_SHUTDOWN_MENU, LOCALE_MENU_HINT_SHUTDOWN_RCDELAY, LOCALE_MENU_HINT_SHUTDOWN_REAL, LOCALE_MENU_HINT_SLEEPTIMER, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index bdd72cbfd..060d4352b 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -969,7 +969,6 @@ const char * locale_real_names[] = "mainmenu.service", "mainmenu.settings", "mainmenu.shutdown", - "mainmenu.shutdown_menu", "mainmenu.sleeptimer", "mainmenu.standby", "mainmenu.tools", @@ -1451,7 +1450,6 @@ const char * locale_real_names[] = "menu.hint_show_mute_icon", "menu.hint_shutdown", "menu.hint_shutdown_count", - "menu.hint_shutdown_menu", "menu.hint_shutdown_rcdelay", "menu.hint_shutdown_real", "menu.hint_sleeptimer", diff --git a/src/system/settings.h b/src/system/settings.h index 534c7a7a3..ad82d06d0 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -265,7 +265,6 @@ struct SNeutrinoSettings int ci_tuner; std::string ci_pincode; int radiotext_enable; - int easymenu; //screen saver int screensaver_delay; diff --git a/version_pseudo.h b/version_pseudo.h index f72f31607..d32ebccc9 100644 --- a/version_pseudo.h +++ b/version_pseudo.h @@ -1 +1 @@ -#define NEUTRINO_VERSION_PSEUDO "20170209181002" +#define NEUTRINO_VERSION_PSEUDO "20170913110000"