mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-17 18:33:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

update glcd

Browse Source 
Conflicts:
	src/gui/movieplayer.h
	src/gui/weather_locations.h
	src/neutrino.cpp
This commit is contained in:
redblue-pkt
2020-06-19 23:56:12 +02:00
committed by Thilo Graf
parent 6435b167e5
commit 1b6f4fedf5
118 changed files with 6154 additions and 1538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/system/locals.h
View File

@@ -857,10 +857,24 @@ typedef enum
LOCALE_FSK_TO_12,
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_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_CLOCK_ANALOG,
LOCALE_GLCD_CLOCK_DIGITAL_HM,
LOCALE_GLCD_COLOR_AMBER,
LOCALE_GLCD_COLOR_BLACK,
LOCALE_GLCD_COLOR_BLUE,
@@ -882,25 +896,62 @@ 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_DISPLAY,
LOCALE_GLCD_DURATION_X_POSITION,
LOCALE_GLCD_DURATION_Y_POSITION,
LOCALE_GLCD_ENABLE,
LOCALE_GLCD_END_X_POSITION,
LOCALE_GLCD_END_Y_POSITION,
LOCALE_GLCD_EPG_X_POSITION,
LOCALE_GLCD_EPG_Y_POSITION,
LOCALE_GLCD_FONT,
LOCALE_GLCD_FONT_AUTORESIZE,
LOCALE_GLCD_HEAD,
LOCALE_GLCD_LOGO_X_POSITION,
LOCALE_GLCD_LOGO_Y_POSITION,
LOCALE_GLCD_MIRROR_OSD,
LOCALE_GLCD_MIRROR_VIDEO,
LOCALE_GLCD_POSITION_SETTINGS,
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_POSITION_SETTINGS,
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_SETTINGS,
LOCALE_GLCD_STANDBY_WEATHER,
LOCALE_GLCD_START_X_POSITION,
LOCALE_GLCD_START_Y_POSITION,
LOCALE_GLCD_TIME_IN_STANDBY,
LOCALE_GLCD_TIME_X_POSITION,
LOCALE_GLCD_TIME_Y_POSITION,
LOCALE_GLCD_VOLUME,
LOCALE_HDD_10MIN,
LOCALE_HDD_1MIN,
@@ -1699,6 +1750,7 @@ typedef enum
LOCALE_MENU_HINT_VOLUME_POS,
LOCALE_MENU_HINT_VOLUME_SIZE,
LOCALE_MENU_HINT_WEATHER_API_KEY,
LOCALE_MENU_HINT_WEATHER_COUNTRY,
LOCALE_MENU_HINT_WEATHER_ENABLED,
LOCALE_MENU_HINT_WEATHER_LOCATION,
LOCALE_MENU_HINT_WEBRADIO_SETUP,
@@ -2771,6 +2823,9 @@ typedef enum
LOCALE_VIDEOMENU_ZAPPINGMODE_MUTE,
LOCALE_VIDEOMENU_ZAPPINGMODE_HOLD,
LOCALE_WEATHER_API_KEY,
LOCALE_WEATHER_COUNTRY,
LOCALE_WEATHER_COUNTRY_DEUTSCHLAND,
LOCALE_WEATHER_COUNTRY_NORWAY,
LOCALE_WEATHER_ENABLED,
LOCALE_WEATHER_LOCATION,
LOCALE_WEBRADIO_HEAD,

59
src/system/locals_intern.h
View File

@@ -857,10 +857,24 @@ const char * locale_real_names[] =
"fsk.to_12",
"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.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.clock.analog",
"glcd.clock.digital_hm",
"glcd.color.amber",
"glcd.color.black",
"glcd.color.blue",
@@ -882,25 +896,62 @@ 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.display",
"glcd.duration_x_position",
"glcd.duration_y_position",
"glcd.enable",
"glcd.end_x_position",
"glcd.end_y_position",
"glcd.epg_x_position",
"glcd.epg_y_position",
"glcd.font",
"glcd.font_autoresize",
"glcd.head",
"glcd.logo_x_position",
"glcd.logo_y_position",
"glcd.mirror_osd",
"glcd.mirror_video",
"glcd.position_settings",
"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_position_settings",
"glcd.theme_settings",
"glcd.standby_analog_clock",
"glcd.standby_digital_clock",
"glcd.standby_lcd_clock",
"glcd.standby_led_clock",
"glcd.standby_settings",
"glcd.standby_weather",
"glcd.start_x_position",
"glcd.start_y_position",
"glcd.time_in_standby",
"glcd.time_x_position",
"glcd.time_y_position",
"glcd.volume",
"hdd_10min",
"hdd_1min",
@@ -1699,6 +1750,7 @@ const char * locale_real_names[] =
"menu.hint_volume_pos",
"menu.hint_volume_size",
"menu.hint_weather_api_key",
"menu.hint_weather_country",
"menu.hint_weather_enabled",
"menu.hint_weather_location",
"menu.hint_webradio_setup",
@@ -2771,6 +2823,9 @@ const char * locale_real_names[] =
"videomenu.zappingmode_mute",
"videomenu.zappingmode_hold",
"weather.api_key",
"weather.country",
"weather.country_deutschland",
"weather.country_norway",
"weather.enabled",
"weather.location",
"webradio.head",

132
src/system/settings.h
View File

@@ -183,6 +183,108 @@ struct timer_remotebox_item
bool online;
};
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K
#define GLCD_DEFAULT_BRIGHTNESS 7
#define GLCD_DEFAULT_BRIGHTNESS_STANDBY 1
#define GLCD_DEFAULT_BRIGHTNESS_DIM 3
#define GLCD_DEFAULT_BRIGHTNESS_DIM_TIME "10"
#else
#define GLCD_DEFAULT_BRIGHTNESS 70
#define GLCD_DEFAULT_BRIGHTNESS_STANDBY 10
#define GLCD_DEFAULT_BRIGHTNESS_DIM 30
#define GLCD_DEFAULT_BRIGHTNESS_DIM_TIME "30"
#endif
struct SNeutrinoGlcdTheme
{
unsigned char glcd_color_fg_red;
unsigned char glcd_color_fg_green;
unsigned char glcd_color_fg_blue;
unsigned char glcd_color_bg_red;
unsigned char glcd_color_bg_green;
unsigned char glcd_color_bg_blue;
unsigned char glcd_color_bar_red;
unsigned char glcd_color_bar_green;
unsigned char glcd_color_bar_blue;
std::string glcd_font;
std::string glcd_background;
int glcd_show_progressbar;
int glcd_show_duration;
int glcd_show_start;
int glcd_show_end;
int glcd_show_time;
int glcd_show_weather;
int glcd_align_channel;
int glcd_align_epg;
int glcd_align_duration;
int glcd_align_start;
int glcd_align_end;
int glcd_align_time;
int glcd_percent_channel;
int glcd_channel_x_position;
int glcd_channel_y_position;
int glcd_percent_epg;
int glcd_epg_x_position;
int glcd_epg_y_position;
int glcd_percent_duration;
int glcd_duration_x_position;
int glcd_duration_y_position;
int glcd_percent_start;
int glcd_start_x_position;
int glcd_start_y_position;
int glcd_percent_end;
int glcd_end_x_position;
int glcd_end_y_position;
int glcd_percent_time;
int glcd_time_x_position;
int glcd_time_y_position;
int glcd_percent_bar;
int glcd_bar_x_position;
int glcd_bar_y_position;
int glcd_bar_width;
int glcd_percent_logo;
int glcd_logo_x_position;
int glcd_logo_y_position;
int glcd_percent_smalltext;
int glcd_smalltext_y_position;
int glcd_rec_icon_x_position;
int glcd_mute_icon_x_position;
int glcd_ts_icon_x_position;
int glcd_timer_icon_x_position;
int glcd_ecm_icon_x_position;
int glcd_dd_icon_x_position;
int glcd_txt_icon_x_position;
int glcd_cam_icon_x_position;
int glcd_standby_weather;
int glcd_digital_clock_y_position;
int glcd_size_simple_clock;
int glcd_simple_clock_y_position;
int glcd_weather_x_position_current;
int glcd_weather_x_position_next;
int glcd_weather_y_position;
int glcd_weather_x_position_current_standby;
int glcd_weather_x_position_next_standby;
int glcd_weather_y_position_standby;
int glcd_position_settings;
};
struct SNeutrinoSettings
{
std::string version_pseudo;
@@ -481,6 +583,8 @@ struct SNeutrinoSettings
//theme/color options
SNeutrinoTheme theme;
std::string theme_name;
SNeutrinoGlcdTheme glcd_theme;
std::string glcd_theme_name;
bool osd_colorsettings_advanced_mode;
//network
@@ -805,22 +909,18 @@ struct SNeutrinoSettings
#ifdef ENABLE_GRAPHLCD
// graphlcd
int glcd_enable;
uint32_t glcd_color_fg;
uint32_t glcd_color_bg;
uint32_t glcd_color_bar;
std::string glcd_font;
int glcd_percent_channel;
int glcd_percent_epg;
int glcd_percent_bar;
int glcd_percent_time;
int glcd_percent_time_standby;
int glcd_percent_logo;
int glcd_time_in_standby;
int glcd_standby_weather;
int glcd_mirror_osd;
int glcd_mirror_video;
int glcd_time_in_standby;
int glcd_show_logo;
int glcd_brightness;
int glcd_brightness_standby;
int glcd_brightness_dim;
std::string glcd_brightness_dim_time;
int glcd_scroll_speed;
int glcd_selected_config;
#endif
@@ -899,6 +999,7 @@ struct SNeutrinoSettings
//online services
std::string weather_api_key;
int weather_enabled;
int weather_country;
std::string weather_location;
std::string weather_city;
std::string youtube_dev_id;
@@ -943,6 +1044,15 @@ struct SNeutrinoSettings
int font_scaling_x;
int font_scaling_y;
int ca_init;
int show_menu_hints_line;
#define MODE_ICONS_NR_OF_ENTRIES 8
int mode_icons;
int mode_icons_background;
int mode_icons_skin;
std::string mode_icons_flag[MODE_ICONS_NR_OF_ENTRIES];
int livestreamResolution;
std::string livestreamScriptPath;