- channellist: allow epgtext alignment

Conflicts:
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2022-05-06 23:41:05 +02:00
committed by Thilo Graf
parent 2cdbdb5ce4
commit 0f3dee2e57
11 changed files with 86 additions and 50 deletions

View File

@@ -298,8 +298,10 @@ typedef enum
LOCALE_CHANNELLIST_ENABLESDT_OFF,
LOCALE_CHANNELLIST_ENABLESDT_ON,
LOCALE_CHANNELLIST_ENABLESDT_ON_EXTENDED,
LOCALE_CHANNELLIST_EPGTEXT_ALIGN_LEFT,
LOCALE_CHANNELLIST_EPGTEXT_ALIGN_RIGHT,
LOCALE_CHANNELLIST_EPGTEXT_ALIGN_LEFT_BOTTOM,
LOCALE_CHANNELLIST_EPGTEXT_ALIGN_LEFT_MIDDLE,
LOCALE_CHANNELLIST_EPGTEXT_ALIGN_RIGHT_BOTTOM,
LOCALE_CHANNELLIST_EPGTEXT_ALIGN_RIGHT_MIDDLE,
LOCALE_CHANNELLIST_EXTENDED,
LOCALE_CHANNELLIST_FAVS,
LOCALE_CHANNELLIST_FOOT,
@@ -1844,7 +1846,7 @@ typedef enum
LOCALE_MESSAGEBOX_YES,
LOCALE_MISCSETTINGS_CHANNELLIST,
LOCALE_MISCSETTINGS_CHANNELLIST_ENABLESDT,
LOCALE_MISCSETTINGS_CHANNELLIST_EPGTEXT_ALIGN,
LOCALE_MISCSETTINGS_CHANNELLIST_EPGTEXT_ALIGNMENT,
LOCALE_MISCSETTINGS_CHANNELLOGOS,
LOCALE_MISCSETTINGS_COLORED_EVENTS,
LOCALE_MISCSETTINGS_COLORED_EVENTS_0,
@@ -2658,8 +2660,10 @@ typedef enum
LOCALE_SETTINGS_POS_BOTTOM_CENTER,
LOCALE_SETTINGS_POS_BOTTOM_LEFT,
LOCALE_SETTINGS_POS_BOTTOM_RIGHT,
LOCALE_SETTINGS_POS_DEFAULT_CENTER,
LOCALE_SETTINGS_POS_CENTER,
LOCALE_SETTINGS_POS_HIGHER_CENTER,
LOCALE_SETTINGS_POS_LEFT,
LOCALE_SETTINGS_POS_RIGHT,
LOCALE_SETTINGS_POS_TOP_CENTER,
LOCALE_SETTINGS_POS_TOP_LEFT,
LOCALE_SETTINGS_POS_TOP_RIGHT,

View File

@@ -298,8 +298,10 @@ const char * locale_real_names[] =
"channellist.enablesdt_off",
"channellist.enablesdt_on",
"channellist.enablesdt_on_extended",
"channellist.epgtext_align_left",
"channellist.epgtext_align_right",
"channellist.epgtext_align_left_bottom",
"channellist.epgtext_align_left_middle",
"channellist.epgtext_align_right_bottom",
"channellist.epgtext_align_right_middle",
"channellist.extended",
"channellist.favs",
"channellist.foot",
@@ -1844,7 +1846,7 @@ const char * locale_real_names[] =
"messagebox.yes",
"miscsettings.channellist",
"miscsettings.channellist_enablesdt",
"miscsettings.channellist_epgtext_align",
"miscsettings.channellist_epgtext_alignment",
"miscsettings.channellogos",
"miscsettings.colored_events",
"miscsettings.colored_events_0",
@@ -2658,8 +2660,10 @@ const char * locale_real_names[] =
"settings.pos_bottom_center",
"settings.pos_bottom_left",
"settings.pos_bottom_right",
"settings.pos_default_center",
"settings.pos_center",
"settings.pos_higher_center",
"settings.pos_left",
"settings.pos_right",
"settings.pos_top_center",
"settings.pos_top_left",
"settings.pos_top_right",

View File

@@ -1052,7 +1052,7 @@ struct SNeutrinoSettings
};
int channellist_additional;
int channellist_epgtext_align_right;
int channellist_epgtext_alignment;
int channellist_foot;
int channellist_new_zap_mode;
int channellist_numeric_adjust;