diff --git a/data/locale/english.locale b/data/locale/english.locale index 0daf5b0cf..edf6d0937 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -722,6 +722,7 @@ ledcontroler.on.all Led1 & Led2 on ledcontroler.on.led1 Led1 on ledcontroler.on.led2 Led2 on mainmenu.audioplayer Audioplayer +mainmenu.channels Channels mainmenu.clearsectionsd Clear EPG Cache mainmenu.games Games mainmenu.head Main Menu @@ -735,10 +736,12 @@ mainmenu.recording Recording mainmenu.recording_start start mainmenu.recording_stop stop mainmenu.scripts Scripts -mainmenu.service Service -mainmenu.settings Settings -mainmenu.shutdown Shutdown +mainmenu.service Instalation (service) +mainmenu.settings System settings +mainmenu.shutdown Shutdown (deep standby) +mainmenu.shutdown_menu Shutdown mainmenu.sleeptimer SleepTimer +mainmenu.standby Standby mainmenu.tvmode TV-Mode mainmenu.tvradio_switch TV-Radio Switch mainsettings.audio Audio @@ -786,6 +789,7 @@ menu.hint_backlight Configure buttons backlight menu.hint_backup Backup configs and channels to selected dir menu.hint_bedit Edit favorites and bouquets menu.hint_cache_txt Start teletext caching after channel switch +menu.hint_channels Open channel list menu.hint_cec_mode CEC mode menu.hint_cec_standby CEC standby menu.hint_cec_view_on CEC view ON @@ -984,6 +988,7 @@ menu.hint_osd_language Select OSD language menu.hint_osd_preset Pre-configured screen margins for CRT and LCD TV menu.hint_parentallock_changepin Change PIN code menu.hint_parentallock_lockage Select age allowed to watch +menu.hint_parentallock_menu Lock menus with pin code menu.hint_parentallock_prompt Configure when Neutrino-HD will ask you\nfor PIN code menu.hint_personalize Enable, disable or Protect menu items\nConfigure color-buttons user menus menu.hint_pictureviewer_defdir Default picture viewer directory @@ -1112,6 +1117,7 @@ menu.hint_service_scan Tuner setup, service scan menu.hint_settings Configure Neutrino-HD\nNetwork, audio, video, OSD and more 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_menu Put you receiver in sleep or deep standby mode, set sleep timer menu.hint_shutdown_count Time to put box in deep-standby\nfrom soft-standby mode 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 @@ -1125,6 +1131,7 @@ menu.hint_softupdate_expert Separate partitions from the flash read / write to t menu.hint_softupdate_expert_read Separate partitions (U-Boot, Splash, Kernel, SystemFS) from the flash read menu.hint_softupdate_expert_write Separate partitions (Splash, Kernel, SystemFS) write to the flash menu.hint_softupdate_settings The local update directory and the configuration file to set +menu.hint_standby Put receiver to sleep mode menu.hint_start_tostandby Enter standby mode after boot menu.hint_streaminfo Current channel info: pids, signal and noise ratio\nBitrate graphs menu.hint_subchannel_pos Select subchannels menu position @@ -1317,7 +1324,7 @@ moviebrowser.foot_options Options moviebrowser.foot_play Start movie moviebrowser.foot_refresh Refresh list moviebrowser.foot_sort Sort: -moviebrowser.head TS MovieBrowser +moviebrowser.head My recordings moviebrowser.head_filter Filter movies by category: moviebrowser.head_playlist Last played: moviebrowser.head_recordlist Last recorded: @@ -1534,6 +1541,7 @@ parentallock.lockage16 from 16 years up parentallock.lockage18 from 18 years up parentallock.lockedchannel Locked sender... parentallock.lockedprogram Locked program (from %d years up) +parentallock.menu Menu Security parentallock.never never parentallock.onsignal on broadcasted lock parentallock.parentallock Parental lock diff --git a/src/gui/audio_setup.cpp b/src/gui/audio_setup.cpp index f2fadc797..85a09d179 100644 --- a/src/gui/audio_setup.cpp +++ b/src/gui/audio_setup.cpp @@ -148,16 +148,19 @@ int CAudioSetup::showAudioSetup() CMenuOptionChooser * as_oj_dd_spdif = new CMenuOptionChooser(LOCALE_AUDIOMENU_SPDIF_DD, &g_settings.spdif_dd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, audioSetupNotifier); as_oj_dd_spdif->setHint("", LOCALE_MENU_HINT_AUDIO_SPDIF_DD); - //av synch - CMenuOptionChooser * 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); + CMenuOptionChooser * as_oj_avsync = NULL; + CMenuOptionNumberChooser * as_oj_vsteps = 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 - CMenuOptionNumberChooser * 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); - - //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); + //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 @@ -191,11 +194,13 @@ int CAudioSetup::showAudioSetup() audioSettings->addItem(as_oj_dd_hdmi); audioSettings->addItem(as_oj_dd_spdif); audioSettings->addItem(as_oj_ddsubchn); - audioSettings->addItem(GenericMenuSeparatorLine); //--------------------------------------------------------- - audioSettings->addItem(as_oj_avsync); - audioSettings->addItem(as_oj_vsteps); -// audioSettings->addItem(as_clockrec); + if (!g_settings.easymenu) { + audioSettings->addItem(GenericMenuSeparatorLine); + audioSettings->addItem(as_oj_avsync); + audioSettings->addItem(as_oj_vsteps); + //audioSettings->addItem(as_clockrec); + } //--------------------------------------------------------- audioSettings->addItem(GenericMenuSeparatorLine); audioSettings->addItem(as_oj_srsonoff); diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp index a1047ef59..c00f8ffb8 100644 --- a/src/gui/cam_menu.cpp +++ b/src/gui/cam_menu.cpp @@ -107,12 +107,14 @@ int CCAMMenuHandler::doMainMenu() //cammenu->addItem( GenericMenuSeparatorLine ); cammenu->addIntroItems(); - 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)); + 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( GenericMenuSeparatorLine ); } - 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( GenericMenuSeparatorLine ); CMenuWidget * tempMenu; int i = 0; diff --git a/src/gui/info_menue.cpp b/src/gui/info_menue.cpp index c90c17b7d..6df35961f 100644 --- a/src/gui/info_menue.cpp +++ b/src/gui/info_menue.cpp @@ -40,6 +40,9 @@ #include #include +#include "gui/cam_menu.h" + +extern CCAMMenuHandler * g_CamHandler; CInfoMenu::CInfoMenu() { @@ -83,6 +86,12 @@ int CInfoMenu::showMenu() mf->setHint(NEUTRINO_ICON_HINT_STREAMINFO, LOCALE_MENU_HINT_STREAMINFO); info->addItem(mf); + if (g_settings.easymenu) { + mf = new CMenuForwarder(LOCALE_CI_SETTINGS, true, NULL, g_CamHandler, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); + mf->setHint(NEUTRINO_ICON_HINT_CI, LOCALE_MENU_HINT_CI); + info->addItem(mf); + } + int res = info->exec(NULL, ""); delete info; return res; diff --git a/src/gui/mediaplayer.cpp b/src/gui/mediaplayer.cpp index 6ff2edbd7..75c72d334 100644 --- a/src/gui/mediaplayer.cpp +++ b/src/gui/mediaplayer.cpp @@ -157,14 +157,14 @@ 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:CRCInput::RC_red; - const char* audio_btn = usage_mode == MODE_AUDIO ? "" : NEUTRINO_ICON_BUTTON_RED; + neutrino_msg_t audio_rc = usage_mode == MODE_AUDIO ? CRCInput::RC_audio : g_settings.easymenu ? CRCInput::RC_green : CRCInput::RC_red; + const char* audio_btn = usage_mode == MODE_AUDIO ? "" : g_settings.easymenu ? NEUTRINO_ICON_BUTTON_GREEN: NEUTRINO_ICON_BUTTON_RED; fw_audio = new CMenuForwarder(LOCALE_MAINMENU_AUDIOPLAYER, true, NULL, this, "audioplayer", audio_rc, audio_btn); 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 : CRCInput::RC_green; - const char* inet_btn = usage_mode == MODE_AUDIO ? "" : NEUTRINO_ICON_BUTTON_GREEN; + neutrino_msg_t inet_rc = usage_mode == MODE_AUDIO ? CRCInput::RC_www : g_settings.easymenu ? CRCInput::RC_blue : CRCInput::RC_green; + const char* inet_btn = usage_mode == MODE_AUDIO ? "" : g_settings.easymenu ? NEUTRINO_ICON_BUTTON_BLUE : NEUTRINO_ICON_BUTTON_GREEN; fw_inet = new CMenuForwarder(LOCALE_INETRADIO_NAME, true, NULL, this, "inetplayer", inet_rc, inet_btn); fw_inet->setHint(NEUTRINO_ICON_HINT_INET_RADIO, LOCALE_MENU_HINT_INET_RADIO); } @@ -175,19 +175,27 @@ 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); - fw_mp = new CMenuForwarder(LOCALE_MAINMENU_MOVIEPLAYER, true, NULL, moviePlayer, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); + if (g_settings.easymenu) + fw_mp = new CMenuForwarder(LOCALE_MAINMENU_MOVIEPLAYER, true, NULL, moviePlayer, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED); + else + fw_mp = new CMenuForwarder(LOCALE_MAINMENU_MOVIEPLAYER, true, NULL, moviePlayer, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); fw_mp->setHint(NEUTRINO_ICON_HINT_MOVIE, LOCALE_MENU_HINT_MOVIE); } //pictureviewer pictureviewergui = new CPictureViewerGui(); - fw_pviewer = new CMenuForwarder(LOCALE_MAINMENU_PICTUREVIEWER, true, NULL, pictureviewergui, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); + if (g_settings.easymenu) + fw_pviewer = new CMenuForwarder(LOCALE_MAINMENU_PICTUREVIEWER, true, NULL, pictureviewergui, NULL, CRCInput::RC_1, NEUTRINO_ICON_BUTTON_1); + else + fw_pviewer = new CMenuForwarder(LOCALE_MAINMENU_PICTUREVIEWER, true, NULL, pictureviewergui, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); fw_pviewer->setHint(NEUTRINO_ICON_HINT_PICVIEW, LOCALE_MENU_HINT_PICVIEW); #if ENABLE_UPNP //upnp browser - if (!upnpbrowsergui) - upnpbrowsergui = new CUpnpBrowserGui(); - fw_upnp = new CMenuForwarder(LOCALE_UPNPBROWSER_HEAD, true, NULL, upnpbrowsergui, NULL, CRCInput::RC_0, NEUTRINO_ICON_BUTTON_0); + if (!g_settings.easymenu) { + if (!upnpbrowsergui) + upnpbrowsergui = new CUpnpBrowserGui(); + fw_upnp = new CMenuForwarder(LOCALE_UPNPBROWSER_HEAD, true, NULL, upnpbrowsergui, NULL, CRCInput::RC_0, NEUTRINO_ICON_BUTTON_0); + } #endif // media->addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, usage_mode == MODE_AUDIO ? CMenuWidget::BTN_TYPE_CANCEL : CMenuWidget::BTN_TYPE_BACK); } @@ -206,24 +214,43 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p) } else { - //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]); - - //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 (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, NEUTRINO_ICON_BUTTON_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]); + + //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]); + //upnp browser + personalize->addItem(media, fw_upnp, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_UPNP]); #endif + } } int res = menu_return::RETURN_NONE; @@ -253,8 +280,6 @@ void CMediaPlayerMenu::showMoviePlayer(CMenuWidget *moviePlayer, CPersonalizeGui fw_mbrowser->setHint(NEUTRINO_ICON_HINT_MB, LOCALE_MENU_HINT_MB); CMenuForwarder *fw_file = new CMenuForwarder(LOCALE_MOVIEPLAYER_FILEPLAYBACK, true, NULL, &CMoviePlayerGui::getInstance(), "fileplayback", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); fw_file->setHint(NEUTRINO_ICON_HINT_FILEPLAY, LOCALE_MENU_HINT_FILEPLAY); - CMenuForwarder *fw_yt = new CMenuForwarder(LOCALE_MOVIEPLAYER_YTPLAYBACK, true, NULL, &CMoviePlayerGui::getInstance(), "ytplayback", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); - fw_yt->setHint(NEUTRINO_ICON_HINT_YTPLAY, LOCALE_MENU_HINT_YTPLAY); p->addIntroItems(moviePlayer); @@ -264,7 +289,11 @@ void CMediaPlayerMenu::showMoviePlayer(CMenuWidget *moviePlayer, CPersonalizeGui //fileplayback p->addItem(moviePlayer, fw_file, &g_settings.personalize[SNeutrinoSettings::P_MPLAYER_FILEPLAY]); //ytplayback - p->addItem(moviePlayer, fw_yt, &g_settings.personalize[SNeutrinoSettings::P_MPLAYER_YTPLAY]); + if (!g_settings.easymenu) { + CMenuForwarder *fw_yt = new CMenuForwarder(LOCALE_MOVIEPLAYER_YTPLAYBACK, true, NULL, &CMoviePlayerGui::getInstance(), "ytplayback", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_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 ecccd6c04..60d24aa7f 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -58,6 +58,7 @@ //#define ONE_KEY_PLUGIN extern CPlugins * g_PluginList; +extern cVideo *videoDecoder; CMiscMenue::CMiscMenue() { @@ -125,6 +126,14 @@ int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey) ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, str, CMessageBox::mbrBack, CMessageBox::mbBack); return menu_return::RETURN_REPAINT; } + else if(actionKey == "energy") + { + return showMiscSettingsMenuEnergy(); + } + else if(actionKey == "channellist") + { + return showMiscSettingsMenuChanlist(); + } return showMiscSettingsMenu(); } @@ -212,9 +221,7 @@ int CMiscMenue::showMiscSettingsMenu() //energy, shutdown if(cs_get_revision() > 7) { - CMenuWidget *misc_menue_energy = new CMenuWidget(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_MISCSETUP_ENERGY); - showMiscSettingsMenuEnergy(misc_menue_energy); - mf = new CMenuDForwarder(LOCALE_MISCSETTINGS_ENERGY, true, NULL, misc_menue_energy, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); + mf = new CMenuForwarder(LOCALE_MISCSETTINGS_ENERGY, true, NULL, this, "energy", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); mf->setHint("", LOCALE_MENU_HINT_MISC_ENERGY); misc_menue.addItem(mf); } @@ -242,9 +249,7 @@ int CMiscMenue::showMiscSettingsMenu() misc_menue.addItem(mf); //channellist - CMenuWidget misc_menue_chanlist(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_MISCSETUP_CHANNELLIST); - showMiscSettingsMenuChanlist(&misc_menue_chanlist); - mf = new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, &misc_menue_chanlist, NULL, CRCInput::RC_2); + mf = new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, this, "channellist", CRCInput::RC_2); mf->setHint("", LOCALE_MENU_HINT_MISC_CHANNELLIST); misc_menue.addItem(mf); @@ -264,8 +269,10 @@ int CMiscMenue::showMiscSettingsMenu() int res = misc_menue.exec(NULL, ""); delete fanNotifier; delete sectionsdConfigNotifier; +#if 0 if(cs_get_revision() > 7) delete miscNotifier; +#endif delete miscEpgNotifier; return res; } @@ -308,9 +315,17 @@ void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general) #endif /*ONE_KEY_PLUGIN*/ } -//energy and shutdown settings -void CMiscMenue::showMiscSettingsMenuEnergy(CMenuWidget *ms_energy) +#define VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT 2 +const CMenuOptionChooser::keyval VIDEOMENU_HDMI_CEC_MODE_OPTIONS[VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT] = { + { VIDEO_HDMI_CEC_MODE_OFF , LOCALE_OPTIONS_OFF }, + { VIDEO_HDMI_CEC_MODE_TUNER , LOCALE_OPTIONS_ON } +}; + +//energy and shutdown settings +int CMiscMenue::showMiscSettingsMenuEnergy() +{ + CMenuWidget *ms_energy = new CMenuWidget(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_MISCSETUP_ENERGY); ms_energy->addIntroItems(LOCALE_MISCSETTINGS_ENERGY); CMenuOptionChooser *m1 = new CMenuOptionChooser(LOCALE_MISCSETTINGS_SHUTDOWN_REAL_RCDELAY, &g_settings.shutdown_real_rcdelay, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, !g_settings.shutdown_real); @@ -319,8 +334,8 @@ void CMiscMenue::showMiscSettingsMenuEnergy(CMenuWidget *ms_energy) CStringInput * miscSettings_shutdown_count = new CStringInput(LOCALE_MISCSETTINGS_SHUTDOWN_COUNT, g_settings.shutdown_count, 3, LOCALE_MISCSETTINGS_SHUTDOWN_COUNT_HINT1, LOCALE_MISCSETTINGS_SHUTDOWN_COUNT_HINT2, "0123456789 "); CMenuForwarder *m2 = new CMenuDForwarder(LOCALE_MISCSETTINGS_SHUTDOWN_COUNT, !g_settings.shutdown_real, g_settings.shutdown_count, miscSettings_shutdown_count); m2->setHint("", LOCALE_MENU_HINT_SHUTDOWN_COUNT); - - miscNotifier = new COnOffNotifier(1); + + COnOffNotifier * miscNotifier = new COnOffNotifier(1); miscNotifier->addItem(m1); miscNotifier->addItem(m2); @@ -338,6 +353,17 @@ void CMiscMenue::showMiscSettingsMenuEnergy(CMenuWidget *ms_energy) CMenuOptionChooser * m4 = new CMenuOptionChooser(LOCALE_MISCSETTINGS_SLEEPTIMER_MIN, &g_settings.sleeptimer_min, SLEEPTIMER_MIN_OPTIONS, SLEEPTIMER_MIN_OPTION_COUNT, true); 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, ""); + delete ms_energy; + delete miscNotifier; + return res; } //EPG settings @@ -412,8 +438,9 @@ void CMiscMenue::showMiscSettingsMenuFBrowser(CMenuWidget *ms_fbrowser) } //channellist -void CMiscMenue::showMiscSettingsMenuChanlist(CMenuWidget *ms_chanlist) +int CMiscMenue::showMiscSettingsMenuChanlist() { + CMenuWidget * ms_chanlist = new CMenuWidget(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_MISCSETUP_CHANNELLIST); ms_chanlist->addIntroItems(LOCALE_MISCSETTINGS_CHANNELLIST); CMenuOptionChooser * mc; @@ -444,6 +471,9 @@ void CMiscMenue::showMiscSettingsMenuChanlist(CMenuWidget *ms_chanlist) mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_NUMERIC_ADJUST, &g_settings.channellist_numeric_adjust, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); mc->setHint("", LOCALE_MENU_HINT_NUMERIC_ADJUST); ms_chanlist->addItem(mc); + int res = ms_chanlist->exec(NULL, ""); + delete ms_chanlist; + return res; } #ifdef CPU_FREQ @@ -457,3 +487,23 @@ void CMiscMenue::showMiscSettingsMenuCPUFreq(CMenuWidget *ms_cpu) ms_cpu->addItem(new CMenuOptionChooser(LOCALE_CPU_FREQ_STANDBY, &g_settings.standby_cpufreq, CPU_FREQ_OPTIONS, CPU_FREQ_OPTION_COUNT, true)); } #endif /*CPU_FREQ*/ + +bool CMiscMenue::changeNotify(const neutrino_locale_t OptionName, void * /*data*/) +{ + if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_HDMI_CEC)) + { + printf("[neutrino CEC Settings] %s set CEC settings...\n", __FUNCTION__); + g_settings.hdmi_cec_standby = 0; + g_settings.hdmi_cec_view_on = 0; + if (g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF) { + g_settings.hdmi_cec_standby = 1; + g_settings.hdmi_cec_view_on = 1; + g_settings.hdmi_cec_mode = VIDEO_HDMI_CEC_MODE_TUNER; + } + videoDecoder->SetCECAutoStandby(g_settings.hdmi_cec_standby == 1); + videoDecoder->SetCECAutoView(g_settings.hdmi_cec_view_on == 1); + videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode); + } + + return false; +} diff --git a/src/gui/miscsettings_menu.h b/src/gui/miscsettings_menu.h index d9c0269fb..66afe0796 100644 --- a/src/gui/miscsettings_menu.h +++ b/src/gui/miscsettings_menu.h @@ -35,21 +35,21 @@ //#define CPU_FREQ -class CMiscMenue : public CMenuTarget +class CMiscMenue : public CMenuTarget, CChangeObserver { private: CFanControlNotifier *fanNotifier; CSectionsdConfigNotifier* sectionsdConfigNotifier; - COnOffNotifier* miscNotifier; + //COnOffNotifier* miscNotifier; COnOffNotifier* miscEpgNotifier; int width; int showMiscSettingsMenu(); void showMiscSettingsMenuGeneral(CMenuWidget *ms_general); - void showMiscSettingsMenuEnergy(CMenuWidget *ms_energy); void showMiscSettingsMenuEpg(CMenuWidget *ms_epg); void showMiscSettingsMenuFBrowser(CMenuWidget *ms_fbrowser); - void showMiscSettingsMenuChanlist(CMenuWidget *ms_chanlist); + int showMiscSettingsMenuEnergy(); + int showMiscSettingsMenuChanlist(); #ifdef CPU_FREQ void showMiscSettingsMenuCPUFreq(CMenuWidget *ms_cpu); #endif /*CPU_FREQ*/ @@ -57,8 +57,7 @@ class CMiscMenue : public CMenuTarget CMiscMenue(); ~CMiscMenue(); int exec(CMenuTarget* parent, const std::string & actionKey); - + bool changeNotify(const neutrino_locale_t OptionName, void * /*data*/); }; - #endif diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp index 13d81ea53..ff844511a 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -306,10 +306,10 @@ int CNetworkSetup::showNetworkSetup() //------------------------------------------------ networkSettings->addItem( m4); //gateway networkSettings->addItem( m5); //nameserver - networkSettings->addItem(GenericMenuSeparatorLine); //------------------------------------------------ if(ifcount > 1) // if there is only one, its probably wired { + networkSettings->addItem(GenericMenuSeparatorLine); //ssid CStringInputSMS * networkSettings_ssid = new CStringInputSMS(LOCALE_NETWORKMENU_SSID, &network_ssid, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789 -_/()<>=+.,:!?\\'"); //key @@ -325,38 +325,45 @@ int CNetworkSetup::showNetworkSetup() networkSettings->addItem( m9); //ssid networkSettings->addItem( m10); //key - networkSettings->addItem(GenericMenuSeparatorLine); + if (!g_settings.easymenu) + networkSettings->addItem(GenericMenuSeparatorLine); } //------------------------------------------------ - //ntp submenu - sectionsdConfigNotifier = new CSectionsdConfigNotifier; + sectionsdConfigNotifier = NULL; CMenuWidget ntp(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_NETWORKSETUP_NTP); - mf = new CMenuForwarder(LOCALE_NETWORKMENU_NTPTITLE, true, NULL, &ntp, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); - mf->setHint("", LOCALE_MENU_HINT_NET_NTP); - networkSettings->addItem(mf); +#ifdef ENABLE_GUI_MOUNT + CMenuWidget networkmounts(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_NETWORKSETUP_MOUNTS); +#endif + CProxySetup proxy(LOCALE_MAINSETTINGS_NETWORK); + CNetworkServiceSetup services; - showNetworkNTPSetup(&ntp); + if (!g_settings.easymenu) { + //ntp submenu + sectionsdConfigNotifier = new CSectionsdConfigNotifier; + mf = new CMenuForwarder(LOCALE_NETWORKMENU_NTPTITLE, true, NULL, &ntp, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); + mf->setHint("", LOCALE_MENU_HINT_NET_NTP); + networkSettings->addItem(mf); + + showNetworkNTPSetup(&ntp); #ifdef ENABLE_GUI_MOUNT - //nfs mount submenu - CMenuWidget networkmounts(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_NETWORKSETUP_MOUNTS); - mf = new CMenuForwarder(LOCALE_NETWORKMENU_MOUNT, true, NULL, &networkmounts, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_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, NEUTRINO_ICON_BUTTON_BLUE); + mf->setHint("", LOCALE_MENU_HINT_NET_MOUNT); + networkSettings->addItem(mf); + showNetworkNFSMounts(&networkmounts); #endif - //proxyserver submenu - CProxySetup proxy(LOCALE_MAINSETTINGS_NETWORK); - mf = new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYSERVER_SEP, true, NULL, &proxy, NULL, CRCInput::RC_0, NEUTRINO_ICON_BUTTON_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, NEUTRINO_ICON_BUTTON_0); + mf->setHint("", LOCALE_MENU_HINT_NET_PROXY); + networkSettings->addItem(mf); - //services - CNetworkServiceSetup services; - mf = new CMenuForwarder(LOCALE_NETWORKMENU_SERVICES, true, NULL, &services, NULL, CRCInput::RC_1, NEUTRINO_ICON_BUTTON_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, NEUTRINO_ICON_BUTTON_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 5260fbd97..fba9290d0 100644 --- a/src/gui/parentallock_setup.cpp +++ b/src/gui/parentallock_setup.cpp @@ -59,7 +59,7 @@ int CParentalSetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/) parent->hide(); if (check()) - showParentalSetup(); + res = showParentalSetup(); return res; } @@ -97,7 +97,7 @@ const CMenuOptionChooser::keyval PARENTALLOCK_DEFAULTLOCKED_OPTIONS[PARENTALLOCK }; extern bool parentallocked; -void CParentalSetup::showParentalSetup() +int CParentalSetup::showParentalSetup() { //menue init CMenuWidget* plock = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_LOCK, width, MN_WIDGET_ID_PLOCKSETUP); @@ -108,22 +108,38 @@ void CParentalSetup::showParentalSetup() // intros plock->addIntroItems(); + CPersonalizeGui &p = CNeutrinoApp::getInstance()->getPersonalizeGui(); + CMenuForwarder * mf = new CMenuForwarder(LOCALE_PARENTALLOCK_MENU, true, NULL, &p, NULL, CRCInput::RC_red , NEUTRINO_ICON_BUTTON_RED); + mf->setHint("", LOCALE_MENU_HINT_PARENTALLOCK_MENU); + plock->addItem(mf); + CMenuOptionChooser * mc; - mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_PROMPT , &g_settings.parentallock_prompt , PARENTALLOCK_PROMPT_OPTIONS, PARENTALLOCK_PROMPT_OPTION_COUNT , !parentallocked); + 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, NEUTRINO_ICON_BUTTON_GREEN); + else + 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); - mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_LOCKAGE, &g_settings.parentallock_lockage, PARENTALLOCK_LOCKAGE_OPTIONS, PARENTALLOCK_LOCKAGE_OPTION_COUNT, !parentallocked); + 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, NEUTRINO_ICON_BUTTON_YELLOW); + else + 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); - plock->addItem(new CMenuOptionChooser(LOCALE_PARENTALLOCK_BOUQUETMODE, &g_settings.parentallock_defaultlocked, PARENTALLOCK_DEFAULTLOCKED_OPTIONS, PARENTALLOCK_DEFAULTLOCKED_OPTION_COUNT, !parentallocked)); + 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, NEUTRINO_ICON_BUTTON_BLUE); + else + mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_BOUQUETMODE, &g_settings.parentallock_defaultlocked, PARENTALLOCK_DEFAULTLOCKED_OPTIONS, PARENTALLOCK_DEFAULTLOCKED_OPTION_COUNT, !parentallocked); + plock->addItem(mc); CPINChangeWidget pinChangeWidget(LOCALE_PARENTALLOCK_CHANGEPIN, g_settings.parentallock_pincode, 4, LOCALE_PARENTALLOCK_CHANGEPIN_HINT1); - CMenuForwarder * mf = new CMenuForwarder(LOCALE_PARENTALLOCK_CHANGEPIN, true, g_settings.parentallock_pincode, &pinChangeWidget); + mf = new CMenuForwarder(LOCALE_PARENTALLOCK_CHANGEPIN, true, g_settings.parentallock_pincode, &pinChangeWidget); mf->setHint("", LOCALE_MENU_HINT_PARENTALLOCK_CHANGEPIN); plock->addItem(mf); - plock->exec(NULL, ""); + int res = plock->exec(NULL, ""); delete plock; + return res; } diff --git a/src/gui/parentallock_setup.h b/src/gui/parentallock_setup.h index fde2310ed..d2e102782 100644 --- a/src/gui/parentallock_setup.h +++ b/src/gui/parentallock_setup.h @@ -44,7 +44,7 @@ class CParentalSetup : public CMenuTarget, public CPINProtection { private: int width; - void showParentalSetup(); + int showParentalSetup(); protected: virtual CMenuTarget* getParent() { return( NULL);}; @@ -58,6 +58,7 @@ class CParentalSetup : public CMenuTarget, public CPINProtection }; ~CParentalSetup(); int exec(CMenuTarget* parent, const std::string & actionKey); + bool checkPin() { return check(); } }; diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp index 4cebbb484..a7a112988 100644 --- a/src/gui/personalize.cpp +++ b/src/gui/personalize.cpp @@ -256,7 +256,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 ( is_pin_protected || hasPinItems()){ + if (!g_settings.easymenu && (is_pin_protected || hasPinItems())) { setHint(LOCALE_PERSONALIZE_PINHINT); //from CPINProtection if (check()) is_pin_protected = false; @@ -283,13 +283,45 @@ int CPersonalizeGui::ShowPersonalizationMenu() { width = w_max (40, 10); - CMenuWidget* pMenu = new CMenuWidget(LOCALE_PERSONALIZE_HEAD, NEUTRINO_ICON_PERSONALIZE, width, MN_WIDGET_ID_PERSONALIZE); + CMenuWidget* pMenu = new CMenuWidget(g_settings.easymenu ? LOCALE_PARENTALLOCK_MENU : LOCALE_PERSONALIZE_HEAD, NEUTRINO_ICON_PERSONALIZE, width, MN_WIDGET_ID_PERSONALIZE); pMenu->addIntroItems(NONEXISTANT_LOCALE, LOCALE_PERSONALIZE_ACCESS); //pin CPINChangeWidget *pinChangeWidget = NULL; - if (show_pin_setup) + if (!g_settings.easymenu && show_pin_setup) ShowPinSetup(pMenu, pinChangeWidget); + printf("CPersonalizeGui::ShowPinSetup: pinChangeWidget %x\n", pinChangeWidget); + + int res; + if (g_settings.easymenu) { + int count = 0; + for (uint j = 0; jgetName().c_str()); + //pin protected items only + if (v_item[j].item_mode == PERSONALIZE_SHOW_AS_ACCESS_OPTION) + { + const char* icon = (count == 0) ? NEUTRINO_ICON_BUTTON_RED : + (count == 1) ? NEUTRINO_ICON_BUTTON_GREEN : + (count == 2) ? NEUTRINO_ICON_BUTTON_YELLOW : + (count == 3) ? NEUTRINO_ICON_BUTTON_BLUE : NULL; + 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 : NULL; + 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, icon)); + } + } + res = pMenu->exec(NULL, ""); + delete pMenu; + delete pinChangeWidget; + return res; + } //personalized menues CMenuForwarderNonLocalized *p_mn[widget_count]; @@ -322,7 +354,7 @@ int CPersonalizeGui::ShowPersonalizationMenu() pMenu->addItem(GenericMenuSeparatorLine); pMenu->addItem(new CMenuForwarder(LOCALE_PERSONALIZE_HELP, true, NULL, this, "personalize_help", CRCInput::RC_help, NEUTRINO_ICON_BUTTON_HELP)); - int res = pMenu->exec(NULL, ""); + res = pMenu->exec(NULL, ""); delete pMenu; delete uMenu; delete pinChangeWidget; @@ -446,7 +478,7 @@ void CPersonalizeGui::ShowPluginMenu(CMenuWidget* p_widget) int CPersonalizeGui::ShowMenuOptions(const int& widget) { string mn_name = v_widget[widget]->getName(); - printf("[neutrino-personalize] exec %s...\n", __FUNCTION__); + printf("[neutrino-personalize] exec %s for [%s]...\n", __FUNCTION__, mn_name.c_str()); mn_widget_id_t w_index = widget+MN_WIDGET_ID_PERSONALIZE_MAIN; CMenuWidget* pm = new CMenuWidget(LOCALE_PERSONALIZE_HEAD, NEUTRINO_ICON_PERSONALIZE, width, w_index); @@ -597,24 +629,31 @@ void CPersonalizeGui::ShowHelpPersonalize() helpbox.show(LOCALE_PERSONALIZE_HELP); } +void CPersonalizeGui::ApplySettings() +{ + // replace old settings with new settings + for (uint i = 0; i < v_int_settings.size(); i++) + v_int_settings[i].old_val = *v_int_settings[i].p_val; + for (int i = 0; i<(widget_count); i++) + v_widget[i]->resetWidget(); + + addPersonalizedItems(); +} + void CPersonalizeGui::SaveAndExit() { // Save the settings and left menu, if user wants to! if (haveChangedSettings()) { + if (g_settings.easymenu) { + ApplySettings(); + return; + } if (ShowMsgUTF(LOCALE_PERSONALIZE_HEAD, g_Locale->getText(LOCALE_PERSONALIZE_APPLY_SETTINGS), CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_QUESTION) == CMessageBox::mbrYes) { CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_MAINSETTINGS_SAVESETTINGSNOW_HINT)); // UTF-8 hintBox.paint(); - // replace old settings with new settings - for (uint i = 0; i < v_int_settings.size(); i++) - v_int_settings[i].old_val = *v_int_settings[i].p_val; - //CNeutrinoApp::getInstance()->saveSetup(); - - for (int i = 0; i<(widget_count); i++) - v_widget[i]->resetWidget(); - - addPersonalizedItems(); + ApplySettings(); hintBox.hide(); } else @@ -803,7 +842,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 (in_pinmode && !use_pin) + if (!g_settings.easymenu && (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; @@ -811,7 +850,9 @@ 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.personalize_pincode, use_pin, fw->active, NULL, fw->getTarget(), fw->getActionKey().c_str(), d_key, fw->iconName.c_str(), lock_icon); + v_item[i].menuItem = new CLockedMenuForwarder(fw->getTextLocale(), + g_settings.easymenu ? g_settings.parentallock_pincode : g_settings.personalize_pincode, + use_pin, fw->active, NULL, fw->getTarget(), fw->getActionKey().c_str(), d_key, fw->iconName.c_str(), lock_icon); v_item[i].menuItem->hintIcon = fw->hintIcon; v_item[i].menuItem->hint = fw->hint; //add item if it's set to visible or pin protected and allow to add an forwarder as next diff --git a/src/gui/personalize.h b/src/gui/personalize.h index 9b6a452c4..fe34339c4 100644 --- a/src/gui/personalize.h +++ b/src/gui/personalize.h @@ -169,6 +169,7 @@ class CPersonalizeGui : public CMenuTarget, public CChangeObserver, public CPINP void ShowPluginMenu(CMenuWidget* p_widget); void ShowPreverredKeySetup(CMenuWidget* p_widget); void SaveAndExit(); + void ApplySettings(); bool hasPinItems(); diff --git a/src/gui/record_setup.cpp b/src/gui/record_setup.cpp index bec04b041..125ea8ec5 100644 --- a/src/gui/record_setup.cpp +++ b/src/gui/record_setup.cpp @@ -173,19 +173,46 @@ int CRecordSetup::showRecordSetup() //menue init CMenuWidget* recordingSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_RECORDSETUP); - //apply settings recordingSettings->addIntroItems(LOCALE_MAINSETTINGS_RECORDING); +#if 0 + //apply settings mf = new CMenuForwarder(LOCALE_RECORDINGMENU_SETUPNOW, true, NULL, this, "recording", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED); mf->setHint("", LOCALE_MENU_HINT_RECORD_APPLY); recordingSettings->addItem(mf); recordingSettings->addItem(GenericMenuSeparatorLine); +#endif + CMenuWidget recordingTsSettings(LOCALE_MAINSETTINGS_RECORDING, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_RECORDSETUP_TIMESHIFT); + showRecordTimeShiftSetup(&recordingTsSettings); + + 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, NEUTRINO_ICON_BUTTON_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, NEUTRINO_ICON_BUTTON_GREEN); + mf->setHint("", LOCALE_MENU_HINT_RECORD_TIMER); + recordingSettings->addItem(mf); + } //record dir - CMenuForwarder* fRecDir = new CMenuForwarder(LOCALE_RECORDINGMENU_DEFDIR, true, g_settings.network_nfs_recordingdir, this, "recordingdir"); + CMenuForwarder* fRecDir; + if (g_settings.easymenu) + fRecDir = new CMenuForwarder(LOCALE_RECORDINGMENU_DEFDIR, true, g_settings.network_nfs_recordingdir, this, "recordingdir", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); + else + fRecDir = new CMenuForwarder(LOCALE_RECORDINGMENU_DEFDIR, true, g_settings.network_nfs_recordingdir, this, "recordingdir"); fRecDir->setHint("", LOCALE_MENU_HINT_RECORD_DIR); recordingSettings->addItem(fRecDir); - CMenuOptionChooser* 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); + 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); + 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, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); channel_rec_dir->setHint("", LOCALE_MENU_HINT_RECORD_CHANDIR); recordingSettings->addItem(channel_rec_dir); @@ -199,45 +226,52 @@ int CRecordSetup::showRecordSetup() end_of_recording->setHint("", LOCALE_MENU_HINT_RECORD_END); recordingSettings->addItem(end_of_recording); - 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); + 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); + } //template //CStringInput recordingSettings_filenameTemplate(LOCALE_RECORDINGMENU_FILENAME_TEMPLATE, &g_settings.recording_filename_template[0], 21, LOCALE_RECORDINGMENU_FILENAME_TEMPLATE_HINT, LOCALE_IPSETUP_HINT_2, "%/-_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 "); //CMenuForwarder* mf11 = new CMenuForwarder(LOCALE_RECORDINGMENU_FILENAME_TEMPLATE, true, g_settings.recording_filename_template[0], &recordingSettings_filenameTemplate); recordingSettings->addItem(GenericMenuSeparatorLine); - //timeshift - CMenuWidget recordingTsSettings(LOCALE_MAINSETTINGS_RECORDING, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_RECORDSETUP_TIMESHIFT); - showRecordTimeShiftSetup(&recordingTsSettings); - mf = new CMenuForwarder(LOCALE_RECORDINGMENU_TIMESHIFT, true, NULL, &recordingTsSettings, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); - mf->setHint("", LOCALE_MENU_HINT_RECORD_TIMESHIFT); - recordingSettings->addItem(mf); + if (!g_settings.easymenu) { + //timeshift + mf = new CMenuForwarder(LOCALE_RECORDINGMENU_TIMESHIFT, true, NULL, &recordingTsSettings, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); + mf->setHint("", LOCALE_MENU_HINT_RECORD_TIMESHIFT); + recordingSettings->addItem(mf); - //timersettings - CMenuWidget recordingTimerSettings(LOCALE_MAINSETTINGS_RECORDING, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_RECORDSETUP_TIMERSETTINGS); - showRecordTimerSetup(&recordingTimerSettings); - mf = new CMenuForwarder(LOCALE_TIMERSETTINGS_SEPARATOR, true, NULL, &recordingTimerSettings, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_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, NEUTRINO_ICON_BUTTON_YELLOW); + mf->setHint("", LOCALE_MENU_HINT_RECORD_TIMER); + recordingSettings->addItem(mf); + } - //audiosettings CMenuWidget recordingaAudioSettings(LOCALE_MAINSETTINGS_RECORDING, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_RECORDSETUP_AUDIOSETTINGS); - showRecordAudioSetup(&recordingaAudioSettings); - mf = new CMenuForwarder(LOCALE_RECORDINGMENU_APIDS, true, NULL, &recordingaAudioSettings, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); - mf->setHint("", LOCALE_MENU_HINT_RECORD_APIDS); - recordingSettings->addItem(mf); - - //datasettings CMenuWidget recordingaDataSettings(LOCALE_MAINSETTINGS_RECORDING, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_RECORDSETUP_DATASETTINGS); - showRecordDataSetup(&recordingaDataSettings); - mf = new CMenuForwarder(LOCALE_RECORDINGMENU_DATA_PIDS, true, NULL, &recordingaDataSettings, NULL, CRCInput::RC_1); - mf->setHint("", LOCALE_MENU_HINT_RECORD_DATA); - recordingSettings->addItem(mf); + if (!g_settings.easymenu) { + //audiosettings + showRecordAudioSetup(&recordingaAudioSettings); + mf = new CMenuForwarder(LOCALE_RECORDINGMENU_APIDS, true, NULL, &recordingaAudioSettings, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_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_1); + mf->setHint("", LOCALE_MENU_HINT_RECORD_DATA); + recordingSettings->addItem(mf); + } int res = recordingSettings->exec(NULL, ""); delete recordingSettings; + + /* activate changes */ + CRecordManager::getInstance()->SetDirectory(g_settings.network_nfs_recordingdir); + CRecordManager::getInstance()->Config(g_settings.recording_stopsectionsd, g_settings.recording_stream_vtxt_pid, g_settings.recording_stream_pmt_pid, g_settings.recording_stream_subtitle_pids); + return res; } diff --git a/src/gui/settings_manager.cpp b/src/gui/settings_manager.cpp index 3f938dd55..9bb0d2bf5 100644 --- a/src/gui/settings_manager.cpp +++ b/src/gui/settings_manager.cpp @@ -146,33 +146,51 @@ int CSettingsManager::showMenu() CMenuWidget * mset = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_SETTINGS_MNGR); mset->addIntroItems(LOCALE_MAINSETTINGS_MANAGE); - CMenuForwarder * mf = new CMenuForwarder(LOCALE_RESET_SETTINGS, true, NULL, resetNotifier, "settings", CRCInput::RC_recall); + CMenuForwarder * mf; + if (g_settings.easymenu) + mf = new CMenuForwarder(LOCALE_RESET_SETTINGS, true, NULL, resetNotifier, "settings", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED); + else + 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); - mset->addItem(GenericMenuSeparatorLine); + if (!g_settings.easymenu) { + mset->addItem(GenericMenuSeparatorLine); - mf = new CMenuForwarder(LOCALE_EXTRA_SAVECONFIG, true, NULL, this, "saveconfig", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_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, NEUTRINO_ICON_BUTTON_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, NEUTRINO_ICON_BUTTON_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, NEUTRINO_ICON_BUTTON_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, NEUTRINO_ICON_BUTTON_GREEN); + else + mf = new CMenuForwarder(LOCALE_SETTINGS_BACKUP, true, NULL, this, "backup", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); - mf = new CMenuForwarder(LOCALE_SETTINGS_BACKUP, true, NULL, this, "backup", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); mf->setHint(NEUTRINO_ICON_HINT_BACKUP, LOCALE_MENU_HINT_BACKUP); mset->addItem(mf); - mf = new CMenuForwarder(LOCALE_SETTINGS_RESTORE, true, NULL, this, "restore", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); + if (g_settings.easymenu) + mf = new CMenuForwarder(LOCALE_SETTINGS_RESTORE, true, NULL, this, "restore", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); + else + mf = new CMenuForwarder(LOCALE_SETTINGS_RESTORE, true, NULL, this, "restore", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); + mf->setHint(NEUTRINO_ICON_HINT_RESTORE, LOCALE_MENU_HINT_RESTORE); mset->addItem(mf); - mset->addItem(GenericMenuSeparatorLine); - - mf = new CMenuForwarder(LOCALE_RESET_ALL, true, NULL, resetNotifier, "all", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER); + if (g_settings.easymenu) { + mf = new CMenuForwarder(LOCALE_RESET_ALL, true, NULL, resetNotifier, "all", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); + } else { + mset->addItem(GenericMenuSeparatorLine); + mf = new CMenuForwarder(LOCALE_RESET_ALL, true, NULL, resetNotifier, "all", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER); + } 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 4100ed542..60ced329c 100644 --- a/src/gui/start_wizard.cpp +++ b/src/gui/start_wizard.cpp @@ -112,7 +112,7 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/) res = g_videoSettings->exec(NULL, ""); g_videoSettings->setWizardMode(CVideoSettings::V_SETUP_MODE_WIZARD_NO); } - if(advanced && res != menu_return::RETURN_EXIT_ALL) + if(!g_settings.easymenu && advanced && res != menu_return::RETURN_EXIT_ALL) { COsdSetup osdSettings(COsdSetup::OSD_SETUP_MODE_WIZARD); res = osdSettings.exec(NULL, ""); diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index 5a8b89623..7f072c6ef 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -269,24 +269,28 @@ int CVideoSettings::showVideoSetup() CMenuOptionChooser * vs_videomodes_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_VIDEOMODE, &g_settings.video_Mode, VIDEOMENU_VIDEOMODE_OPTIONS, VIDEOMENU_VIDEOMODE_OPTION_COUNT, true, this, CRCInput::RC_nokey, "", true); vs_videomodes_ch->setHint("", LOCALE_MENU_HINT_VIDEO_MODE); - //dbdr options - CMenuOptionChooser * 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 + CMenuOptionChooser * vs_dbdropt_ch = NULL; + CMenuForwarder * vs_videomodes_fw = NULL; CMenuWidget videomodes(LOCALE_MAINSETTINGS_VIDEO, NEUTRINO_ICON_SETTINGS); - videomodes.addIntroItems(LOCALE_VIDEOMENU_ENABLED_MODES); - CAutoModeNotifier 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)); - //anotify.changeNotify(NONEXISTANT_LOCALE, 0); + 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); - CMenuForwarder * vs_videomodes_fw = new CMenuForwarder(LOCALE_VIDEOMENU_ENABLED_MODES, true, NULL, &videomodes, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED ); - vs_videomodes_fw->setHint("", LOCALE_MENU_HINT_VIDEO_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)); + //anotify.changeNotify(NONEXISTANT_LOCALE, 0); + + vs_videomodes_fw = new CMenuForwarder(LOCALE_VIDEOMENU_ENABLED_MODES, true, NULL, &videomodes, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED ); + vs_videomodes_fw->setHint("", LOCALE_MENU_HINT_VIDEO_MODES); + } //--------------------------------------- - videosetup->addIntroItems(LOCALE_MAINSETTINGS_VIDEO, LOCALE_VIDEOMENU_TV_SCART); + videosetup->addIntroItems(LOCALE_MAINSETTINGS_VIDEO /*, LOCALE_VIDEOMENU_TV_SCART*/); //--------------------------------------- //videosetup->addItem(vs_scart_sep); //separator scart if (vs_analg_ch != NULL) @@ -295,25 +299,29 @@ int CVideoSettings::showVideoSetup() videosetup->addItem(vs_scart_ch); //scart if (vs_chinch_ch != NULL) videosetup->addItem(vs_chinch_ch);//chinch - videosetup->addItem(GenericMenuSeparatorLine); + //videosetup->addItem(GenericMenuSeparatorLine); //--------------------------------------- videosetup->addItem(vs_43mode_ch); //4:3 mode videosetup->addItem(vs_dispformat_ch); //display format videosetup->addItem(vs_videomodes_ch); //video system - videosetup->addItem(vs_dbdropt_ch); //dbdr options - videosetup->addItem(vs_videomodes_fw); //video modes submenue + if (!g_settings.easymenu) { + videosetup->addItem(vs_dbdropt_ch); //dbdr options + videosetup->addItem(vs_videomodes_fw); //video modes submenue + } #ifdef BOXMODEL_APOLLO - /* 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); + 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); + } #endif #ifdef ENABLE_PIP CPipSetup pip; diff --git a/src/neutrino.cpp b/src/neutrino.cpp index d8958ebb8..f31ec5d17 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -90,6 +90,7 @@ #include "gui/widget/menue.h" #include "gui/widget/messagebox.h" #include "gui/infoclock.h" +#include "gui/parentallock_setup.h" #ifdef ENABLE_PIP #include "gui/pipsetup.h" #endif @@ -303,6 +304,12 @@ int CNeutrinoApp::loadSetup(const char * fname) parentallocked = true; checkParentallocked.close(); } + g_settings.easymenu = configfile.getInt32("easymenu", 0); + /* if file present and no config file found, force easy mode */ + if (erg && !access("/var/etc/.easymenu", F_OK)) + g_settings.easymenu = 1; + INFO("************************************************** g_settings.easymenu %d\n", g_settings.easymenu); + // video g_settings.video_Mode = configfile.getInt32("video_Mode", VIDEO_STD_1080I50); // VIDEO_STD_720P50 #ifdef ANALOG_MODE @@ -585,7 +592,8 @@ 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", TIMERD_APIDS_STD | TIMERD_APIDS_AC3); + 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_zap_on_announce = configfile.getBool("recording_zap_on_announce" , false); g_settings.shutdown_timer_record_type = configfile.getBool("shutdown_timer_record_type" , false); @@ -1204,6 +1212,7 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32("pip_width", g_settings.pip_width); configfile.setInt32("pip_height", g_settings.pip_height); #endif + configfile.setInt32("easymenu", g_settings.easymenu); if(strcmp(fname, NEUTRINO_SETTINGS_FILE)) configfile.saveConfig(fname); @@ -2063,6 +2072,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu) StopSubtitles(); if(g_settings.mode_clock) InfoClock->StopClock(); + int old_ttx = g_settings.cacheTXT; mainMenu.exec(NULL, ""); if(g_settings.mode_clock) InfoClock->StartClock(); @@ -2070,6 +2080,12 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu) saveSetup(NEUTRINO_SETTINGS_FILE); if (!g_settings.epg_scan) CEpgScan::getInstance()->Clear(); + if (old_ttx != g_settings.cacheTXT) { + if(g_settings.cacheTXT) { + tuxtxt_init(); + } else + tuxtxt_close(); + } } } else if (((msg == CRCInput::RC_tv) || (msg == CRCInput::RC_radio)) && (g_settings.key_tvradio_mode == (int)CRCInput::RC_nokey)) { @@ -2309,6 +2325,100 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu) } } +int CNeutrinoApp::showChannelList(const neutrino_msg_t _msg, bool from_menu) +{ + neutrino_msg_t msg = _msg; + if(g_settings.mode_clock) + InfoClock->StopClock(); + + StopSubtitles(); + +_show: + int nNewChannel = -1; + int old_b = bouquetList->getActiveBouquetNumber(); + t_channel_id old_id = 0; + if(!bouquetList->Bouquets.empty()) + old_id = bouquetList->Bouquets[bouquetList->getActiveBouquetNumber()]->channelList->getActiveChannel_ChannelID(); + //int old_mode = g_settings.channel_mode; + int old_mode = GetChannelMode(); + printf("************************* ZAP START: bouquetList %p size %d old_b %d\n", bouquetList, (int)bouquetList->Bouquets.size(), old_b);fflush(stdout); + +#if 0 + int old_num = 0; + if(!bouquetList->Bouquets.empty()) { + old_num = bouquetList->Bouquets[old_b]->channelList->getSelected(); + } +#endif + //_show: + if(msg == CRCInput::RC_ok) + { + if (g_settings.channellist_new_zap_mode > 0) /* allow or active */ + g_audioMute->enableMuteIcon(false); + if( !bouquetList->Bouquets.empty() && bouquetList->Bouquets[old_b]->channelList->getSize() > 0) + nNewChannel = bouquetList->Bouquets[old_b]->channelList->exec();//with ZAP! + else + nNewChannel = bouquetList->exec(true); + if (g_settings.channellist_new_zap_mode > 0) /* allow or active */ + g_audioMute->enableMuteIcon(true); + } else if(msg == CRCInput::RC_sat) { + SetChannelMode(LIST_MODE_SAT); + nNewChannel = bouquetList->exec(true); + } else if(msg == CRCInput::RC_favorites) { + SetChannelMode(LIST_MODE_FAV); + nNewChannel = bouquetList->exec(true); + } +_repeat: + CVFD::getInstance ()->showServicename(channelList->getActiveChannelName()); + CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); + printf("************************* ZAP RES: nNewChannel %d\n", nNewChannel);fflush(stdout); + if(nNewChannel == -1) { // restore orig. bouquet and selected channel on cancel + /* FIXME if mode was changed while browsing, + * other modes selected bouquet not restored */ + SetChannelMode(old_mode); + bouquetList->activateBouquet(old_b, false); +#if 0 + if(!bouquetList->Bouquets.empty()) + bouquetList->Bouquets[bouquetList->getActiveBouquetNumber()]->channelList->setSelected(old_num); +#endif + if(!bouquetList->Bouquets.empty()) { + bouquetList->Bouquets[bouquetList->getActiveBouquetNumber()]->channelList->adjustToChannelID(old_id, false); + } + StartSubtitles(mode == mode_tv); + } + else if(nNewChannel == -3) { // list mode changed + printf("************************* ZAP NEW MODE: bouquetList %p size %d\n", bouquetList, (int)bouquetList->Bouquets.size());fflush(stdout); + nNewChannel = bouquetList->exec(true); + goto _repeat; + } + //else if(nNewChannel == -4) + if(g_channel_list_changed) + { + /* don't change bouquet after adding a channel to favorites */ + if (nNewChannel != -5) + SetChannelMode(old_mode); + g_channel_list_changed = false; + if(old_b_id < 0) old_b_id = old_b; + //g_Zapit->saveBouquets(); + /* lets do it in sync */ + reloadhintBox->paint(); + CServiceManager::getInstance()->SaveServices(true, true); + g_bouquetManager->saveBouquets(); + g_bouquetManager->saveUBouquets(); + g_bouquetManager->renumServices(); + channelsInit(/*true*/); + t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID(); + channelList->adjustToChannelID(live_channel_id);//FIXME what if deleted ? + bouquetList->activateBouquet(old_b_id, false); + msg = CRCInput::RC_ok; + goto _show; + } + + if(!from_menu && g_settings.mode_clock) + InfoClock->StartClock(); + + return ((nNewChannel >= 0) ? menu_return::RETURN_EXIT_ALL : menu_return::RETURN_REPAINT); +} + int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) { int res = 0; @@ -2361,94 +2471,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) /* ================================== KEYS ================================================ */ if( msg == CRCInput::RC_ok || (!g_InfoViewer->virtual_zap_mode && (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites))) { if( (mode == mode_tv) || (mode == mode_radio) || (mode == mode_ts)) { - if(g_settings.mode_clock) - InfoClock->StopClock(); - - StopSubtitles(); - -_show: - int nNewChannel = -1; - int old_b = bouquetList->getActiveBouquetNumber(); - t_channel_id old_id = 0; - if(!bouquetList->Bouquets.empty()) - old_id = bouquetList->Bouquets[bouquetList->getActiveBouquetNumber()]->channelList->getActiveChannel_ChannelID(); - //int old_mode = g_settings.channel_mode; - int old_mode = GetChannelMode(); - printf("************************* ZAP START: bouquetList %p size %d old_b %d\n", bouquetList, (int)bouquetList->Bouquets.size(), old_b);fflush(stdout); - -#if 0 - int old_num = 0; - if(!bouquetList->Bouquets.empty()) { - old_num = bouquetList->Bouquets[old_b]->channelList->getSelected(); - } -#endif -//_show: - if(msg == CRCInput::RC_ok) - { - if (g_settings.channellist_new_zap_mode > 0) /* allow or active */ - g_audioMute->enableMuteIcon(false); - if( !bouquetList->Bouquets.empty() && bouquetList->Bouquets[old_b]->channelList->getSize() > 0) - nNewChannel = bouquetList->Bouquets[old_b]->channelList->exec();//with ZAP! - else - nNewChannel = bouquetList->exec(true); - if (g_settings.channellist_new_zap_mode > 0) /* allow or active */ - g_audioMute->enableMuteIcon(true); - } else if(msg == CRCInput::RC_sat) { - SetChannelMode(LIST_MODE_SAT); - nNewChannel = bouquetList->exec(true); - } else if(msg == CRCInput::RC_favorites) { - SetChannelMode(LIST_MODE_FAV); - nNewChannel = bouquetList->exec(true); - } -_repeat: - CVFD::getInstance ()->showServicename(channelList->getActiveChannelName()); - CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); - printf("************************* ZAP RES: nNewChannel %d\n", nNewChannel);fflush(stdout); - if(nNewChannel == -1) { // restore orig. bouquet and selected channel on cancel - /* FIXME if mode was changed while browsing, - * other modes selected bouquet not restored */ - SetChannelMode(old_mode); - bouquetList->activateBouquet(old_b, false); -#if 0 - if(!bouquetList->Bouquets.empty()) - bouquetList->Bouquets[bouquetList->getActiveBouquetNumber()]->channelList->setSelected(old_num); -#endif - if(!bouquetList->Bouquets.empty()) { - bouquetList->Bouquets[bouquetList->getActiveBouquetNumber()]->channelList->adjustToChannelID(old_id, false); - } - StartSubtitles(mode == mode_tv); - } - else if(nNewChannel == -3) { // list mode changed - printf("************************* ZAP NEW MODE: bouquetList %p size %d\n", bouquetList, (int)bouquetList->Bouquets.size());fflush(stdout); - nNewChannel = bouquetList->exec(true); - goto _repeat; - } - //else if(nNewChannel == -4) - if(g_channel_list_changed) - { - /* don't change bouquet after adding a channel to favorites */ - if (nNewChannel != -5) - SetChannelMode(old_mode); - g_channel_list_changed = false; - if(old_b_id < 0) old_b_id = old_b; - //g_Zapit->saveBouquets(); - /* lets do it in sync */ - reloadhintBox->paint(); - CServiceManager::getInstance()->SaveServices(true, true); - g_bouquetManager->saveBouquets(); - g_bouquetManager->saveUBouquets(); - g_bouquetManager->renumServices(); - channelsInit(/*true*/); - t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID(); - channelList->adjustToChannelID(live_channel_id);//FIXME what if deleted ? - bouquetList->activateBouquet(old_b_id, false); - msg = CRCInput::RC_ok; - goto _show; - } - - if(g_settings.mode_clock) - InfoClock->StartClock(); - + showChannelList(msg); return messages_return::handled; } } @@ -3572,6 +3595,24 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey) { g_Sectionsd->freeMemory(); } + else if(actionKey == "channels") + return showChannelList(CRCInput::RC_ok, true); + else if(actionKey == "standby") + g_RCInput->postMsg(NeutrinoMessages::STANDBY_ON, 0); + else if(actionKey == "easyswitch") { + INFO("easyswitch\n"); + CParentalSetup pin; + if (pin.checkPin()) { + if (parent) + parent->hide(); + + g_settings.easymenu = (g_settings.easymenu == 0) ? 1 : 0; + INFO("change easymenu to %d\n", g_settings.easymenu); + const char * text = g_settings.easymenu ? "Easy menu switched ON, restart box ?" : "Easy menu switched OFF, restart box ?"; + if (ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, text, CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_INFO, 0) == CMessageBox::mbrYes) + g_RCInput->postMsg(NeutrinoMessages::REBOOT, 0); + } + } return returnval; } diff --git a/src/neutrino.h b/src/neutrino.h index c2d2c6a4a..734405e9b 100644 --- a/src/neutrino.h +++ b/src/neutrino.h @@ -211,6 +211,8 @@ public: void saveEpg(bool cvfd_mode); void stopDaemonsForFlash(); + int showChannelList(const neutrino_msg_t msg, bool from_menu = false); + CPersonalizeGui & getPersonalizeGui() { return personalize; } }; #endif diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 9e815c6ff..ebb1e7907 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -89,6 +89,7 @@ enum MENU_MAIN, MENU_SETTINGS, MENU_SERVICE, + MENU_SHUTDOWN, MENU_MAX //3 }; @@ -100,6 +101,7 @@ 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*/ }; //init all menues @@ -110,7 +112,7 @@ void CNeutrinoApp::InitMenu() //personalize: neutrino.h, neutrino.cpp personalize.enableUsermenu(); personalize.enablePinSetup(); - personalize.addWidgets(menu_widgets, MENU_MAX); + personalize.addWidgets(menu_widgets, g_settings.easymenu ? MENU_MAX : 3); InitMenuMain(); InitMenuSettings(); @@ -131,27 +133,39 @@ void CNeutrinoApp::InitMenuMain() // Dynamic renumbering personalize.setShortcut(); - //CMenuWidget &menu = personalize.getWidget(MENU_MAIN)/**main**/; + CMenuWidget &menu = personalize.getWidget(MENU_MAIN)/**main**/; + menu.addKey(CRCInput::RC_stop, this, "easyswitch"); //top personalize.addItem(MENU_MAIN, GenericMenuSeparator, NULL, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); //1st section*************************************************************************************************** - //tv <-> radio toggle - CMenuForwarder *tvradio_switch = new CMenuForwarder(LOCALE_MAINMENU_TVRADIO_SWITCH, true, NULL, this, "tv_radio_switch", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_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]); + 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, NEUTRINO_ICON_BUTTON_RED); + mb->setHint(NEUTRINO_ICON_HINT_MB, LOCALE_MENU_HINT_MB); + personalize.addItem(MENU_MAIN, mb, &g_settings.personalize[SNeutrinoSettings::P_MPLAYER_MBROWSER]); + } + CMenuForwarder *cl = new CMenuForwarder(LOCALE_MAINMENU_CHANNELS, true, NULL, this, "channels", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); + cl->setHint(NEUTRINO_ICON_HINT_TVMODE, LOCALE_MENU_HINT_CHANNELS); + personalize.addItem(MENU_MAIN, cl); //, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TV_RADIO_MODE]); + } else { + //tv <-> radio toggle + CMenuForwarder *tvradio_switch = new CMenuForwarder(LOCALE_MAINMENU_TVRADIO_SWITCH, true, NULL, this, "tv_radio_switch", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_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]); - //tv-mode - CMenuForwarder *tvswitch = new CMenuForwarder(LOCALE_MAINMENU_TVMODE, true, NULL, this, "tv", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_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); //observed + //tv-mode + CMenuForwarder *tvswitch = new CMenuForwarder(LOCALE_MAINMENU_TVMODE, true, NULL, this, "tv", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_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); //observed - //radio-mode - CMenuForwarder *radioswitch = new CMenuForwarder(LOCALE_MAINMENU_RADIOMODE, true, NULL, this, "radio", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_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); //observed + //radio-mode + CMenuForwarder *radioswitch = new CMenuForwarder(LOCALE_MAINMENU_RADIOMODE, true, NULL, this, "radio", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_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); //observed + } //timer CMenuForwarder *timerlist = new CMenuForwarder(LOCALE_TIMERLIST_NAME, true, NULL, new CTimerList(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); @@ -161,24 +175,30 @@ void CNeutrinoApp::InitMenuMain() //multimedia menu CMenuForwarder *media = new CMenuForwarder(LOCALE_MAINMENU_MEDIA, true, NULL, CMediaPlayerMenu::getInstance(), NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); media->setHint(NEUTRINO_ICON_HINT_MEDIA, LOCALE_MENU_HINT_MEDIA); - personalize.addItem(MENU_MAIN, media, &g_settings.personalize[SNeutrinoSettings::P_MAIN_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]); - //separator - personalize.addSeparator(MENU_MAIN); + CMenuForwarder * mf; + if (!g_settings.easymenu) { + //separator + personalize.addSeparator(MENU_MAIN); - //2nd section*************************************************************************************************** + //2nd section*************************************************************************************************** - //games - bool show_games = g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME); - CMenuForwarder * 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]); + //games + bool show_games = g_PluginList->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]); - //scripts - bool show_scripts = g_PluginList->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_PluginList->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]); + } // settings, also as pin protected option in personalize menu, as a result of parameter value CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION mf = new CMenuForwarder(LOCALE_MAINMENU_SETTINGS, true, NULL, &personalize.getWidget(MENU_SETTINGS)/**settings**/); @@ -195,22 +215,24 @@ void CNeutrinoApp::InitMenuMain() //3rd section*************************************************************************************************** - //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]); + 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]); - //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(system_rev >= 8) { - mf = new CMenuForwarder(LOCALE_MAINMENU_SHUTDOWN, true, NULL, this, "shutdown", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER); - mf->setHint(NEUTRINO_ICON_HINT_SHUTDOWN, LOCALE_MENU_HINT_SHUTDOWN); - personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SHUTDOWN]); + //shutdown + if(system_rev >= 8) { + mf = new CMenuForwarder(LOCALE_MAINMENU_SHUTDOWN, true, NULL, this, "shutdown", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER); + mf->setHint(NEUTRINO_ICON_HINT_SHUTDOWN, LOCALE_MENU_HINT_SHUTDOWN); + personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SHUTDOWN]); + } } //separator @@ -224,11 +246,39 @@ void CNeutrinoApp::InitMenuMain() personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_INFOMENU]); //cisettings - if (cCA::GetInstance()->GetNumberCISlots() > 0 || cCA::GetInstance()->GetNumberSmartCardSlots() > 0) { + if (!g_settings.easymenu && (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, NEUTRINO_ICON_BUTTON_POWER); + 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 , NEUTRINO_ICON_BUTTON_RED); + mf->setHint(NEUTRINO_ICON_HINT_SLEEPTIMER, LOCALE_MENU_HINT_STANDBY); + personalize.addItem(MENU_SHUTDOWN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SLEEPTIMER]); + //sleeptimer + mf = new CMenuForwarder(LOCALE_MAINMENU_SLEEPTIMER, true, NULL, new CSleepTimerWidget, NULL, CRCInput::RC_green , NEUTRINO_ICON_BUTTON_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 , NEUTRINO_ICON_BUTTON_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(system_rev >= 8) { + mf = new CMenuForwarder(LOCALE_MAINMENU_SHUTDOWN, true, NULL, this, "shutdown", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); + mf->setHint(NEUTRINO_ICON_HINT_SHUTDOWN, LOCALE_MENU_HINT_SHUTDOWN); + personalize.addItem(MENU_SHUTDOWN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SHUTDOWN]); + } + } #ifdef TEST_MENU personalize.addItem(MENU_MAIN, new CMenuForwarderNonLocalized("Test menu", true, NULL, new CTestMenu()), NULL, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); @@ -251,42 +301,67 @@ void CNeutrinoApp::InitMenuSettings() static int show = CPersonalizeGui::PERSONALIZE_MODE_VISIBLE; //*************************************************************************************************** // save - CMenuForwarder * mf = new CMenuForwarder(LOCALE_MAINSETTINGS_SAVESETTINGSNOW, true, NULL, this, "savesettings", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED); - mf->setHint(NEUTRINO_ICON_HINT_SAVE_SETTINGS, LOCALE_MENU_HINT_SAVE_SETTINGS); - personalize.addItem(MENU_SETTINGS, mf, &show, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); + CMenuForwarder * mf; + if (!g_settings.easymenu) { + mf = new CMenuForwarder(LOCALE_MAINSETTINGS_SAVESETTINGSNOW, true, NULL, this, "savesettings", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_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 - mf = new CMenuForwarder(LOCALE_MAINSETTINGS_MANAGE, true, NULL, new CSettingsManager(), NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); + if (g_settings.easymenu) { + mf = new CMenuForwarder(LOCALE_MAINSETTINGS_MANAGE, true, NULL, new CSettingsManager(), NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_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, NEUTRINO_ICON_BUTTON_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.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_SETTINGS_MANAGER], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION); // personalize - mf = new CMenuForwarder(LOCALE_PERSONALIZE_HEAD, true, NULL, &personalize, NULL, CRCInput::RC_yellow , NEUTRINO_ICON_BUTTON_YELLOW, NEUTRINO_ICON_LOCK); - mf->setHint(NEUTRINO_ICON_HINT_PERSONALIZE, LOCALE_MENU_HINT_PERSONALIZE); - personalize.addItem(MENU_SETTINGS, mf, &show, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); + if (!g_settings.easymenu) { + mf = new CMenuForwarder(LOCALE_PERSONALIZE_HEAD, true, NULL, &personalize, NULL, CRCInput::RC_yellow , NEUTRINO_ICON_BUTTON_YELLOW, 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 - mf = new CMenuForwarder(LOCALE_MAINSETTINGS_MISC, true, NULL, new CMiscMenue() , NULL, CRCInput::RC_blue , NEUTRINO_ICON_BUTTON_BLUE); - mf->setHint(NEUTRINO_ICON_HINT_EXTENDED, LOCALE_MENU_HINT_EXTENDED); - personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_MISC]); + if (!g_settings.easymenu) { + mf = new CMenuForwarder(LOCALE_MAINSETTINGS_MISC, true, NULL, new CMiscMenue() , NULL, CRCInput::RC_blue , NEUTRINO_ICON_BUTTON_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. - mf = new CMenuForwarder(LOCALE_MAINSETTINGS_VIDEO, true, NULL, g_videoSettings); + if (g_settings.easymenu) + mf = new CMenuForwarder(LOCALE_MAINSETTINGS_VIDEO, true, NULL, g_videoSettings, NULL, CRCInput::RC_green , NEUTRINO_ICON_BUTTON_GREEN); + else + 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 - mf = new CMenuForwarder(LOCALE_MAINSETTINGS_AUDIO, true, NULL, new CAudioSetup()); + if (g_settings.easymenu) + mf = new CMenuForwarder(LOCALE_MAINSETTINGS_AUDIO, true, NULL, new CAudioSetup(), NULL, CRCInput::RC_yellow , NEUTRINO_ICON_BUTTON_YELLOW); + else + 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 , NEUTRINO_ICON_BUTTON_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); @@ -310,9 +385,11 @@ void CNeutrinoApp::InitMenuSettings() personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_OSDLANG]); // 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]); + 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]); + } // lcd if (CVFD::getInstance()->has_lcd) { @@ -328,20 +405,29 @@ void CNeutrinoApp::InitMenuSettings() personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_DRIVES]); } - // 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]); + // 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]); + } - // 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]); + 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]); - // audioplayer/pictureviewer settings - mf = new CMenuForwarder(LOCALE_AUDIOPLAYERPICSETTINGS_GENERAL, 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]); + // 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]); + + // audioplayer/pictureviewer settings + mf = new CMenuForwarder(LOCALE_AUDIOPLAYERPICSETTINGS_GENERAL, 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]); + } } @@ -365,51 +451,71 @@ 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]); - //reload channels - mf = new CMenuForwarder(LOCALE_SERVICEMENU_RELOAD , true, NULL, CScanSetup::getInstance(), "reloadchannels", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); - 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]); + if (!g_settings.easymenu) { + //reload channels + mf = new CMenuForwarder(LOCALE_SERVICEMENU_RELOAD , true, NULL, CScanSetup::getInstance(), "reloadchannels", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); + 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 - mf = new CMenuForwarder(LOCALE_BOUQUETEDITOR_NAME , true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); + if (g_settings.easymenu) + mf = new CMenuForwarder(LOCALE_BOUQUETEDITOR_NAME , true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); + else + mf = new CMenuForwarder(LOCALE_BOUQUETEDITOR_NAME , true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); + 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(); - mf = new CMenuForwarder(LOCALE_RESET_CHANNELS , true, NULL, resetNotifier, "channels", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); + if (g_settings.easymenu) + mf = new CMenuForwarder(LOCALE_RESET_CHANNELS , true, NULL, resetNotifier, "channels", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); + else + mf = new CMenuForwarder(LOCALE_RESET_CHANNELS , true, NULL, resetNotifier, "channels", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); + 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]); - /* 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]); + + 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]); + } //separator - personalize.addSeparator(MENU_SERVICE); + if (!g_settings.easymenu) { + personalize.addSeparator(MENU_SERVICE); - //restart neutrino - mf = new CMenuForwarder(LOCALE_SERVICEMENU_RESTART , true, NULL, this, "restart", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER); - 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, NEUTRINO_ICON_BUTTON_POWER); + 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 - mf = new CMenuForwarder(LOCALE_MESSAGEBOX_INFO, true, NULL, new CInfoMenu(), NULL, CRCInput::RC_info, NEUTRINO_ICON_BUTTON_INFO_SMALL); - mf->setHint(NEUTRINO_ICON_HINT_INFO, LOCALE_MENU_HINT_INFO); - personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_SERVICE_INFOMENU]); + if (!g_settings.easymenu) { + mf = new CMenuForwarder(LOCALE_MESSAGEBOX_INFO, true, NULL, new CInfoMenu(), NULL, CRCInput::RC_info, NEUTRINO_ICON_BUTTON_INFO_SMALL); + 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 - mf = new CMenuForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, new CSoftwareUpdate()); + if (g_settings.easymenu) + mf = new CMenuForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, new CSoftwareUpdate(), NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); + else + 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]); } diff --git a/src/system/locals.h b/src/system/locals.h index e39f70cad..b65d33a37 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -749,6 +749,7 @@ typedef enum LOCALE_LEDCONTROLER_ON_LED1, LOCALE_LEDCONTROLER_ON_LED2, LOCALE_MAINMENU_AUDIOPLAYER, + LOCALE_MAINMENU_CHANNELS, LOCALE_MAINMENU_CLEARSECTIONSD, LOCALE_MAINMENU_GAMES, LOCALE_MAINMENU_HEAD, @@ -765,7 +766,9 @@ typedef enum LOCALE_MAINMENU_SERVICE, LOCALE_MAINMENU_SETTINGS, LOCALE_MAINMENU_SHUTDOWN, + LOCALE_MAINMENU_SHUTDOWN_MENU, LOCALE_MAINMENU_SLEEPTIMER, + LOCALE_MAINMENU_STANDBY, LOCALE_MAINMENU_TVMODE, LOCALE_MAINMENU_TVRADIO_SWITCH, LOCALE_MAINSETTINGS_AUDIO, @@ -813,6 +816,7 @@ typedef enum LOCALE_MENU_HINT_BACKUP, LOCALE_MENU_HINT_BEDIT, LOCALE_MENU_HINT_CACHE_TXT, + LOCALE_MENU_HINT_CHANNELS, LOCALE_MENU_HINT_CEC_MODE, LOCALE_MENU_HINT_CEC_STANDBY, LOCALE_MENU_HINT_CEC_VIEW_ON, @@ -1011,6 +1015,7 @@ typedef enum LOCALE_MENU_HINT_OSD_PRESET, LOCALE_MENU_HINT_PARENTALLOCK_CHANGEPIN, LOCALE_MENU_HINT_PARENTALLOCK_LOCKAGE, + LOCALE_MENU_HINT_PARENTALLOCK_MENU, LOCALE_MENU_HINT_PARENTALLOCK_PROMPT, LOCALE_MENU_HINT_PERSONALIZE, LOCALE_MENU_HINT_PICTUREVIEWER_DEFDIR, @@ -1139,6 +1144,7 @@ typedef enum LOCALE_MENU_HINT_SETTINGS, LOCALE_MENU_HINT_SHOW_MUTE_ICON, LOCALE_MENU_HINT_SHUTDOWN, + LOCALE_MENU_HINT_SHUTDOWN_MENU, LOCALE_MENU_HINT_SHUTDOWN_COUNT, LOCALE_MENU_HINT_SHUTDOWN_RCDELAY, LOCALE_MENU_HINT_SHUTDOWN_REAL, @@ -1152,6 +1158,7 @@ typedef enum LOCALE_MENU_HINT_SOFTUPDATE_EXPERT_READ, LOCALE_MENU_HINT_SOFTUPDATE_EXPERT_WRITE, LOCALE_MENU_HINT_SOFTUPDATE_SETTINGS, + LOCALE_MENU_HINT_STANDBY, LOCALE_MENU_HINT_START_TOSTANDBY, LOCALE_MENU_HINT_STREAMINFO, LOCALE_MENU_HINT_SUBCHANNEL_POS, @@ -1561,6 +1568,7 @@ typedef enum LOCALE_PARENTALLOCK_LOCKAGE18, LOCALE_PARENTALLOCK_LOCKEDCHANNEL, LOCALE_PARENTALLOCK_LOCKEDPROGRAM, + LOCALE_PARENTALLOCK_MENU, LOCALE_PARENTALLOCK_NEVER, LOCALE_PARENTALLOCK_ONSIGNAL, LOCALE_PARENTALLOCK_PARENTALLOCK, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 9a4b964f8..efb40fbdf 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -749,6 +749,7 @@ const char * locale_real_names[] = "ledcontroler.on.led1", "ledcontroler.on.led2", "mainmenu.audioplayer", + "mainmenu.channels", "mainmenu.clearsectionsd", "mainmenu.games", "mainmenu.head", @@ -765,7 +766,9 @@ const char * locale_real_names[] = "mainmenu.service", "mainmenu.settings", "mainmenu.shutdown", + "mainmenu.shutdown_menu", "mainmenu.sleeptimer", + "mainmenu.standby", "mainmenu.tvmode", "mainmenu.tvradio_switch", "mainsettings.audio", @@ -813,6 +816,7 @@ const char * locale_real_names[] = "menu.hint_backup", "menu.hint_bedit", "menu.hint_cache_txt", + "menu.hint_channels", "menu.hint_cec_mode", "menu.hint_cec_standby", "menu.hint_cec_view_on", @@ -1011,6 +1015,7 @@ const char * locale_real_names[] = "menu.hint_osd_preset", "menu.hint_parentallock_changepin", "menu.hint_parentallock_lockage", + "menu.hint_parentallock_menu", "menu.hint_parentallock_prompt", "menu.hint_personalize", "menu.hint_pictureviewer_defdir", @@ -1139,6 +1144,7 @@ const char * locale_real_names[] = "menu.hint_settings", "menu.hint_show_mute_icon", "menu.hint_shutdown", + "menu.hint_shutdown_menu", "menu.hint_shutdown_count", "menu.hint_shutdown_rcdelay", "menu.hint_shutdown_real", @@ -1152,6 +1158,7 @@ const char * locale_real_names[] = "menu.hint_softupdate_expert_read", "menu.hint_softupdate_expert_write", "menu.hint_softupdate_settings", + "menu.hint_standby", "menu.hint_start_tostandby", "menu.hint_streaminfo", "menu.hint_subchannel_pos", @@ -1561,6 +1568,7 @@ const char * locale_real_names[] = "parentallock.lockage18", "parentallock.lockedchannel", "parentallock.lockedprogram", + "parentallock.menu", "parentallock.never", "parentallock.onsignal", "parentallock.parentallock", diff --git a/src/system/settings.cpp b/src/system/settings.cpp index d848aec29..461606d22 100644 --- a/src/system/settings.cpp +++ b/src/system/settings.cpp @@ -57,7 +57,7 @@ const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SE {"personalize_cisettings_main" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, //main menu->settings menu - {"personalize_settingsmager" , CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED}, + {"personalize_settingsmager" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_video" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_audio" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_network" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, @@ -85,7 +85,7 @@ const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SE {"personalize_media_menu" , CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED}, {"personalize_media_audio" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_media_intetplay" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, - {"personalize_media_movieplayer" , CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED}, + {"personalize_media_movieplayer" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_media_pviewer" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_media_upnp" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, diff --git a/src/system/settings.h b/src/system/settings.h index 1402c8dae..0994ada4a 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -125,6 +125,7 @@ struct SNeutrinoSettings int ci_clock; int ci_ignore_messages; int radiotext_enable; + int easymenu; //vcr int vcr_AutoSwitch;