From b0a026bebf0275c22396aa0d767796a17b55ca3f Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 19 Dec 2022 20:08:35 +0100 Subject: [PATCH] Revert "- videosettings: reduce videomenu.zappingmode to mute and hold" This reverts commit 8cac71b90345f937f983ea2e3a12fda4af492944. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/34f258f4eabdf5f1c0a7a75ba6d652c6c9a1ea9c Author: vanhofen Date: 2022-12-19 (Mon, 19 Dec 2022) ------------------ This commit was generated by Migit --- data/locale/deutsch.locale | 2 ++ data/locale/english.locale | 2 ++ src/gui/videosettings.cpp | 6 ++++-- src/system/locals.h | 2 ++ src/system/locals_intern.h | 2 ++ 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index a4dee59f2..673697ff1 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -3057,7 +3057,9 @@ videomenu.videoformat_43 4:3 videomenu.videomode Videosystem videomenu.zappingmode Umschaltverhalten videomenu.zappingmode_hold Standbild +videomenu.zappingmode_holdtilllock Standbild bis lock videomenu.zappingmode_mute Schwarzes Bild +videomenu.zappingmode_mutetilllock Schwarzes Bild bis lock weather.api_key Wetter API Schlüssel (OpenWeather) weather.direction_e O weather.direction_ene ONO diff --git a/data/locale/english.locale b/data/locale/english.locale index b92783737..b07a48da7 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -3057,7 +3057,9 @@ videomenu.videoformat_43 4:3 videomenu.videomode Digital video mode videomenu.zappingmode Zapping mode videomenu.zappingmode_hold Hold screen +videomenu.zappingmode_holdtilllock Hold screen until lock videomenu.zappingmode_mute Black screen +videomenu.zappingmode_mutetilllock Black screen until lock weather.api_key Weather API key (OpenWeather) weather.direction_e E weather.direction_ene ENE diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index b071830b0..b90f5889b 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -355,11 +355,13 @@ const CMenuOptionChooser::keyval VIDEOMENU_DBDR_OPTIONS[VIDEOMENU_DBDR_OPTION_CO }; #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE -#define VIDEOMENU_ZAPPINGMODE_OPTION_COUNT 2 +#define VIDEOMENU_ZAPPINGMODE_OPTION_COUNT 4 CMenuOptionChooser::keyval VIDEOMENU_ZAPPINGMODE_OPTIONS[VIDEOMENU_ZAPPINGMODE_OPTION_COUNT] = { { 0, LOCALE_VIDEOMENU_ZAPPINGMODE_MUTE }, - { 1, LOCALE_VIDEOMENU_ZAPPINGMODE_HOLD } + { 1, LOCALE_VIDEOMENU_ZAPPINGMODE_HOLD }, + { 2, LOCALE_VIDEOMENU_ZAPPINGMODE_MUTETILLLOCK }, + { 3, LOCALE_VIDEOMENU_ZAPPINGMODE_HOLDTILLLOCK } }; #if BOXMODEL_VUPLUS_ARM diff --git a/src/system/locals.h b/src/system/locals.h index 2a5e743fe..a5033d396 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -3084,7 +3084,9 @@ typedef enum LOCALE_VIDEOMENU_VIDEOMODE, LOCALE_VIDEOMENU_ZAPPINGMODE, LOCALE_VIDEOMENU_ZAPPINGMODE_HOLD, + LOCALE_VIDEOMENU_ZAPPINGMODE_HOLDTILLLOCK, LOCALE_VIDEOMENU_ZAPPINGMODE_MUTE, + LOCALE_VIDEOMENU_ZAPPINGMODE_MUTETILLLOCK, LOCALE_WEATHER_API_KEY, LOCALE_WEATHER_DIRECTION_E, LOCALE_WEATHER_DIRECTION_ENE, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index a33db53b3..3a859adde 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -3084,7 +3084,9 @@ const char * locale_real_names[] = "videomenu.videomode", "videomenu.zappingmode", "videomenu.zappingmode_hold", + "videomenu.zappingmode_holdtilllock", "videomenu.zappingmode_mute", + "videomenu.zappingmode_mutetilllock", "weather.api_key", "weather.direction_e", "weather.direction_ene",