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

glcdsetup: localize clock options

Browse Source 
Origin commit data
------------------
Commit: e2b7af2b1b
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-06-14 (Sun, 14 Jun 2020)

Origin message was:
------------------
- glcdsetup: localize clock options
This commit is contained in:
vanhofen
2020-06-14 18:44:44 +02:00
parent 29b31d8ae7
commit 1b038520f8
7 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/deutsch.locale
View File

@@ -888,6 +888,8 @@ fsk.to_16 bis 16
fsk.to_7 bis 7
glcd.brightness Helligkeit
glcd.brightness_standby Helligkeit in Standby
glcd.clock.analog analog
glcd.clock.digital_hm digital
glcd.color.amber Amber
glcd.color.black Schwarz
glcd.color.blue Blau

2
data/locale/english.locale
View File

@@ -888,6 +888,8 @@ fsk.to_16 to 16
fsk.to_7 to 7
glcd.brightness Brightness
glcd.brightness_standby Brightness in standby
glcd.clock.analog analog
glcd.clock.digital_hm digital
glcd.color.amber Amber
glcd.color.black Black
glcd.color.blue Blue

6
src/driver/nglcd.cpp
View File

@@ -240,9 +240,9 @@ void nGLCD::Exec() {
if (percent_time_standby) {
std::string Time;
if (g_settings.glcd_time_in_standby == 3)
if (g_settings.glcd_time_in_standby == CLOCK_ANALOG)
LcdAnalogClock(bitmap->Width()/2, bitmap->Height()/2, 200);
else if (g_settings.glcd_time_in_standby == 2)
else if (g_settings.glcd_time_in_standby == CLOCK_DIGITAL_HMS)
Time = strftime("%H:%M:%S", tm);
else
Time = strftime("%H:%M", tm);
@@ -795,7 +795,7 @@ void nGLCD::Update() {
void nGLCD::StandbyMode(bool b) {
if (nglcd) {
if (g_settings.glcd_time_in_standby) {
if (g_settings.glcd_time_in_standby != CLOCK_OFF) {
nglcd->doStandbyTime = b;
nglcd->doStandby = false;
} else {

8
src/driver/nglcd.h
View File

@@ -114,6 +114,14 @@ class nGLCD
static void Lock();
static void Unlock();
public:
enum
{
CLOCK_OFF = 0,
CLOCK_DIGITAL_HM = 1,
CLOCK_DIGITAL_HMS = 2,
CLOCK_ANALOG = 3
};
nGLCD();
~nGLCD();
void DeInit();

8
src/gui/glcdsetup.cpp
View File

@@ -221,10 +221,10 @@ bool GLCD_Menu::changeNotify (const neutrino_locale_t OptionName, void *Data)
#define ONOFFSEC_OPTION_COUNT 3
static const CMenuOptionChooser::keyval ONOFFSEC_OPTIONS[ONOFFSEC_OPTION_COUNT] = {
{ 0, LOCALE_OPTIONS_OFF },
{ 1, LOCALE_OPTIONS_ON },
// { 2, LOCALE_CLOCK_SECONDS },
{ 3, LOCALE_OPTIONS_ON } // FIXME
{ nGLCD::CLOCK_OFF, LOCALE_OPTIONS_OFF },
{ nGLCD::CLOCK_DIGITAL_HM, LOCALE_GLCD_CLOCK_DIGITAL_HM },
// { nGLCD::CLOCK_DIGITAL_HMS, LOCALE_GLCD_CLOCK_DIGITAL_HMS },
{ nGLCD::CLOCK_ANALOG, LOCALE_GLCD_CLOCK_ANALOG }
};
void GLCD_Menu::GLCD_Menu_Settings()

2
src/system/locals.h
View File

@@ -915,6 +915,8 @@ typedef enum
LOCALE_FSK_TO_7,
LOCALE_GLCD_BRIGHTNESS,
LOCALE_GLCD_BRIGHTNESS_STANDBY,
LOCALE_GLCD_CLOCK_ANALOG,
LOCALE_GLCD_CLOCK_DIGITAL_HM,
LOCALE_GLCD_COLOR_AMBER,
LOCALE_GLCD_COLOR_BLACK,
LOCALE_GLCD_COLOR_BLUE,

2
src/system/locals_intern.h
View File

@@ -915,6 +915,8 @@ const char * locale_real_names[] =
"fsk.to_7",
"glcd.brightness",
"glcd.brightness_standby",
"glcd.clock.analog",
"glcd.clock.digital_hm",
"glcd.color.amber",
"glcd.color.black",
"glcd.color.blue",