diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index a53bbf8c3..9e0b4d0b8 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -402,6 +402,7 @@ eventfinder.search_within_list Suche innerhalb Text eventfinder.searching Suche... eventfinder.start_search Suche starten eventlist.additional Zusatzinformationen +eventlist.epgplus EPG Plus anzeigen eventlist.name Eventliste eventlistbar.channelswitch Umschalten eventlistbar.eventsort Sortieren @@ -1036,6 +1037,7 @@ menu.hint_epg_save_standby Speichert die EPG-Daten auch, wenn in den Standby-Mod menu.hint_epg_scan Zu scannende Bouquets wählen. Aktuelles Bouquet beim Umschalten, markierte Bouquets oder alle Favoriten menu.hint_epg_scan_mode Aktivieren Sie den Hintergrundscan der EPG-Daten, wenn ein freier Tuner vorhanden ist menu.hint_eventlist_additional Definiert, ob zusätzliche Informationen im Hauptfenster angezeigt werden sollen +menu.hint_eventlist_epgplus Definiert, ob EPG Plus (Vorschau-Übersicht) mit der EPG-Taste angezeigt werden sollen menu.hint_eventlist_fonts Ändern Sie die Schriftgröße in der Event-Liste menu.hint_eventlist_setup Wählen Sie die Anzeigeoptionen für die Event-Liste menu.hint_extended Energiespar-, EPG-Speicher- und Lade-Optionen, HDMI-CEC, Startkanal und mehr diff --git a/data/locale/english.locale b/data/locale/english.locale index cb28460c2..416e1cd80 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -402,6 +402,7 @@ eventfinder.search_within_list Search within eventfinder.searching Search for keyword in EPG... eventfinder.start_search Start Search eventlist.additional Additional informations +eventlist.epgplus Show EPG Plus eventlist.name Eventlist eventlistbar.channelswitch schedule eventlistbar.eventsort sorting @@ -1036,6 +1037,7 @@ menu.hint_epg_save_standby Save EPG on soft standby mode menu.hint_epg_scan Select bouquets to scan epg, current on zap,\nall or selected favorites menu.hint_epg_scan_mode Enable background epg scan using free tuner menu.hint_eventlist_additional Show additional informations\nin main box +menu.hint_eventlist_epgplus Show EPG Plus (Eventlist overview) when pressing EPG key menu.hint_eventlist_fonts Change event list font sizes menu.hint_eventlist_setup Configure event list GUI options menu.hint_extended Power saving, EPG save/load options\nHDMI-CEC, Start channel, zap options diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 9722eb3e7..e347f54eb 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -601,10 +601,13 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna } else if (msg == CRCInput::RC_epg) { - hide(); - CEPGplusHandler eplus; - eplus.exec(NULL, ""); - loop = false; + if (g_settings.eventlist_epgplus) + { + hide(); + CEPGplusHandler eplus; + eplus.exec(NULL, ""); + loop = false; + } } else if (msg==CRCInput::RC_help || msg==CRCInput::RC_ok || msg==CRCInput::RC_info) { diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 276302e5d..f723871ad 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -1195,6 +1195,11 @@ void COsdSetup::showOsdEventlistSetup(CMenuWidget *menu_eventlist) mc = new CMenuOptionChooser(LOCALE_EVENTLIST_ADDITIONAL, &g_settings.eventlist_additional, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); mc->setHint("", LOCALE_MENU_HINT_EVENTLIST_ADDITIONAL); menu_eventlist->addItem(mc); + + // epgplus in eventlist + mc = new CMenuOptionChooser(LOCALE_EVENTLIST_EPGPLUS, &g_settings.eventlist_epgplus, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + mc->setHint("", LOCALE_MENU_HINT_EVENTLIST_EPGPLUS); + menu_eventlist->addItem(mc); } // volume diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 7c590d0b1..475e2a3e8 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -692,6 +692,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.spectrum = configfile.getBool("spectrum" , false); g_settings.channellist_additional = configfile.getInt32("channellist_additional", 2); //default minitv g_settings.eventlist_additional = configfile.getInt32("eventlist_additional", 0); + g_settings.eventlist_epgplus = configfile.getInt32("eventlist_epgplus", 1); g_settings.channellist_epgtext_align_right = configfile.getBool("channellist_epgtext_align_right" , false); g_settings.channellist_progressbar_design = configfile.getInt32("channellist_progressbar_design", g_settings.progressbar_design); g_settings.channellist_foot = configfile.getInt32("channellist_foot" , 1);//default next Event @@ -1220,6 +1221,7 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32( "zapto_pre_time", g_settings.zapto_pre_time ); configfile.setBool("spectrum", g_settings.spectrum); configfile.setInt32("eventlist_additional", g_settings.eventlist_additional); + configfile.setInt32("eventlist_epgplus", g_settings.eventlist_epgplus); configfile.setInt32("channellist_additional", g_settings.channellist_additional); configfile.setBool("channellist_epgtext_align_right", g_settings.channellist_epgtext_align_right); configfile.setInt32("channellist_progressbar_design", g_settings.channellist_progressbar_design); diff --git a/src/system/locals.h b/src/system/locals.h index 9aca38703..0affda661 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -429,6 +429,7 @@ typedef enum LOCALE_EVENTFINDER_SEARCHING, LOCALE_EVENTFINDER_START_SEARCH, LOCALE_EVENTLIST_ADDITIONAL, + LOCALE_EVENTLIST_EPGPLUS, LOCALE_EVENTLIST_NAME, LOCALE_EVENTLISTBAR_CHANNELSWITCH, LOCALE_EVENTLISTBAR_EVENTSORT, @@ -1063,6 +1064,7 @@ typedef enum LOCALE_MENU_HINT_EPG_SCAN, LOCALE_MENU_HINT_EPG_SCAN_MODE, LOCALE_MENU_HINT_EVENTLIST_ADDITIONAL, + LOCALE_MENU_HINT_EVENTLIST_EPGPLUS, LOCALE_MENU_HINT_EVENTLIST_FONTS, LOCALE_MENU_HINT_EVENTLIST_SETUP, LOCALE_MENU_HINT_EXTENDED, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index abfce1c63..0fd4b7260 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -429,6 +429,7 @@ const char * locale_real_names[] = "eventfinder.searching", "eventfinder.start_search", "eventlist.additional", + "eventlist.epgplus", "eventlist.name", "eventlistbar.channelswitch", "eventlistbar.eventsort", @@ -1063,6 +1064,7 @@ const char * locale_real_names[] = "menu.hint_epg_scan", "menu.hint_epg_scan_mode", "menu.hint_eventlist_additional", + "menu.hint_eventlist_epgplus", "menu.hint_eventlist_fonts", "menu.hint_eventlist_setup", "menu.hint_extended", diff --git a/src/system/settings.h b/src/system/settings.h index c3e7e2f98..e5b19f4db 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -561,6 +561,7 @@ struct SNeutrinoSettings int window_width; int window_height; int eventlist_additional; + int eventlist_epgplus; int channellist_additional; int channellist_epgtext_align_right; int channellist_progressbar_design;