mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "- videosettings: reduce videomenu.zappingmode to mute and hold"

Browse Source 
This reverts commit 8cac71b903.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 34f258f4ea
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-12-19 (Mon, 19 Dec 2022)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2022-12-19 20:08:35 +01:00
parent 2e76b09ae2
commit b0a026bebf
5 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/deutsch.locale
View File

@@ -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

2
data/locale/english.locale
View File

@@ -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

6
src/gui/videosettings.cpp
View File

@@ -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

2
src/system/locals.h
View File

@@ -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,

2
src/system/locals_intern.h
View File

@@ -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",