mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

- glcd: unify/resort locales

Browse Source 
Conflicts:
	data/locale/slovak.locale
This commit is contained in:
vanhofen
2022-11-28 22:11:42 +01:00
committed by Thilo Graf
parent f088ffcc70
commit 2a968e11cd
9 changed files with 346 additions and 251 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);
}
@@ -1198,9 +1198,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;

96
src/gui/glcdsetup.cpp
View File

@@ -39,16 +39,16 @@
#include <neutrino_menue.h>
#include "glcdthemes.h"
static const CMenuOptionChooser::keyval TIME_IN_STANDBY_OPTIONS[] =
static const CMenuOptionChooser::keyval STANDBY_CLOCK_OPTIONS[] =
{
{ cGLCD::CLOCK_OFF, LOCALE_OPTIONS_OFF },
{ cGLCD::CLOCK_SIMPLE, LOCALE_GLCD_STANDBY_SIMPLE_CLOCK },
{ cGLCD::CLOCK_LED, LOCALE_GLCD_STANDBY_LED_CLOCK },
{ cGLCD::CLOCK_LCD, LOCALE_GLCD_STANDBY_LCD_CLOCK },
{ cGLCD::CLOCK_DIGITAL, LOCALE_GLCD_STANDBY_DIGITAL_CLOCK },
{ cGLCD::CLOCK_ANALOG, LOCALE_GLCD_STANDBY_ANALOG_CLOCK }
{ cGLCD::CLOCK_SIMPLE, LOCALE_GLCD_STANDBY_CLOCK_SIMPLE },
{ cGLCD::CLOCK_LED, LOCALE_GLCD_STANDBY_CLOCK_LED },
{ cGLCD::CLOCK_LCD, LOCALE_GLCD_STANDBY_CLOCK_LCD },
{ cGLCD::CLOCK_DIGITAL, LOCALE_GLCD_STANDBY_CLOCK_DIGITAL },
{ cGLCD::CLOCK_ANALOG, LOCALE_GLCD_STANDBY_CLOCK_ANALOG }
};
#define TIME_IN_STANDBY_OPTION_COUNT (sizeof(TIME_IN_STANDBY_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
#define STANDBY_CLOCK_OPTION_COUNT (sizeof(STANDBY_CLOCK_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
static const CMenuOptionChooser::keyval ALIGNMENT_OPTIONS[] =
{
@@ -264,14 +264,14 @@ bool GLCD_Menu::changeNotify(const neutrino_locale_t OptionName, void *Data)
{
case LOCALE_GLCD_CHANNEL_X_POSITION:
case LOCALE_GLCD_CHANNEL_Y_POSITION:
case LOCALE_GLCD_SIZE_CHANNEL:
case LOCALE_GLCD_ALIGN_CHANNEL:
case LOCALE_GLCD_CHANNEL_SIZE:
case LOCALE_GLCD_CHANNEL_ALIGN:
cglcd->lockChannel(CNeutrinoApp::getInstance()->channelList->getActiveChannelName());
break;
case LOCALE_GLCD_TIME_IN_STANDBY:
cdy->setActive(t.glcd_time_in_standby == cGLCD::CLOCK_DIGITAL);
csh->setActive(t.glcd_time_in_standby == cGLCD::CLOCK_SIMPLE);
csy->setActive(t.glcd_time_in_standby == cGLCD::CLOCK_SIMPLE);
case LOCALE_GLCD_STANDBY_CLOCK:
cdy->setActive(t.glcd_standby_clock == cGLCD::CLOCK_DIGITAL);
csh->setActive(t.glcd_standby_clock == cGLCD::CLOCK_SIMPLE);
csy->setActive(t.glcd_standby_clock == cGLCD::CLOCK_SIMPLE);
break;
case LOCALE_GLCD_ENABLE:
if (g_settings.glcd_enable)
@@ -345,19 +345,19 @@ int GLCD_Menu::GLCD_Standby_Settings()
SNeutrinoGlcdTheme &t = g_settings.glcd_theme;
CMenuOptionChooser *mc;
mc = new CMenuOptionChooser(LOCALE_GLCD_TIME_IN_STANDBY, &t.glcd_time_in_standby, TIME_IN_STANDBY_OPTIONS, TIME_IN_STANDBY_OPTION_COUNT, true, this);
mc = new CMenuOptionChooser(LOCALE_GLCD_STANDBY_CLOCK, &t.glcd_standby_clock, STANDBY_CLOCK_OPTIONS, STANDBY_CLOCK_OPTION_COUNT, true, this);
//mc->setHint("", LOCALE_TODO);
gss->addItem(mc);
cdy = new CMenuOptionNumberChooser(LOCALE_GLCD_DIGITAL_CLOCK_Y_POSITION, &t.glcd_standby_clock_digital_y_position, (t.glcd_position_settings && t.glcd_time_in_standby == cGLCD::CLOCK_DIGITAL), 0, 500, this);
cdy = new CMenuOptionNumberChooser(LOCALE_GLCD_CLOCK_DIGITAL_Y_POSITION, &t.glcd_standby_clock_digital_y_position, (t.glcd_position_settings && t.glcd_standby_clock == cGLCD::CLOCK_DIGITAL), 0, 500, this);
//cdy->setHint("", LOCALE_TODO);
gss->addItem(cdy);
csh = new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_SIMPLE_CLOCK, &t.glcd_standby_clock_simple_size, (t.glcd_position_settings && t.glcd_time_in_standby == cGLCD::CLOCK_SIMPLE), 0, 100, this);
csh = new CMenuOptionNumberChooser(LOCALE_GLCD_CLOCK_SIMPLE_SIZE, &t.glcd_standby_clock_simple_size, (t.glcd_position_settings && t.glcd_standby_clock == cGLCD::CLOCK_SIMPLE), 0, 100, this);
//csh->setHint("", LOCALE_TODO);
gss->addItem(csh);
csy = new CMenuOptionNumberChooser(LOCALE_GLCD_SIMPLE_CLOCK_Y_POSITION, &t.glcd_standby_clock_simple_y_position, (t.glcd_position_settings && t.glcd_time_in_standby == cGLCD::CLOCK_SIMPLE), 0, 500, this);
csy = new CMenuOptionNumberChooser(LOCALE_GLCD_CLOCK_SIMPLE_Y_POSITION, &t.glcd_standby_clock_simple_y_position, (t.glcd_position_settings && t.glcd_standby_clock == cGLCD::CLOCK_SIMPLE), 0, 500, this);
//csy->setHint("", LOCALE_TODO);
gss->addItem(csy);
@@ -475,19 +475,19 @@ int GLCD_Menu::GLCD_Theme_Settings()
// colors
CColorChooser *fg = new CColorChooser(LOCALE_GLCD_SELECT_FG, &t.glcd_foreground_color_red, &t.glcd_foreground_color_green, &t.glcd_foreground_color_blue, NULL, colorSetupNotifier);
gts->addItem(new CMenuDForwarder(LOCALE_GLCD_SELECT_FG, true, NULL, fg));
CColorChooser *fg = new CColorChooser(LOCALE_GLCD_COLOR_FG, &t.glcd_foreground_color_red, &t.glcd_foreground_color_green, &t.glcd_foreground_color_blue, NULL, colorSetupNotifier);
gts->addItem(new CMenuDForwarder(LOCALE_GLCD_COLOR_FG, true, NULL, fg));
CColorChooser *bg = new CColorChooser(LOCALE_GLCD_SELECT_BG, &t.glcd_background_color_red, &t.glcd_background_color_green, &t.glcd_background_color_blue, NULL, colorSetupNotifier);
gts->addItem(new CMenuDForwarder(LOCALE_GLCD_SELECT_BG, true, NULL, bg));
CColorChooser *bg = new CColorChooser(LOCALE_GLCD_COLOR_BG, &t.glcd_background_color_red, &t.glcd_background_color_green, &t.glcd_background_color_blue, NULL, colorSetupNotifier);
gts->addItem(new CMenuDForwarder(LOCALE_GLCD_COLOR_BG, true, NULL, bg));
gts->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_GLCD_POSITION_SETTINGS));
// channel name
gts->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_CHANNEL, &t.glcd_channel_percent, true, 0, 100, this));
gts->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_CHANNEL_SIZE, &t.glcd_channel_percent, true, 0, 100, this));
gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_ALIGN_CHANNEL, &t.glcd_channel_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, true, NULL));
gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_CHANNEL_ALIGN, &t.glcd_channel_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, true, NULL));
gts->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_CHANNEL_X_POSITION, &t.glcd_channel_x_position, true, 0, oled_width, this));
@@ -497,13 +497,13 @@ int GLCD_Menu::GLCD_Theme_Settings()
// channel logo
gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_LOGO, &t.glcd_logo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_LOGO_SHOW, &t.glcd_logo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_LOGO, &t.glcd_logo_percent, t.glcd_logo, 0, 100, this);
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_LOGO_SIZE, &t.glcd_logo_percent, t.glcd_logo, 0, 100, this);
gts->addItem(nc);
ChannelLogoActivate.Add(nc);
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_WIDTH_LOGO, &t.glcd_logo_width_percent, t.glcd_logo, 0, 100, this);
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_LOGO_WIDTH, &t.glcd_logo_width_percent, t.glcd_logo, 0, 100, this);
gts->addItem(nc);
ChannelLogoActivate.Add(nc);
@@ -519,9 +519,9 @@ int GLCD_Menu::GLCD_Theme_Settings()
// event
gts->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_EPG, &t.glcd_epg_percent, true, 0, 100, this));
gts->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_EPG_SIZE, &t.glcd_epg_percent, true, 0, 100, this));
gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_ALIGN_EPG, &t.glcd_epg_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, true, NULL));
gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_EPG_ALIGN, &t.glcd_epg_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, true, NULL));
gts->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_EPG_X_POSITION, &t.glcd_epg_x_position, true, 0, oled_width, this));
@@ -531,13 +531,13 @@ int GLCD_Menu::GLCD_Theme_Settings()
// event duration
gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_DURATION, &t.glcd_duration, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_DURATION_SHOW, &t.glcd_duration, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_DURATION, &t.glcd_duration_percent, t.glcd_duration, 0, 100, this);
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_DURATION_SIZE, &t.glcd_duration_percent, t.glcd_duration, 0, 100, this);
gts->addItem(nc);
DurationActivate.Add(nc);
oc = new CMenuOptionChooser(LOCALE_GLCD_ALIGN_DURATION, &t.glcd_duration_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, t.glcd_duration, NULL);
oc = new CMenuOptionChooser(LOCALE_GLCD_DURATION_ALIGN, &t.glcd_duration_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, t.glcd_duration, NULL);
gts->addItem(oc);
DurationActivate.Add(oc);
@@ -553,13 +553,13 @@ int GLCD_Menu::GLCD_Theme_Settings()
// event start
gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_START, &t.glcd_start, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_START_SHOW, &t.glcd_start, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_START, &t.glcd_start_percent, t.glcd_start, 0, 100, this);
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_START_SIZE, &t.glcd_start_percent, t.glcd_start, 0, 100, this);
gts->addItem(nc);
StartActivate.Add(nc);
oc = new CMenuOptionChooser(LOCALE_GLCD_ALIGN_START, &t.glcd_start_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, true, NULL);
oc = new CMenuOptionChooser(LOCALE_GLCD_START_ALIGN, &t.glcd_start_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, t.glcd_start, NULL);
gts->addItem(oc);
StartActivate.Add(oc);
@@ -575,13 +575,13 @@ int GLCD_Menu::GLCD_Theme_Settings()
// event end
gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_END, &t.glcd_end, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_END_SHOW, &t.glcd_end, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_END, &t.glcd_end_percent, t.glcd_end, 0, 100, this);
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_END_SIZE, &t.glcd_end_percent, t.glcd_end, 0, 100, this);
gts->addItem(nc);
EndActivate.Add(nc);
oc = new CMenuOptionChooser(LOCALE_GLCD_ALIGN_END, &t.glcd_end_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, true, NULL);
oc = new CMenuOptionChooser(LOCALE_GLCD_END_ALIGN, &t.glcd_end_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, t.glcd_end, NULL);
gts->addItem(oc);
EndActivate.Add(oc);
@@ -597,26 +597,26 @@ int GLCD_Menu::GLCD_Theme_Settings()
// progress bar
gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_PROGRESSBAR, &t.glcd_progressbar, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_PROGRESSBAR_SHOW, &t.glcd_progressbar, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_BAR, &t.glcd_progressbar_percent, t.glcd_progressbar, 0, 100, this);
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_PROGRESSBAR_SIZE, &t.glcd_progressbar_percent, t.glcd_progressbar, 0, 100, this);
gts->addItem(nc);
ProgressActivate.Add(nc);
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_BAR_WIDTH, &t.glcd_progressbar_width, t.glcd_progressbar, 0, oled_width, this);
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_PROGRESSBAR_WIDTH, &t.glcd_progressbar_width, t.glcd_progressbar, 0, oled_width, this);
gts->addItem(nc);
ProgressActivate.Add(nc);
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_BAR_X_POSITION, &t.glcd_progressbar_x_position, t.glcd_progressbar, 0, oled_width, this);
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_PROGRESSBAR_X_POSITION, &t.glcd_progressbar_x_position, t.glcd_progressbar, 0, oled_width, this);
gts->addItem(nc);
ProgressActivate.Add(nc);
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_BAR_Y_POSITION, &t.glcd_progressbar_y_position, t.glcd_progressbar, 0, oled_height, this);
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_PROGRESSBAR_Y_POSITION, &t.glcd_progressbar_y_position, t.glcd_progressbar, 0, oled_height, this);
gts->addItem(nc);
ProgressActivate.Add(nc);
CColorChooser *bar = new CColorChooser(LOCALE_GLCD_SELECT_BAR, &t.glcd_progressbar_color_red, &t.glcd_progressbar_color_green, &t.glcd_progressbar_color_blue, NULL, colorSetupNotifier);
mf = new CMenuDForwarder(LOCALE_GLCD_SELECT_BAR, t.glcd_progressbar, NULL, bar);
CColorChooser *bar = new CColorChooser(LOCALE_GLCD_PROGRESSBAR_COLOR, &t.glcd_progressbar_color_red, &t.glcd_progressbar_color_green, &t.glcd_progressbar_color_blue, NULL, colorSetupNotifier);
mf = new CMenuDForwarder(LOCALE_GLCD_PROGRESSBAR_COLOR, t.glcd_progressbar, NULL, bar);
gts->addItem(mf);
ProgressActivate.Add(mf);
@@ -624,13 +624,13 @@ int GLCD_Menu::GLCD_Theme_Settings()
// time
gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_TIME, &t.glcd_time, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_TIME_SHOW, &t.glcd_time, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_TIME, &t.glcd_time_percent, t.glcd_time, 0, 100, this);
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_TIME_SIZE, &t.glcd_time_percent, t.glcd_time, 0, 100, this);
gts->addItem(nc);
TimeActivate.Add(nc);
oc = new CMenuOptionChooser(LOCALE_GLCD_ALIGN_TIME, &t.glcd_time_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, t.glcd_time, NULL);
oc = new CMenuOptionChooser(LOCALE_GLCD_TIME_ALIGN, &t.glcd_time_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, t.glcd_time, NULL);
gts->addItem(oc);
TimeActivate.Add(oc);
@@ -646,7 +646,7 @@ int GLCD_Menu::GLCD_Theme_Settings()
// weather
gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_WEATHER, &t.glcd_weather, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_WEATHER_SHOW, &t.glcd_weather, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
nc = new CMenuOptionNumberChooser(LOCALE_GLCD_WEATHER_PERCENT, &t.glcd_weather_percent, t.glcd_weather, 0, 100, this);
gts->addItem(nc);

16
src/gui/glcdthemes.cpp
View File

@@ -343,16 +343,16 @@ void CGLCDThemes::setTheme(CConfigFile &configfile)
configfile.setInt32("glcd_icon_timer_x_position", t.glcd_icon_timer_x_position);
configfile.setInt32("glcd_icon_rec_x_position", t.glcd_icon_rec_x_position);
configfile.setInt32("glcd_icon_ts_x_position", t.glcd_icon_ts_x_position);
configfile.setInt32("glcd_standby_clock", t.glcd_standby_clock);
configfile.setInt32("glcd_standby_clock_digital_y_position", t.glcd_standby_clock_digital_y_position);
configfile.setInt32("glcd_standby_clock_simple_size", t.glcd_standby_clock_simple_size);
configfile.setInt32("glcd_standby_clock_simple_y_position", t.glcd_standby_clock_simple_y_position);
configfile.setBool("glcd_weather", t.glcd_weather);
configfile.setInt32("glcd_weather_percent", t.glcd_weather_percent);
configfile.setInt32("glcd_weather_curr_x_position", t.glcd_weather_curr_x_position);
configfile.setInt32("glcd_weather_next_x_position", t.glcd_weather_next_x_position);
configfile.setInt32("glcd_weather_y_position", t.glcd_weather_y_position);
configfile.setInt32("glcd_time_in_standby", t.glcd_time_in_standby);
configfile.setInt32("glcd_standby_weather", t.glcd_standby_weather);
configfile.setInt32("glcd_standby_clock_digital_y_position", t.glcd_standby_clock_digital_y_position);
configfile.setInt32("glcd_standby_clock_simple_size", t.glcd_standby_clock_simple_size);
configfile.setInt32("glcd_standby_clock_simple_y_position", t.glcd_standby_clock_simple_y_position);
configfile.setInt32("glcd_standby_weather_percent", t.glcd_standby_weather_percent);
configfile.setInt32("glcd_standby_weather_curr_x_position", t.glcd_standby_weather_curr_x_position);
configfile.setInt32("glcd_standby_weather_next_x_position", t.glcd_standby_weather_next_x_position);
@@ -421,16 +421,16 @@ void CGLCDThemes::getTheme(CConfigFile &configfile)
t.glcd_icon_timer_x_position = configfile.getInt32("glcd_icon_timer_x_position", 0);
t.glcd_icon_rec_x_position = configfile.getInt32("glcd_icon_rec_x_position", 0);
t.glcd_icon_ts_x_position = configfile.getInt32("glcd_icon_ts_x_position", 0);
t.glcd_standby_clock = configfile.getInt32("glcd_standby_clock", 1);
t.glcd_standby_clock_digital_y_position = configfile.getInt32("glcd_standby_clock_digital_y_position", 0);
t.glcd_standby_clock_simple_size = configfile.getInt32("glcd_standby_clock_simple_size", 0);
t.glcd_standby_clock_simple_y_position = configfile.getInt32("glcd_standby_clock_simple_y_position", 0);
t.glcd_weather = configfile.getBool("glcd_weather", false);
t.glcd_weather_percent = configfile.getInt32("glcd_weather_percent", 15);
t.glcd_weather_curr_x_position = configfile.getInt32("glcd_weather_curr_x_position", 0);
t.glcd_weather_next_x_position = configfile.getInt32("glcd_weather_next_x_position", 0);
t.glcd_weather_y_position = configfile.getInt32("glcd_weather_y_position", 0);
t.glcd_time_in_standby = configfile.getInt32("glcd_time_in_standby", 1);
t.glcd_standby_weather = configfile.getInt32("glcd_standby_weather", 1);
t.glcd_standby_clock_digital_y_position = configfile.getInt32("glcd_standby_clock_digital_y_position", 0);
t.glcd_standby_clock_simple_size = configfile.getInt32("glcd_standby_clock_simple_size", 0);
t.glcd_standby_clock_simple_y_position = configfile.getInt32("glcd_standby_clock_simple_y_position", 0);
t.glcd_standby_weather_percent = configfile.getInt32("glcd_standby_weather_percent", 40);
t.glcd_standby_weather_curr_x_position = configfile.getInt32("glcd_standby_weather_curr_x_position", 0);
t.glcd_standby_weather_next_x_position = configfile.getInt32("glcd_standby_weather_next_x_position", 0);

90
src/system/locals.h
View File

@@ -881,24 +881,22 @@ typedef enum
LOCALE_FSK_TO_16,
LOCALE_FSK_TO_7,
LOCALE_GLCD_ALIGN_CENTER,
LOCALE_GLCD_ALIGN_CHANNEL,
LOCALE_GLCD_ALIGN_DURATION,
LOCALE_GLCD_ALIGN_END,
LOCALE_GLCD_ALIGN_EPG,
LOCALE_GLCD_ALIGN_LEFT,
LOCALE_GLCD_ALIGN_NONE,
LOCALE_GLCD_ALIGN_RIGHT,
LOCALE_GLCD_ALIGN_START,
LOCALE_GLCD_ALIGN_TIME,
LOCALE_GLCD_BACKGROUND,
LOCALE_GLCD_BAR_WIDTH,
LOCALE_GLCD_BAR_X_POSITION,
LOCALE_GLCD_BAR_Y_POSITION,
LOCALE_GLCD_BRIGHTNESS,
LOCALE_GLCD_BRIGHTNESS_DIM,
LOCALE_GLCD_BRIGHTNESS_DIM_TIME,
LOCALE_GLCD_BRIGHTNESS_SETTINGS,
LOCALE_GLCD_BRIGHTNESS_STANDBY,
LOCALE_GLCD_CHANNEL_ALIGN,
LOCALE_GLCD_CHANNEL_SIZE,
LOCALE_GLCD_CHANNEL_X_POSITION,
LOCALE_GLCD_CHANNEL_Y_POSITION,
LOCALE_GLCD_CLOCK_DIGITAL_Y_POSITION,
LOCALE_GLCD_CLOCK_SIMPLE_SIZE,
LOCALE_GLCD_CLOCK_SIMPLE_Y_POSITION,
LOCALE_GLCD_COLOR_AMBER,
LOCALE_GLCD_COLOR_BLACK,
LOCALE_GLCD_COLOR_BLUE,
@@ -920,15 +918,22 @@ typedef enum
LOCALE_GLCD_COLOR_TEAL,
LOCALE_GLCD_COLOR_WHITE,
LOCALE_GLCD_COLOR_YELLOW,
LOCALE_GLCD_CHANNEL_X_POSITION,
LOCALE_GLCD_CHANNEL_Y_POSITION,
LOCALE_GLCD_DIGITAL_CLOCK_Y_POSITION,
LOCALE_GLCD_COLOR_BG,
LOCALE_GLCD_COLOR_FG,
LOCALE_GLCD_DISPLAY,
LOCALE_GLCD_DURATION_ALIGN,
LOCALE_GLCD_DURATION_SHOW,
LOCALE_GLCD_DURATION_SIZE,
LOCALE_GLCD_DURATION_X_POSITION,
LOCALE_GLCD_DURATION_Y_POSITION,
LOCALE_GLCD_ENABLE,
LOCALE_GLCD_END_ALIGN,
LOCALE_GLCD_END_SHOW,
LOCALE_GLCD_END_SIZE,
LOCALE_GLCD_END_X_POSITION,
LOCALE_GLCD_END_Y_POSITION,
LOCALE_GLCD_EPG_ALIGN,
LOCALE_GLCD_EPG_SIZE,
LOCALE_GLCD_EPG_X_POSITION,
LOCALE_GLCD_EPG_Y_POSITION,
LOCALE_GLCD_FONT,
@@ -944,59 +949,54 @@ typedef enum
LOCALE_GLCD_ICON_TXT_X_POSITION,
LOCALE_GLCD_ICON_Y_PERCENT,
LOCALE_GLCD_ICON_Y_POSITION,
LOCALE_GLCD_LOGODIR,
LOCALE_GLCD_LOGO_SHOW,
LOCALE_GLCD_LOGO_SIZE,
LOCALE_GLCD_LOGO_WIDTH,
LOCALE_GLCD_LOGO_X_POSITION,
LOCALE_GLCD_LOGO_Y_POSITION,
LOCALE_GLCD_LOGODIR,
LOCALE_GLCD_MIRROR_OSD,
LOCALE_GLCD_MIRROR_VIDEO,
LOCALE_GLCD_POSITION_SETTINGS,
LOCALE_GLCD_PROGRESSBAR_COLOR,
LOCALE_GLCD_PROGRESSBAR_SHOW,
LOCALE_GLCD_PROGRESSBAR_SIZE,
LOCALE_GLCD_PROGRESSBAR_WIDTH,
LOCALE_GLCD_PROGRESSBAR_X_POSITION,
LOCALE_GLCD_PROGRESSBAR_Y_POSITION,
LOCALE_GLCD_RESTART,
LOCALE_GLCD_SCROLL_SPEED,
LOCALE_GLCD_SELECT_BAR,
LOCALE_GLCD_SELECT_BG,
LOCALE_GLCD_SELECT_FG,
LOCALE_GLCD_SHOW_DURATION,
LOCALE_GLCD_SHOW_END,
LOCALE_GLCD_SHOW_LOGO,
LOCALE_GLCD_SHOW_PROGRESSBAR,
LOCALE_GLCD_SHOW_START,
LOCALE_GLCD_SHOW_TIME,
LOCALE_GLCD_SHOW_WEATHER,
LOCALE_GLCD_SIMPLE_CLOCK_Y_POSITION,
LOCALE_GLCD_SIZE_BAR,
LOCALE_GLCD_SIZE_CHANNEL,
LOCALE_GLCD_SIZE_DURATION,
LOCALE_GLCD_SIZE_END,
LOCALE_GLCD_SIZE_EPG,
LOCALE_GLCD_SIZE_LOGO,
LOCALE_GLCD_SIZE_SIMPLE_CLOCK,
LOCALE_GLCD_SIZE_START,
LOCALE_GLCD_SIZE_TIME,
LOCALE_GLCD_SIZE_TIME_STANDBY,
LOCALE_GLCD_THEME,
LOCALE_GLCD_THEME_SETTINGS,
LOCALE_GLCD_STANDBY_ANALOG_CLOCK,
LOCALE_GLCD_STANDBY_DIGITAL_CLOCK,
LOCALE_GLCD_STANDBY_LCD_CLOCK,
LOCALE_GLCD_STANDBY_LED_CLOCK,
LOCALE_GLCD_STANDBY_CLOCK,
LOCALE_GLCD_STANDBY_CLOCK_ANALOG,
LOCALE_GLCD_STANDBY_CLOCK_DIGITAL,
LOCALE_GLCD_STANDBY_CLOCK_LCD,
LOCALE_GLCD_STANDBY_CLOCK_LED,
LOCALE_GLCD_STANDBY_CLOCK_SIMPLE,
LOCALE_GLCD_STANDBY_SETTINGS,
LOCALE_GLCD_STANDBY_SIMPLE_CLOCK,
LOCALE_GLCD_STANDBY_WEATHER,
LOCALE_GLCD_STANDBY_WEATHER_PERCENT,
LOCALE_GLCD_STANDBY_WEATHER_CURR_X_POSITION,
LOCALE_GLCD_STANDBY_WEATHER_NEXT_X_POSITION,
LOCALE_GLCD_STANDBY_WEATHER_PERCENT,
LOCALE_GLCD_STANDBY_WEATHER_Y_POSITION,
LOCALE_GLCD_START_ALIGN,
LOCALE_GLCD_START_SHOW,
LOCALE_GLCD_START_SIZE,
LOCALE_GLCD_START_X_POSITION,
LOCALE_GLCD_START_Y_POSITION,
LOCALE_GLCD_TIME_IN_STANDBY,
LOCALE_GLCD_THEME,
LOCALE_GLCD_THEME_SETTINGS,
LOCALE_GLCD_TIME_ALIGN,
LOCALE_GLCD_TIME_SHOW,
LOCALE_GLCD_TIME_SIZE,
LOCALE_GLCD_TIME_SIZE_STANDBY,
LOCALE_GLCD_TIME_X_POSITION,
LOCALE_GLCD_TIME_Y_POSITION,
LOCALE_GLCD_VOLUME,
LOCALE_GLCD_WEATHER_PERCENT,
LOCALE_GLCD_WEATHER_CURR_X_POSITION,
LOCALE_GLCD_WEATHER_NEXT_X_POSITION,
LOCALE_GLCD_WEATHER_PERCENT,
LOCALE_GLCD_WEATHER_SHOW,
LOCALE_GLCD_WEATHER_Y_POSITION,
LOCALE_GLCD_WIDTH_LOGO,
LOCALE_HDD_10MIN,
LOCALE_HDD_1MIN,
LOCALE_HDD_20MIN,

90
src/system/locals_intern.h
View File

@@ -881,24 +881,22 @@ const char * locale_real_names[] =
"fsk.to_16",
"fsk.to_7",
"glcd.align_center",
"glcd.align_channel",
"glcd.align_duration",
"glcd.align_end",
"glcd.align_epg",
"glcd.align_left",
"glcd.align_none",
"glcd.align_right",
"glcd.align_start",
"glcd.align_time",
"glcd.background",
"glcd.bar_width",
"glcd.bar_x_position",
"glcd.bar_y_position",
"glcd.brightness",
"glcd.brightness_dim",
"glcd.brightness_dim_time",
"glcd.brightness_settings",
"glcd.brightness_standby",
"glcd.channel_align",
"glcd.channel_size",
"glcd.channel_x_position",
"glcd.channel_y_position",
"glcd.clock_digital_y_position",
"glcd.clock_simple_size",
"glcd.clock_simple_y_position",
"glcd.color.amber",
"glcd.color.black",
"glcd.color.blue",
@@ -920,15 +918,22 @@ const char * locale_real_names[] =
"glcd.color.teal",
"glcd.color.white",
"glcd.color.yellow",
"glcd.channel_x_position",
"glcd.channel_y_position",
"glcd.digital_clock_y_position",
"glcd.color_bg",
"glcd.color_fg",
"glcd.display",
"glcd.duration_align",
"glcd.duration_show",
"glcd.duration_size",
"glcd.duration_x_position",
"glcd.duration_y_position",
"glcd.enable",
"glcd.end_align",
"glcd.end_show",
"glcd.end_size",
"glcd.end_x_position",
"glcd.end_y_position",
"glcd.epg_align",
"glcd.epg_size",
"glcd.epg_x_position",
"glcd.epg_y_position",
"glcd.font",
@@ -944,59 +949,54 @@ const char * locale_real_names[] =
"glcd.icon_txt_x_position",
"glcd.icon_y_percent",
"glcd.icon_y_position",
"glcd.logodir",
"glcd.logo_show",
"glcd.logo_size",
"glcd.logo_width",
"glcd.logo_x_position",
"glcd.logo_y_position",
"glcd.logodir",
"glcd.mirror_osd",
"glcd.mirror_video",
"glcd.position_settings",
"glcd.progressbar_color",
"glcd.progressbar_show",
"glcd.progressbar_size",
"glcd.progressbar_width",
"glcd.progressbar_x_position",
"glcd.progressbar_y_position",
"glcd.restart",
"glcd.scroll_speed",
"glcd.select.bar",
"glcd.select.bg",
"glcd.select.fg",
"glcd.show_duration",
"glcd.show_end",
"glcd.show_logo",
"glcd.show_progressbar",
"glcd.show_start",
"glcd.show_time",
"glcd.show_weather",
"glcd.simple_clock_y_position",
"glcd.size_bar",
"glcd.size_channel",
"glcd.size_duration",
"glcd.size_end",
"glcd.size_epg",
"glcd.size_logo",
"glcd.size_simple_clock",
"glcd.size_start",
"glcd.size_time",
"glcd.size_time_standby",
"glcd.theme",
"glcd.theme_settings",
"glcd.standby_analog_clock",
"glcd.standby_digital_clock",
"glcd.standby_lcd_clock",
"glcd.standby_led_clock",
"glcd.standby_clock",
"glcd.standby_clock_analog",
"glcd.standby_clock_digital",
"glcd.standby_clock_lcd",
"glcd.standby_clock_led",
"glcd.standby_clock_simple",
"glcd.standby_settings",
"glcd.standby_simple_clock",
"glcd.standby_weather",
"glcd.standby_weather_percent",
"glcd.standby_weather_curr_x_position",
"glcd.standby_weather_next_x_position",
"glcd.standby_weather_percent",
"glcd.standby_weather_y_position",
"glcd.start_align",
"glcd.start_show",
"glcd.start_size",
"glcd.start_x_position",
"glcd.start_y_position",
"glcd.time_in_standby",
"glcd.theme",
"glcd.theme_settings",
"glcd.time_align",
"glcd.time_show",
"glcd.time_size",
"glcd.time_size_standby",
"glcd.time_x_position",
"glcd.time_y_position",
"glcd.volume",
"glcd.weather_percent",
"glcd.weather_curr_x_position",
"glcd.weather_next_x_position",
"glcd.weather_percent",
"glcd.weather_show",
"glcd.weather_y_position",
"glcd.width_logo",
"hdd_10min",
"hdd_1min",
"hdd_20min",

11
src/system/settings.h
View File

@@ -286,19 +286,18 @@ struct SNeutrinoGlcdTheme
int glcd_icon_rec_x_position;
int glcd_icon_ts_x_position;
int glcd_standby_clock;
int glcd_standby_clock_digital_y_position;
int glcd_standby_clock_simple_size;
int glcd_standby_clock_simple_y_position;
int glcd_weather;
int glcd_weather_percent;
int glcd_weather_curr_x_position;
int glcd_weather_next_x_position;
int glcd_weather_y_position;
int glcd_time_in_standby;
int glcd_standby_weather;
int glcd_standby_clock_digital_y_position;
int glcd_standby_clock_simple_size;
int glcd_standby_clock_simple_y_position;
int glcd_standby_weather_percent;
int glcd_standby_weather_curr_x_position;
int glcd_standby_weather_next_x_position;