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

glcd: unify/resort locales

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: c4814d70ed
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-11-28 (Mon, 28 Nov 2022)

Origin message was:
------------------
- glcd: unify/resort locales

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2022-11-28 22:11:42 +01:00
parent f77412dbf9
commit f1417b352d
9 changed files with 290 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/driver/glcd/glcd.cpp
View File

@@ -229,19 +229,19 @@ void cGLCD::Exec()
if (doStandbyTime || doStandbyWeather)
{
if (t.glcd_time_in_standby == CLOCK_ANALOG)
if (t.glcd_standby_clock == CLOCK_ANALOG)
{
ShowAnalogClock(tm->tm_hour, tm->tm_min, tm->tm_sec, bitmap->Width()/2, bitmap->Height()/2);
}
else if (t.glcd_time_in_standby == CLOCK_DIGITAL)
else if (t.glcd_standby_clock == CLOCK_DIGITAL)
{
ShowDigitalClock(tm->tm_hour, tm->tm_min);
}
else if (t.glcd_time_in_standby > CLOCK_OFF)
else if (t.glcd_standby_clock > CLOCK_OFF)
{
ShowSimpleClock(strftime("%H:%M", tm), t.glcd_time_in_standby);
ShowSimpleClock(strftime("%H:%M", tm), t.glcd_standby_clock);
}
if (t.glcd_standby_weather == 1 && t.glcd_time_in_standby != CLOCK_ANALOG)
if (t.glcd_standby_weather == 1 && t.glcd_standby_clock != CLOCK_ANALOG)
{
ShowWeather(true);
}
@@ -1213,9 +1213,9 @@ void cGLCD::StandbyMode(bool b)
SNeutrinoGlcdTheme &t = g_settings.glcd_theme;
if (cglcd)
{
if (t.glcd_time_in_standby || t.glcd_standby_weather)
if (t.glcd_standby_clock || t.glcd_standby_weather)
{
if (t.glcd_time_in_standby)
if (t.glcd_standby_clock)
cglcd->doStandbyTime = b;
else
cglcd->doStandbyTime = false;