diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 0e8e33bb0..88bd4583d 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1587,7 +1587,7 @@ menu.hint_subchannel_pos Wählen Sie die Anzeigeposition der Unterkanäle aus menu.hint_sw_update Neutrino-HD aktualisieren, Image sichern und wiederherstellen menu.hint_theme Wählen Sie ein vordefiniertes Farbschema, speichern oder laden Sie ihre eigenen Farbschemata menu.hint_timeouts Gibt an, nach welcher Zeit in Sekunden die Menüs oder Infofenster sich automatisch schließen (0 deaktiviert) -menu.hint_timer_followscreenings Zeige Terminauswahl mit Folge-Events zur Timerprogrammierung +menu.hint_timer_followscreenings Zeige Terminauswahl mit Folge-Events zur Timerprogrammierung. "Immer" zeigt die Auswahl auch dann, wenn nur ein Event gefunden wurde. menu.hint_timers Hinzufügen, entfernen und bearbeiten geplanter Aufnahmen oder anderer Timer menu.hint_timezone Wählen Sie ihre Zeitzone aus menu.hint_tmdb_api_key Geben Sie den TMDb API Schlüssel ein. Eine leere Eingabe schaltet die TMDb-Unterstützung aus @@ -2123,6 +2123,7 @@ opkg.update.check Prüfe auf Updates... opkg.update.reading_lists Paketlisten werden eingelesen... opkg.upgrade Installierte Pakete aktualisieren opkg.warning_3rdparty_packages Drittanbieter-Pakete könnten Ihr System beschädigen! Sind Sie sicher, dieses Paket zu installieren? +options.always immer options.default Voreinstellungen benutzen options.fb framebuffer options.hint_default Setzen Sie die Werte auf die Voreinstellung zurück. diff --git a/data/locale/english.locale b/data/locale/english.locale index 099dd7ef1..baf86c6bb 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1587,7 +1587,7 @@ menu.hint_subchannel_pos Select subchannels menu position menu.hint_sw_update Update software menu.hint_theme Select pre-defined color theme\nSave or load theme from files menu.hint_timeouts Configure time to hide GUI windows\nin seconds -menu.hint_timer_followscreenings Show selection with followscreenings for timer programming +menu.hint_timer_followscreenings Show selection with followscreenings for timer programming. "Always" shows selection even if just one event is found. menu.hint_timers Add/Remove/Edit scheduled\nrecording, reminders etc. menu.hint_timezone Select your timezone menu.hint_tmdb_api_key Type your TMDb API key. An empty input disables TMDb support @@ -2123,6 +2123,7 @@ opkg.update.check Checking for updates... opkg.update.reading_lists Reading package lists... opkg.upgrade Upgrade installed packages opkg.warning_3rdparty_packages 3rd party packages could damage your system! Are you sure install this package? +options.always always options.default Reset to defaults options.fb framebuffer options.hint_default Reset the values to their defaults diff --git a/src/gui/followscreenings.cpp b/src/gui/followscreenings.cpp index cd97b89c3..43612b78b 100644 --- a/src/gui/followscreenings.cpp +++ b/src/gui/followscreenings.cpp @@ -155,7 +155,7 @@ void CFollowScreenings::show() getFollowScreenings(); - if (followlist.size() == 1) { + if (followlist.size() == 1 && g_settings.timer_followscreenings < 2 /*always*/) { //NI snprintf(actionstr, sizeof(actionstr), "%lu", followlist.front().startTime); exec(NULL, actionstr); } else { diff --git a/src/gui/record_setup.cpp b/src/gui/record_setup.cpp index 6c4c66c30..a1848ac6c 100644 --- a/src/gui/record_setup.cpp +++ b/src/gui/record_setup.cpp @@ -173,6 +173,15 @@ const CMenuOptionChooser::keyval END_OF_RECORDING[END_OF_RECORDING_COUNT] = {1, LOCALE_RECORDINGMENU_END_OF_RECORDING_EPG} }; +//NI +const CMenuOptionChooser::keyval timer_followscreenings_options[] = +{ + {0, LOCALE_OPTIONS_OFF}, + {1, LOCALE_OPTIONS_ON}, + {2, LOCALE_OPTIONS_ALWAYS} +}; +size_t timer_followscreenings_options_count = sizeof(timer_followscreenings_options)/sizeof(CMenuOptionChooser::keyval); + int CRecordSetup::showRecordSetup() { CMenuForwarder * mf; @@ -349,7 +358,7 @@ void CRecordSetup::showRecordTimerSetup(CMenuWidget *menu_timersettings) menu_timersettings->addItem(GenericMenuSeparatorLine); //allow followscreenings - CMenuOptionChooser* followscreenings = new CMenuOptionChooser(LOCALE_TIMERSETTINGS_FOLLOWSCREENINGS, &g_settings.timer_followscreenings, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + CMenuOptionChooser* followscreenings = new CMenuOptionChooser(LOCALE_TIMERSETTINGS_FOLLOWSCREENINGS, &g_settings.timer_followscreenings, timer_followscreenings_options, timer_followscreenings_options_count, true); //NI followscreenings->setHint("", LOCALE_MENU_HINT_TIMER_FOLLOWSCREENINGS); menu_timersettings->addItem(followscreenings); } diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 5215a8941..70939bd43 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1027,6 +1027,7 @@ void CNeutrinoApp::upgradeSetup(const char * fname) configfile.setString("usermenu_tv_yellow", g_settings.usermenu[SNeutrinoSettings::BUTTON_YELLOW]->items); } } + //NI if (g_settings.version_pseudo < "20160623110000") { if (g_settings.screen_xres == 112) @@ -1035,11 +1036,21 @@ void CNeutrinoApp::upgradeSetup(const char * fname) if (g_settings.screen_yres == 112) g_settings.screen_yres = 105; } + //NI if (g_settings.version_pseudo < "20160804110000") { if (g_settings.tmdb_api_key == "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") g_settings.tmdb_api_key = "7270f1b571c4ecbb5b204ddb7f8939b1"; } + //NI + if (g_settings.version_pseudo < "20161411235900") + { + //convert and remove obsolete recording_tevents key + bool recording_tevents = configfile.getBool("recording_tevents", false); + if (recording_tevents) + g_settings.timer_followscreenings = 2 /*always*/; + configfile.deleteKey("recording_tevents"); + } g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO; configfile.setString("version_pseudo", g_settings.version_pseudo); diff --git a/src/system/locals.h b/src/system/locals.h index fc04ce8b0..19483ecf8 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -2150,6 +2150,7 @@ typedef enum LOCALE_OPKG_UPDATE_READING_LISTS, LOCALE_OPKG_UPGRADE, LOCALE_OPKG_WARNING_3RDPARTY_PACKAGES, + LOCALE_OPTIONS_ALWAYS, LOCALE_OPTIONS_DEFAULT, LOCALE_OPTIONS_FB, LOCALE_OPTIONS_HINT_DEFAULT, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 72e47b91e..5bfce40fa 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -2150,6 +2150,7 @@ const char * locale_real_names[] = "opkg.update.reading_lists", "opkg.upgrade", "opkg.warning_3rdparty_packages", + "options.always", "options.default", "options.fb", "options.hint_default", diff --git a/version_pseudo.h b/version_pseudo.h index e0defae92..24beacfde 100644 --- a/version_pseudo.h +++ b/version_pseudo.h @@ -1 +1 @@ -#define NEUTRINO_VERSION_PSEUDO "20160804110000" +#define NEUTRINO_VERSION_PSEUDO "20161411235900"