mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 01:41:23 +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

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;