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

- glcd: rename theme item names

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-07-14 21:35:13 +02:00
committed by Thilo Graf
parent 55db756e31
commit 39caf20758
16 changed files with 818 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
data/oled/themes/400x240/Default.otheme
View File

@@ -1,73 +1,73 @@
# align none 0, align left 1, align center 2, align right 3
# if align > 0 x position will be ignore
# if glcd_background != "" background color will be ignore
# if glcd_position_settings != false this allow to edit position settings over gui
glcd_color_fg_red=100
glcd_color_fg_green=100
glcd_color_fg_blue=100
glcd_color_bg_red=0
glcd_color_bg_green=0
glcd_color_bg_blue=0
glcd_color_bar_red=62
glcd_color_bar_green=62
glcd_color_bar_blue=62
# align 0=none, 1=left, 2=center, 3=right
# if align > 0 x_position will be ignored
# if glcd_background_image != "" background color will be ignored
# glcd_position_settings != false allows to edit position settings in gui
glcd_foreground_color_red=100
glcd_foreground_color_green=100
glcd_foreground_color_blue=100
glcd_background_color_red=0
glcd_background_color_green=0
glcd_background_color_blue=0
glcd_background_image=
glcd_font=/share/fonts/neutrino.ttf
glcd_background=
glcd_align_channel=2
glcd_align_epg=2
glcd_align_duration=0
glcd_align_start=0
glcd_align_end=0
glcd_align_time=2
glcd_show_logo=true
glcd_show_progressbar=true
glcd_show_duration=false
glcd_show_start=false
glcd_show_end=false
glcd_show_time=true
glcd_show_weather=false
glcd_percent_channel=25
glcd_channel_percent=25
glcd_channel_align=2
glcd_channel_x_position=0
glcd_channel_y_position=19
glcd_percent_epg=15
glcd_epg_x_position=0
glcd_epg_y_position=97
glcd_percent_duration=0
glcd_duration_x_position=0
glcd_duration_y_position=0
glcd_percent_start=0
glcd_start_x_position=0
glcd_start_y_position=0
glcd_percent_end=0
glcd_end_x_position=0
glcd_end_y_position=0
glcd_percent_time=25
glcd_time_x_position=0
glcd_time_y_position=172
glcd_percent_bar=20
glcd_bar_x_position=0
glcd_bar_y_position=157
glcd_bar_width=400
glcd_percent_logo=25
glcd_logo=true
glcd_logo_percent=25
glcd_logo_x_position=0
glcd_logo_y_position=19
glcd_percent_smalltext=4
glcd_smalltext_y_position=4
glcd_rec_icon_x_position=332
glcd_mute_icon_x_position=228
glcd_ts_icon_x_position=369
glcd_timer_icon_x_position=278
glcd_ecm_icon_x_position=83
glcd_dd_icon_x_position=198
glcd_txt_icon_x_position=161
glcd_cam_icon_x_position=123
glcd_digital_clock_y_position=15
glcd_size_simple_clock=40
glcd_simple_clock_y_position=15
glcd_weather_x_position_current=0
glcd_weather_x_position_next=0
glcd_epg_percent=15
glcd_epg_align=2
glcd_epg_x_position=0
glcd_epg_y_position=97
glcd_start=false
glcd_start_percent=0
glcd_start_align=0
glcd_start_x_position=0
glcd_start_y_position=0
glcd_end=false
glcd_end_percent=0
glcd_end_align=0
glcd_end_x_position=0
glcd_end_y_position=0
glcd_duration=false
glcd_duration_align=0
glcd_duration_percent=0
glcd_duration_x_position=0
glcd_duration_y_position=0
glcd_progressbar=true
glcd_progressbar_color_red=62
glcd_progressbar_color_green=62
glcd_progressbar_color_blue=62
glcd_progressbar_percent=20
glcd_progressbar_width=400
glcd_progressbar_x_position=0
glcd_progressbar_y_position=157
glcd_time=true
glcd_time_percent=25
glcd_time_align=2
glcd_time_x_position=0
glcd_time_y_position=172
glcd_icons_percent=4
glcd_icons_y_position=4
glcd_icon_ecm_x_position=83
glcd_icon_cam_x_position=123
glcd_icon_txt_x_position=161
glcd_icon_dd_x_position=198
glcd_icon_mute_x_position=228
glcd_icon_timer_x_position=278
glcd_icon_rec_x_position=332
glcd_icon_ts_x_position=369
glcd_weather=false
glcd_weather_curr_x_position=0
glcd_weather_next_x_position=0
glcd_weather_y_position=0
glcd_weather_x_position_current_standby=8
glcd_weather_x_position_next_standby=283
glcd_weather_y_position_standby=131
glcd_standby_clock_digital_y_position=15
glcd_standby_clock_simple_size=40
glcd_standby_clock_simple_y_position=15
glcd_standby_weather_curr_x_position=8
glcd_standby_weather_next_x_position=283
glcd_standby_weather_y_position=131
glcd_position_settings=true

132
data/oled/themes/480x320/Advanced.otheme
View File

@@ -1,73 +1,73 @@
# align none 0, align left 1, align center 2, align right 3
# if align > 0 x position will be ignore
# if glcd_background != "" background color will be ignore
# if glcd_position_settings != false this allow to edit position settings over gui
glcd_color_fg_red=100
glcd_color_fg_green=100
glcd_color_fg_blue=100
glcd_color_bg_red=0
glcd_color_bg_green=0
glcd_color_bg_blue=0
glcd_color_bar_red=62
glcd_color_bar_green=62
glcd_color_bar_blue=62
# align 0=none, 1=left, 2=center, 3=right
# if align > 0 x_position will be ignored
# if glcd_background_image != "" background color will be ignored
# glcd_position_settings != false allows to edit position settings in gui
glcd_foreground_color_red=100
glcd_foreground_color_green=100
glcd_foreground_color_blue=100
glcd_background_color_red=0
glcd_background_color_green=0
glcd_background_color_blue=0
glcd_background_image=/share/tuxbox/neutrino/icons/oled/advanced.png
glcd_font=/share/fonts/neutrino.ttf
glcd_background=/share/tuxbox/neutrino/icons/oled/advanced.png
glcd_align_channel=2
glcd_align_epg=2
glcd_align_duration=3
glcd_align_start=0
glcd_align_end=3
glcd_align_time=1
glcd_show_logo=true
glcd_show_progressbar=true
glcd_show_duration=true
glcd_show_start=false
glcd_show_end=true
glcd_show_time=true
glcd_show_weather=false
glcd_percent_channel=22
glcd_channel_percent=22
glcd_channel_align=2
glcd_channel_x_position=0
glcd_channel_y_position=22
glcd_percent_epg=15
glcd_epg_x_position=0
glcd_epg_y_position=133
glcd_percent_duration=14
glcd_duration_x_position=0
glcd_duration_y_position=261
glcd_percent_start=0
glcd_start_x_position=0
glcd_start_y_position=0
glcd_percent_end=14
glcd_end_x_position=0
glcd_end_y_position=224
glcd_percent_time=14
glcd_time_x_position=0
glcd_time_y_position=261
glcd_percent_bar=22
glcd_bar_x_position=23
glcd_bar_y_position=216
glcd_bar_width=311
glcd_percent_logo=22
glcd_logo=true
glcd_logo_percent=22
glcd_logo_x_position=0
glcd_logo_y_position=22
glcd_percent_smalltext=4
glcd_smalltext_y_position=6
glcd_rec_icon_x_position=398
glcd_mute_icon_x_position=273
glcd_ts_icon_x_position=443
glcd_timer_icon_x_position=333
glcd_ecm_icon_x_position=100
glcd_dd_icon_x_position=238
glcd_txt_icon_x_position=193
glcd_cam_icon_x_position=148
glcd_digital_clock_y_position=20
glcd_size_simple_clock=40
glcd_simple_clock_y_position=20
glcd_weather_x_position_current=0
glcd_weather_x_position_next=0
glcd_epg_percent=15
glcd_epg_align=2
glcd_epg_x_position=0
glcd_epg_y_position=133
glcd_start=false
glcd_start_percent=0
glcd_start_align=0
glcd_start_x_position=0
glcd_start_y_position=0
glcd_end=true
glcd_end_percent=14
glcd_end_align=3
glcd_end_x_position=0
glcd_end_y_position=224
glcd_duration=true
glcd_duration_percent=14
glcd_duration_align=3
glcd_duration_x_position=0
glcd_duration_y_position=261
glcd_progressbar=true
glcd_progressbar_color_red=62
glcd_progressbar_color_green=62
glcd_progressbar_color_blue=62
glcd_progressbar_percent=22
glcd_progressbar_width=311
glcd_progressbar_x_position=23
glcd_progressbar_y_position=216
glcd_time=true
glcd_time_percent=14
glcd_time_align=1
glcd_time_x_position=0
glcd_time_y_position=261
glcd_icons_percent=4
glcd_icons_y_position=6
glcd_icon_ecm_x_position=100
glcd_icon_cam_x_position=148
glcd_icon_txt_x_position=193
glcd_icon_dd_x_position=238
glcd_icon_mute_x_position=273
glcd_icon_timer_x_position=333
glcd_icon_rec_x_position=398
glcd_icon_ts_x_position=443
glcd_weather=false
glcd_weather_curr_x_position=0
glcd_weather_next_x_position=0
glcd_weather_y_position=0
glcd_weather_x_position_current_standby=10
glcd_weather_x_position_next_standby=340
glcd_weather_y_position_standby=175
glcd_standby_clock_digital_y_position=20
glcd_standby_clock_simple_size=40
glcd_standby_clock_simple_y_position=20
glcd_standby_weather_curr_x_position=10
glcd_standby_weather_next_x_position=340
glcd_standby_weather_y_position=175
glcd_position_settings=true

132
data/oled/themes/480x320/Default.otheme
View File

@@ -1,73 +1,73 @@
# align none 0, align left 1, align center 2, align right 3
# if align > 0 x position will be ignore
# if glcd_background != "" background color will be ignore
# if glcd_position_settings != false this allow to edit position settings over gui
glcd_color_fg_red=100
glcd_color_fg_green=100
glcd_color_fg_blue=100
glcd_color_bg_red=0
glcd_color_bg_green=0
glcd_color_bg_blue=0
glcd_color_bar_red=62
glcd_color_bar_green=62
glcd_color_bar_blue=62
# align 0=none, 1=left, 2=center, 3=right
# if align > 0 x_position will be ignored
# if glcd_background_image != "" background color will be ignored
# glcd_position_settings != false allows to edit position settings in gui
glcd_foreground_color_red=100
glcd_foreground_color_green=100
glcd_foreground_color_blue=100
glcd_background_color_red=0
glcd_background_color_green=0
glcd_background_color_blue=0
glcd_background_image=
glcd_font=/share/fonts/neutrino.ttf
glcd_background=
glcd_align_channel=2
glcd_align_epg=2
glcd_align_duration=0
glcd_align_start=0
glcd_align_end=0
glcd_align_time=2
glcd_show_logo=true
glcd_show_progressbar=true
glcd_show_duration=false
glcd_show_start=false
glcd_show_end=false
glcd_show_time=true
glcd_show_weather=false
glcd_percent_channel=25
glcd_channel_percent=25
glcd_channel_align=2
glcd_channel_x_position=0
glcd_channel_y_position=25
glcd_percent_epg=15
glcd_epg_x_position=0
glcd_epg_y_position=130
glcd_percent_duration=0
glcd_duration_x_position=0
glcd_duration_y_position=0
glcd_percent_start=0
glcd_start_x_position=0
glcd_start_y_position=0
glcd_percent_end=0
glcd_end_x_position=0
glcd_end_y_position=0
glcd_percent_time=25
glcd_time_x_position=0
glcd_time_y_position=230
glcd_percent_bar=20
glcd_bar_x_position=0
glcd_bar_y_position=210
glcd_bar_width=480
glcd_percent_logo=25
glcd_logo=true
glcd_logo_percent=25
glcd_logo_x_position=0
glcd_logo_y_position=25
glcd_percent_smalltext=4
glcd_smalltext_y_position=6
glcd_rec_icon_x_position=398
glcd_mute_icon_x_position=273
glcd_ts_icon_x_position=443
glcd_timer_icon_x_position=333
glcd_ecm_icon_x_position=100
glcd_dd_icon_x_position=238
glcd_txt_icon_x_position=193
glcd_cam_icon_x_position=148
glcd_digital_clock_y_position=20
glcd_size_simple_clock=40
glcd_simple_clock_y_position=20
glcd_weather_x_position_current=0
glcd_weather_x_position_next=0
glcd_epg_percent=15
glcd_epg_align=2
glcd_epg_x_position=0
glcd_epg_y_position=130
glcd_start=false
glcd_start_percent=0
glcd_start_align=0
glcd_start_x_position=0
glcd_start_y_position=0
glcd_end=false
glcd_end_percent=0
glcd_end_align=0
glcd_end_x_position=0
glcd_end_y_position=0
glcd_duration=false
glcd_duration_percent=0
glcd_duration_align=0
glcd_duration_x_position=0
glcd_duration_y_position=0
glcd_progressbar=true
glcd_progressbar_color_red=62
glcd_progressbar_color_green=62
glcd_progressbar_color_blue=62
glcd_progressbar_percent=20
glcd_progressbar_width=480
glcd_progressbar_x_position=0
glcd_progressbar_y_position=210
glcd_time=true
glcd_time_percent=25
glcd_time_align=2
glcd_time_x_position=0
glcd_time_y_position=230
glcd_icons_percent=4
glcd_icons_y_position=6
glcd_icon_ecm_x_position=100
glcd_icon_cam_x_position=148
glcd_icon_txt_x_position=193
glcd_icon_dd_x_position=238
glcd_icon_mute_x_position=273
glcd_icon_timer_x_position=333
glcd_icon_rec_x_position=398
glcd_icon_ts_x_position=443
glcd_weather=false
glcd_weather_curr_x_position=0
glcd_weather_next_x_position=0
glcd_weather_y_position=0
glcd_weather_x_position_current_standby=10
glcd_weather_x_position_next_standby=340
glcd_weather_y_position_standby=175
glcd_standby_clock_digital_y_position=20
glcd_standby_clock_simple_size=40
glcd_standby_clock_simple_y_position=20
glcd_standby_weather_curr_x_position=10
glcd_standby_weather_next_x_position=340
glcd_standby_weather_y_position=175
glcd_position_settings=true

132
data/oled/themes/480x320/Easy.otheme
View File

@@ -1,73 +1,73 @@
# align none 0, align left 1, align center 2, align right 3
# if align > 0 x position will be ignore
# if glcd_background != "" background color will be ignore
# if glcd_position_settings != false this allow to edit position settings over gui
glcd_color_fg_red=100
glcd_color_fg_green=100
glcd_color_fg_blue=100
glcd_color_bg_red=0
glcd_color_bg_green=0
glcd_color_bg_blue=0
glcd_color_bar_red=62
glcd_color_bar_green=62
glcd_color_bar_blue=62
# align 0=none, 1=left, 2=center, 3=right
# if align > 0 x_position will be ignored
# if glcd_background_image != "" background color will be ignored
# glcd_position_settings != false allows to edit position settings in gui
glcd_foreground_color_red=100
glcd_foreground_color_green=100
glcd_foreground_color_blue=100
glcd_background_color_red=0
glcd_background_color_green=0
glcd_background_color_blue=0
glcd_background_image=/share/tuxbox/neutrino/icons/oled/easy.png
glcd_font=/share/fonts/neutrino.ttf
glcd_background=/share/tuxbox/neutrino/icons/oled/easy.png
glcd_align_channel=2
glcd_align_epg=2
glcd_align_duration=3
glcd_align_start=0
glcd_align_end=0
glcd_align_time=1
glcd_show_logo=true
glcd_show_progressbar=false
glcd_show_duration=true
glcd_show_start=false
glcd_show_end=false
glcd_show_time=true
glcd_show_weather=false
glcd_percent_channel=22
glcd_channel_percent=22
glcd_channel_align=2
glcd_channel_x_position=0
glcd_channel_y_position=22
glcd_percent_epg=18
glcd_epg_x_position=0
glcd_epg_y_position=152
glcd_percent_duration=14
glcd_duration_x_position=0
glcd_duration_y_position=261
glcd_percent_start=0
glcd_start_x_position=0
glcd_start_y_position=0
glcd_percent_end=0
glcd_end_x_position=0
glcd_end_y_position=0
glcd_percent_time=14
glcd_time_x_position=0
glcd_time_y_position=261
glcd_percent_bar=0
glcd_bar_x_position=0
glcd_bar_y_position=0
glcd_bar_width=0
glcd_percent_logo=22
glcd_logo=true
glcd_logo_percent=22
glcd_logo_x_position=0
glcd_logo_y_position=22
glcd_percent_smalltext=4
glcd_smalltext_y_position=6
glcd_rec_icon_x_position=398
glcd_mute_icon_x_position=273
glcd_ts_icon_x_position=443
glcd_timer_icon_x_position=333
glcd_ecm_icon_x_position=100
glcd_dd_icon_x_position=238
glcd_txt_icon_x_position=193
glcd_cam_icon_x_position=148
glcd_digital_clock_y_position=20
glcd_size_simple_clock=40
glcd_simple_clock_y_position=20
glcd_weather_x_position_current=0
glcd_weather_x_position_next=0
glcd_epg_percent=18
glcd_epg_align=2
glcd_epg_x_position=0
glcd_epg_y_position=152
glcd_start=false
glcd_start_percent=0
glcd_start_align=0
glcd_start_x_position=0
glcd_start_y_position=0
glcd_end=false
glcd_end_percent=0
glcd_end_align=0
glcd_end_x_position=0
glcd_end_y_position=0
glcd_duration=true
glcd_duration_percent=14
glcd_duration_align=3
glcd_duration_x_position=0
glcd_duration_y_position=261
glcd_progressbar=false
glcd_progressbar_color_red=62
glcd_progressbar_color_green=62
glcd_progressbar_color_blue=62
glcd_progressbar_percent=0
glcd_progressbar_width=0
glcd_progressbar_x_position=0
glcd_progressbar_y_position=0
glcd_time=true
glcd_time_percent=14
glcd_time_align=1
glcd_time_x_position=0
glcd_time_y_position=261
glcd_icons_percent=4
glcd_icons_y_position=6
glcd_icon_ecm_x_position=100
glcd_icon_cam_x_position=148
glcd_icon_txt_x_position=193
glcd_icon_dd_x_position=238
glcd_icon_mute_x_position=273
glcd_icon_timer_x_position=333
glcd_icon_rec_x_position=398
glcd_icon_ts_x_position=443
glcd_weather=false
glcd_weather_curr_x_position=0
glcd_weather_next_x_position=0
glcd_weather_y_position=0
glcd_weather_x_position_current_standby=10
glcd_weather_x_position_next_standby=340
glcd_weather_y_position_standby=175
glcd_standby_clock_digital_y_position=20
glcd_standby_clock_simple_size=40
glcd_standby_clock_simple_y_position=20
glcd_standby_weather_curr_x_position=10
glcd_standby_weather_next_x_position=340
glcd_standby_weather_y_position=175
glcd_position_settings=true

132
data/oled/themes/480x320/Medium.otheme
View File

@@ -1,73 +1,73 @@
# align none 0, align left 1, align center 2, align right 3
# if align > 0 x position will be ignore
# if glcd_background != "" background color will be ignore
# if glcd_position_settings != false this allow to edit position settings over gui
glcd_color_fg_red=100
glcd_color_fg_green=100
glcd_color_fg_blue=100
glcd_color_bg_red=0
glcd_color_bg_green=0
glcd_color_bg_blue=0
glcd_color_bar_red=62
glcd_color_bar_green=62
glcd_color_bar_blue=62
# align 0=none, 1=left, 2=center, 3=right
# if align > 0 x_position will be ignored
# if glcd_background_image != "" background color will be ignored
# glcd_position_settings != false allows to edit position settings in gui
glcd_foreground_color_red=100
glcd_foreground_color_green=100
glcd_foreground_color_blue=100
glcd_background_color_red=0
glcd_background_color_green=0
glcd_background_color_blue=0
glcd_background_image=/share/tuxbox/neutrino/icons/oled/medium.png
glcd_font=/share/fonts/neutrino.ttf
glcd_background=/share/tuxbox/neutrino/icons/oled/medium.png
glcd_align_channel=2
glcd_align_epg=2
glcd_align_duration=3
glcd_align_start=0
glcd_align_end=3
glcd_align_time=1
glcd_show_logo=true
glcd_show_progressbar=true
glcd_show_duration=false
glcd_show_start=false
glcd_show_end=true
glcd_show_time=true
glcd_show_weather=false
glcd_percent_channel=22
glcd_channel_percent=22
glcd_channel_align=2
glcd_channel_x_position=0
glcd_channel_y_position=22
glcd_percent_epg=14
glcd_epg_x_position=0
glcd_epg_y_position=198
glcd_percent_duration=14
glcd_duration_x_position=0
glcd_duration_y_position=261
glcd_percent_start=0
glcd_start_x_position=0
glcd_start_y_position=0
glcd_percent_end=14
glcd_end_x_position=0
glcd_end_y_position=116
glcd_percent_time=14
glcd_time_x_position=0
glcd_time_y_position=116
glcd_percent_bar=14
glcd_bar_x_position=29
glcd_bar_y_position=288
glcd_bar_width=450
glcd_percent_logo=22
glcd_logo=true
glcd_logo_percent=22
glcd_logo_x_position=0
glcd_logo_y_position=22
glcd_percent_smalltext=4
glcd_smalltext_y_position=6
glcd_rec_icon_x_position=398
glcd_mute_icon_x_position=273
glcd_ts_icon_x_position=443
glcd_timer_icon_x_position=333
glcd_ecm_icon_x_position=100
glcd_dd_icon_x_position=238
glcd_txt_icon_x_position=193
glcd_cam_icon_x_position=148
glcd_digital_clock_y_position=20
glcd_size_simple_clock=40
glcd_simple_clock_y_position=20
glcd_weather_x_position_current=0
glcd_weather_x_position_next=0
glcd_epg_percent=14
glcd_epg_align=2
glcd_epg_x_position=0
glcd_epg_y_position=198
glcd_start=false
glcd_start_percent=0
glcd_start_align=0
glcd_start_x_position=0
glcd_start_y_position=0
glcd_end=true
glcd_end_percent=14
glcd_end_align=3
glcd_end_x_position=0
glcd_end_y_position=116
glcd_duration=false
glcd_duration_percent=14
glcd_duration_align=3
glcd_duration_x_position=0
glcd_duration_y_position=261
glcd_progressbar=true
glcd_progressbar_color_red=62
glcd_progressbar_color_green=62
glcd_progressbar_color_blue=62
glcd_progressbar_percent=14
glcd_progressbar_width=450
glcd_progressbar_x_position=29
glcd_progressbar_y_position=288
glcd_time=true
glcd_time_percent=14
glcd_time_align=1
glcd_time_x_position=0
glcd_time_y_position=116
glcd_icons_percent=4
glcd_icons_y_position=6
glcd_icon_ecm_x_position=100
glcd_icon_cam_x_position=148
glcd_icon_txt_x_position=193
glcd_icon_dd_x_position=238
glcd_icon_mute_x_position=273
glcd_icon_timer_x_position=333
glcd_icon_rec_x_position=398
glcd_icon_ts_x_position=443
glcd_weather=false
glcd_weather_curr_x_position=0
glcd_weather_next_x_position=0
glcd_weather_y_position=0
glcd_weather_x_position_current_standby=10
glcd_weather_x_position_next_standby=340
glcd_weather_y_position_standby=175
glcd_standby_clock_digital_y_position=20
glcd_standby_clock_simple_size=40
glcd_standby_clock_simple_y_position=20
glcd_standby_weather_curr_x_position=10
glcd_standby_weather_next_x_position=340
glcd_standby_weather_y_position=175
glcd_position_settings=true

132
data/oled/themes/480x320/Simple.otheme
View File

@@ -1,73 +1,73 @@
# align none 0, align left 1, align center 2, align right 3
# if align > 0 x position will be ignore
# if glcd_background != "" background color will be ignore
# if glcd_position_settings != false this allow to edit position settings over gui
glcd_color_fg_red=100
glcd_color_fg_green=100
glcd_color_fg_blue=100
glcd_color_bg_red=0
glcd_color_bg_green=0
glcd_color_bg_blue=0
glcd_color_bar_red=62
glcd_color_bar_green=62
glcd_color_bar_blue=62
# align 0=none, 1=left, 2=center, 3=right
# if align > 0 x_position will be ignored
# if glcd_background_image != "" background color will be ignored
# glcd_position_settings != false allows to edit position settings in gui
glcd_foreground_color_red=100
glcd_foreground_color_green=100
glcd_foreground_color_blue=100
glcd_background_color_red=0
glcd_background_color_green=0
glcd_background_color_blue=0
glcd_background_image=/share/tuxbox/neutrino/icons/oled/simple.png
glcd_font=/share/fonts/neutrino.ttf
glcd_background=/share/tuxbox/neutrino/icons/oled/simple.png
glcd_align_channel=2
glcd_align_epg=2
glcd_align_duration=0
glcd_align_start=0
glcd_align_end=0
glcd_align_time=0
glcd_show_logo=true
glcd_show_progressbar=false
glcd_show_duration=false
glcd_show_start=false
glcd_show_end=false
glcd_show_time=false
glcd_show_weather=false
glcd_percent_channel=20
glcd_channel_percent=20
glcd_channel_align=2
glcd_channel_x_position=0
glcd_channel_y_position=51
glcd_percent_epg=16
glcd_epg_x_position=0
glcd_epg_y_position=241
glcd_percent_duration=0
glcd_duration_x_position=0
glcd_duration_y_position=0
glcd_percent_start=0
glcd_start_x_position=0
glcd_start_y_position=0
glcd_percent_end=14
glcd_end_x_position=0
glcd_end_y_position=0
glcd_percent_time=0
glcd_time_x_position=0
glcd_time_y_position=0
glcd_percent_bar=0
glcd_bar_x_position=0
glcd_bar_y_position=0
glcd_bar_width=0
glcd_percent_logo=20
glcd_logo=true
glcd_logo_percent=20
glcd_logo_x_position=0
glcd_logo_y_position=51
glcd_percent_smalltext=4
glcd_smalltext_y_position=6
glcd_rec_icon_x_position=398
glcd_mute_icon_x_position=273
glcd_ts_icon_x_position=443
glcd_timer_icon_x_position=333
glcd_ecm_icon_x_position=100
glcd_dd_icon_x_position=238
glcd_txt_icon_x_position=193
glcd_cam_icon_x_position=148
glcd_digital_clock_y_position=20
glcd_size_simple_clock=40
glcd_simple_clock_y_position=20
glcd_weather_x_position_current=0
glcd_weather_x_position_next=0
glcd_epg_percent=16
glcd_epg_align=2
glcd_epg_x_position=0
glcd_epg_y_position=241
glcd_start=false
glcd_start_percent=0
glcd_start_align=0
glcd_start_x_position=0
glcd_start_y_position=0
glcd_end=false
glcd_end_percent=14
glcd_end_align=0
glcd_end_x_position=0
glcd_end_y_position=0
glcd_duration=false
glcd_duration_percent=0
glcd_duration_align=0
glcd_duration_x_position=0
glcd_duration_y_position=0
glcd_progressbar=false
glcd_progressbar_color_red=62
glcd_progressbar_color_green=62
glcd_progressbar_color_blue=62
glcd_progressbar_percent=0
glcd_progressbar_width=0
glcd_progressbar_x_position=0
glcd_progressbar_y_position=0
glcd_time=false
glcd_time_percent=0
glcd_time_align=0
glcd_time_x_position=0
glcd_time_y_position=0
glcd_icons_percent=4
glcd_icons_y_position=6
glcd_icon_ecm_x_position=100
glcd_icon_cam_x_position=148
glcd_icon_txt_x_position=193
glcd_icon_dd_x_position=238
glcd_icon_mute_x_position=273
glcd_icon_timer_x_position=333
glcd_icon_rec_x_position=398
glcd_icon_ts_x_position=443
glcd_weather=false
glcd_weather_curr_x_position=0
glcd_weather_next_x_position=0
glcd_weather_y_position=0
glcd_weather_x_position_current_standby=10
glcd_weather_x_position_next_standby=340
glcd_weather_y_position_standby=175
glcd_standby_clock_digital_y_position=20
glcd_standby_clock_simple_size=40
glcd_standby_clock_simple_y_position=20
glcd_standby_weather_curr_x_position=10
glcd_standby_weather_next_x_position=340
glcd_standby_weather_y_position=175
glcd_position_settings=true

132
data/oled/themes/480x320/Weather.otheme
View File

@@ -1,73 +1,73 @@
# align none 0, align left 1, align center 2, align right 3
# if align > 0 x position will be ignore
# if glcd_background != "" background color will be ignore
# if glcd_position_settings != false this allow to edit position settings over gui
glcd_color_fg_red=100
glcd_color_fg_green=100
glcd_color_fg_blue=100
glcd_color_bg_red=0
glcd_color_bg_green=0
glcd_color_bg_blue=0
glcd_color_bar_red=62
glcd_color_bar_green=62
glcd_color_bar_blue=62
# align 0=none, 1=left, 2=center, 3=right
# if align > 0 x_position will be ignored
# if glcd_background_image != "" background color will be ignored
# glcd_position_settings != false allows to edit position settings in gui
glcd_foreground_color_red=100
glcd_foreground_color_green=100
glcd_foreground_color_blue=100
glcd_background_color_red=0
glcd_background_color_green=0
glcd_background_color_blue=0
glcd_background_image=/share/tuxbox/neutrino/icons/oled/weather.png
glcd_font=/share/fonts/neutrino.ttf
glcd_background=/share/tuxbox/neutrino/icons/oled/weather.png
glcd_align_channel=2
glcd_align_epg=2
glcd_align_duration=3
glcd_align_start=0
glcd_align_end=3
glcd_align_time=1
glcd_show_logo=true
glcd_show_progressbar=true
glcd_show_duration=false
glcd_show_start=false
glcd_show_end=true
glcd_show_time=false
glcd_show_weather=true
glcd_percent_channel=22
glcd_channel_percent=22
glcd_channel_align=2
glcd_channel_x_position=0
glcd_channel_y_position=22
glcd_percent_epg=14
glcd_epg_x_position=0
glcd_epg_y_position=133
glcd_percent_duration=14
glcd_duration_x_position=0
glcd_duration_y_position=261
glcd_percent_start=0
glcd_start_x_position=0
glcd_start_y_position=0
glcd_percent_end=14
glcd_end_x_position=0
glcd_end_y_position=185
glcd_percent_time=0
glcd_time_x_position=0
glcd_time_y_position=0
glcd_percent_bar=22
glcd_bar_x_position=18
glcd_bar_y_position=201
glcd_bar_width=313
glcd_percent_logo=22
glcd_logo=true
glcd_logo_percent=22
glcd_logo_x_position=0
glcd_logo_y_position=22
glcd_percent_smalltext=4
glcd_smalltext_y_position=6
glcd_rec_icon_x_position=398
glcd_mute_icon_x_position=273
glcd_ts_icon_x_position=443
glcd_timer_icon_x_position=333
glcd_ecm_icon_x_position=100
glcd_dd_icon_x_position=238
glcd_txt_icon_x_position=193
glcd_cam_icon_x_position=148
glcd_digital_clock_y_position=20
glcd_size_simple_clock=40
glcd_simple_clock_y_position=20
glcd_weather_x_position_current=45
glcd_weather_x_position_next=375
glcd_epg_percent=14
glcd_epg_align=2
glcd_epg_x_position=0
glcd_epg_y_position=133
glcd_start=false
glcd_start_percent=0
glcd_start_align=0
glcd_start_x_position=0
glcd_start_y_position=0
glcd_end=true
glcd_end_percent=14
glcd_end_align=3
glcd_end_x_position=0
glcd_end_y_position=185
glcd_duration=false
glcd_duration_percent=14
glcd_duration_align=3
glcd_duration_x_position=0
glcd_duration_y_position=261
glcd_progressbar=true
glcd_progressbar_color_red=62
glcd_progressbar_color_green=62
glcd_progressbar_color_blue=62
glcd_progressbar_percent=22
glcd_progressbar_width=313
glcd_progressbar_x_position=18
glcd_progressbar_y_position=201
glcd_time=false
glcd_time_percent=0
glcd_time_align=1
glcd_time_x_position=0
glcd_time_y_position=0
glcd_icons_percent=4
glcd_icons_y_position=6
glcd_icon_ecm_x_position=100
glcd_icon_cam_x_position=148
glcd_icon_txt_x_position=193
glcd_icon_dd_x_position=238
glcd_icon_mute_x_position=273
glcd_icon_timer_x_position=333
glcd_icon_rec_x_position=398
glcd_icon_ts_x_position=443
glcd_weather=true
glcd_weather_curr_x_position=45
glcd_weather_next_x_position=375
glcd_weather_y_position=240
glcd_weather_x_position_current_standby=10
glcd_weather_x_position_next_standby=340
glcd_weather_y_position_standby=175
glcd_standby_clock_digital_y_position=20
glcd_standby_clock_simple_size=40
glcd_standby_clock_simple_y_position=20
glcd_standby_weather_curr_x_position=10
glcd_standby_weather_next_x_position=340
glcd_standby_weather_y_position=175
glcd_position_settings=true

132
data/oled/themes/800x480/Default.otheme
View File

@@ -1,73 +1,73 @@
# align none 0, align left 1, align center 2, align right 3
# if align > 0 x position will be ignore
# if glcd_background != "" background color will be ignore
# if glcd_position_settings != false this allow to edit position settings over gui
glcd_color_fg_red=100
glcd_color_fg_green=100
glcd_color_fg_blue=100
glcd_color_bg_red=0
glcd_color_bg_green=0
glcd_color_bg_blue=0
glcd_color_bar_red=62
glcd_color_bar_green=62
glcd_color_bar_blue=62
# align 0=none, 1=left, 2=center, 3=right
# if align > 0 x_position will be ignored
# if glcd_background_image != "" background color will be ignored
# glcd_position_settings != false allows to edit position settings in gui
glcd_foreground_color_red=100
glcd_foreground_color_green=100
glcd_foreground_color_blue=100
glcd_background_color_red=0
glcd_background_color_green=0
glcd_background_color_blue=0
glcd_background_image=
glcd_font=/share/fonts/neutrino.ttf
glcd_background=
glcd_align_channel=2
glcd_align_epg=2
glcd_align_duration=0
glcd_align_start=0
glcd_align_end=0
glcd_align_time=2
glcd_show_logo=true
glcd_show_progressbar=true
glcd_show_duration=false
glcd_show_start=false
glcd_show_end=false
glcd_show_time=true
glcd_show_weather=false
glcd_percent_channel=25
glcd_channel_percent=25
glcd_channel_align=2
glcd_channel_x_position=0
glcd_channel_y_position=38
glcd_percent_epg=15
glcd_epg_x_position=0
glcd_epg_y_position=195
glcd_percent_duration=0
glcd_duration_x_position=0
glcd_duration_y_position=0
glcd_percent_start=0
glcd_start_x_position=0
glcd_start_y_position=0
glcd_percent_end=0
glcd_end_x_position=0
glcd_end_y_position=0
glcd_percent_time=25
glcd_time_x_position=0
glcd_time_y_position=345
glcd_percent_bar=20
glcd_bar_x_position=0
glcd_bar_y_position=315
glcd_bar_width=800
glcd_percent_logo=25
glcd_logo=true
glcd_logo_percent=25
glcd_logo_x_position=0
glcd_logo_y_position=38
glcd_percent_smalltext=4
glcd_smalltext_y_position=9
glcd_rec_icon_x_position=663
glcd_mute_icon_x_position=455
glcd_ts_icon_x_position=738
glcd_timer_icon_x_position=555
glcd_ecm_icon_x_position=166
glcd_dd_icon_x_position=397
glcd_txt_icon_x_position=322
glcd_cam_icon_x_position=247
glcd_digital_clock_y_position=30
glcd_size_simple_clock=40
glcd_simple_clock_y_position=30
glcd_weather_x_position_current=0
glcd_weather_x_position_next=0
glcd_epg_percent=15
glcd_epg_align=2
glcd_epg_x_position=0
glcd_epg_y_position=195
glcd_start=false
glcd_start_percent=0
glcd_start_align=0
glcd_start_x_position=0
glcd_start_y_position=0
glcd_end=false
glcd_end_percent=0
glcd_end_align=0
glcd_end_x_position=0
glcd_end_y_position=0
glcd_duration=false
glcd_duration_percent=0
glcd_duration_align=0
glcd_duration_x_position=0
glcd_duration_y_position=0
glcd_progressbar=true
glcd_progressbar_color_red=62
glcd_progressbar_color_green=62
glcd_progressbar_color_blue=62
glcd_progressbar_percent=20
glcd_progressbar_width=800
glcd_progressbar_x_position=0
glcd_progressbar_y_position=315
glcd_time=true
glcd_time_percent=25
glcd_time_align=2
glcd_time_x_position=0
glcd_time_y_position=345
glcd_icons_percent=4
glcd_icons_y_position=9
glcd_icon_ecm_x_position=166
glcd_icon_cam_x_position=247
glcd_icon_txt_x_position=322
glcd_icon_dd_x_position=397
glcd_icon_mute_x_position=455
glcd_icon_timer_x_position=555
glcd_icon_rec_x_position=663
glcd_icon_ts_x_position=738
glcd_weather=false
glcd_weather_curr_x_position=0
glcd_weather_next_x_position=0
glcd_weather_y_position=0
glcd_weather_x_position_current_standby=10
glcd_weather_x_position_next_standby=567
glcd_weather_y_position_standby=263
glcd_standby_clock_digital_y_position=30
glcd_standby_clock_simple_size=40
glcd_standby_clock_simple_y_position=30
glcd_standby_weather_curr_x_position=10
glcd_standby_weather_next_x_position=567
glcd_standby_weather_y_position=263
glcd_position_settings=true

3
data/y-web/Y_Menue.yhtm
View File

@@ -9,6 +9,9 @@
=}=}=}=}
=}
{=ini-get:%(CONFIGDIR)/neutrino.conf;glcd_enable;none=}
{=include-block:Y_Blocks.txt;head=}
<script type="text/javascript" src="/prototype.js"></script>
<script type="text/javascript" src="/Y_Baselib.js"></script>

2
src/driver/glcd/digitalclock.cpp
View File

@@ -149,7 +149,7 @@ void ShowDigitalClock(int hour, int minute)
{
cGLCD *cglcd = cGLCD::getInstance();
SNeutrinoGlcdTheme &t = g_settings.glcd_theme;
int y = g_settings.glcd_standby_weather ? t.glcd_digital_clock_y_position : cglcd->bitmap->Height() / 2;
int y = g_settings.glcd_standby_weather ? t.glcd_standby_clock_digital_y_position : cglcd->bitmap->Height() / 2;
int a = 10;
int b = 117;

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

@@ -198,7 +198,7 @@ void cGLCD::Exec()
if (!lcd)
return;
bitmap->Clear(ColorConvert3to1(t.glcd_color_bg_red, t.glcd_color_bg_green, t.glcd_color_bg_blue));
bitmap->Clear(ColorConvert3to1(t.glcd_background_color_red, t.glcd_background_color_green, t.glcd_background_color_blue));
if (Channel.compare("Neutrino") == 0)
{
@@ -213,14 +213,14 @@ void cGLCD::Exec()
drawText(std::max(2,(bitmap->Width() - fw)/2),
std::max(2,(bitmap->Height() - fh)/2), bitmap->Width(), fw, Epg,
&font_tmp, ColorConvert3to1(t.glcd_color_fg_red, t.glcd_color_fg_green, t.glcd_color_fg_blue), GLCD::cColor::Transparent, true, 0, ALIGN_NONE);
&font_tmp, ColorConvert3to1(t.glcd_foreground_color_red, t.glcd_foreground_color_green, t.glcd_foreground_color_blue), GLCD::cColor::Transparent, true, 0, ALIGN_NONE);
lcd->SetScreen(bitmap->Data(), bitmap->Width(), bitmap->Height());
lcd->Refresh(true);
}
else
{
cglcd->bitmap->Clear(ColorConvert3to1(t.glcd_color_bg_red, t.glcd_color_bg_green, t.glcd_color_bg_blue));
cglcd->bitmap->Clear(ColorConvert3to1(t.glcd_background_color_red, t.glcd_background_color_green, t.glcd_background_color_blue));
cglcd->lcd->Refresh(true);
}
return;
@@ -249,10 +249,10 @@ void cGLCD::Exec()
return;
}
if (t.glcd_background != "")
imageShow(t.glcd_background, 0, 0, 0, 0, false, true, true, false, false);
if (t.glcd_background_image != "")
imageShow(t.glcd_background_image, 0, 0, 0, 0, false, true, true, false, false);
if (t.glcd_show_weather)
if (t.glcd_weather)
ShowWeather(false);
switch (CAudioPlayer::getInstance()->getState())
@@ -322,7 +322,7 @@ void cGLCD::Exec()
int icon_start_width = 0, icon_start_height = 0;
g_PicViewer->getSize(Logo.c_str(), &icon_start_width, &icon_start_height);
if (t.glcd_show_logo && percent_logo &&
if (t.glcd_logo && percent_logo &&
showImage(channel_id, Channel, t.glcd_channel_x_position, t.glcd_channel_y_position, bitmap->Width(), percent_logo * bitmap->Height()/100, true, false)) {
doScrollChannel = false;
scrollChannelSkip = 0;
@@ -342,7 +342,7 @@ void cGLCD::Exec()
drawText(t.glcd_channel_x_position + scrollChannelOffset,
t.glcd_channel_y_position, bitmap->Width(), ChannelWidth, Channel,
&font_channel, ColorConvert3to1(t.glcd_color_fg_red, t.glcd_color_fg_green, t.glcd_color_fg_blue), GLCD::cColor::Transparent, true, scrollChannelSkip, t.glcd_align_channel);
&font_channel, ColorConvert3to1(t.glcd_foreground_color_red, t.glcd_foreground_color_green, t.glcd_foreground_color_blue), GLCD::cColor::Transparent, true, scrollChannelSkip, t.glcd_channel_align);
if (scrollChannelOffset > 0)
scrollChannelOffset -= g_settings.glcd_scroll_speed;
@@ -373,7 +373,7 @@ void cGLCD::Exec()
drawText(t.glcd_epg_x_position + scrollEpgOffset,
t.glcd_epg_y_position, bitmap->Width(), EpgWidth, Epg,
&font_epg, ColorConvert3to1(t.glcd_color_fg_red, t.glcd_color_fg_green, t.glcd_color_fg_blue), GLCD::cColor::Transparent, true, scrollEpgSkip, t.glcd_align_epg);
&font_epg, ColorConvert3to1(t.glcd_foreground_color_red, t.glcd_foreground_color_green, t.glcd_foreground_color_blue), GLCD::cColor::Transparent, true, scrollEpgSkip, t.glcd_epg_align);
if (scrollEpgOffset > 0)
scrollEpgOffset -= g_settings.glcd_scroll_speed;
@@ -390,20 +390,20 @@ void cGLCD::Exec()
}
}
if (percent_bar && t.glcd_show_progressbar)
if (percent_bar && t.glcd_progressbar)
{
showProgressBarBorder(
t.glcd_bar_x_position,
t.glcd_bar_y_position,
t.glcd_bar_width,
t.glcd_bar_y_position + t.glcd_percent_bar,
t.glcd_progressbar_x_position,
t.glcd_progressbar_y_position,
t.glcd_progressbar_width,
t.glcd_progressbar_y_position + t.glcd_progressbar_percent,
Scale,
GLCD::cColor::Gray,
ColorConvert3to1(t.glcd_color_bar_red, t.glcd_color_bar_green, t.glcd_color_bar_blue)
ColorConvert3to1(t.glcd_progressbar_color_red, t.glcd_progressbar_color_green, t.glcd_progressbar_color_blue)
);
}
if (percent_time && t.glcd_show_time)
if (percent_time && t.glcd_time)
{
Lock();
Time = strftime("%H:%M", tm);
@@ -412,10 +412,10 @@ void cGLCD::Exec()
drawText(t.glcd_time_x_position,
t.glcd_time_y_position, bitmap->Width() - 1, TimeWidth, Time,
&font_time, ColorConvert3to1(t.glcd_color_fg_red, t.glcd_color_fg_green, t.glcd_color_fg_blue), GLCD::cColor::Transparent, true, 0, t.glcd_align_time);
&font_time, ColorConvert3to1(t.glcd_foreground_color_red, t.glcd_foreground_color_green, t.glcd_foreground_color_blue), GLCD::cColor::Transparent, true, 0, t.glcd_time_align);
}
if (percent_duration && t.glcd_show_duration)
if (percent_duration && t.glcd_duration)
{
Lock();
Duration = stagingDuration;
@@ -424,10 +424,10 @@ void cGLCD::Exec()
drawText(t.glcd_duration_x_position,
t.glcd_duration_y_position, bitmap->Width() - 1, DurationWidth, Duration,
&font_duration, ColorConvert3to1(t.glcd_color_fg_red, t.glcd_color_fg_green, t.glcd_color_fg_blue), GLCD::cColor::Transparent, true, 0, t.glcd_align_duration);
&font_duration, ColorConvert3to1(t.glcd_foreground_color_red, t.glcd_foreground_color_green, t.glcd_foreground_color_blue), GLCD::cColor::Transparent, true, 0, t.glcd_duration_align);
}
if (percent_start && t.glcd_show_start)
if (percent_start && t.glcd_start)
{
Lock();
Start = stagingStart;
@@ -436,10 +436,10 @@ void cGLCD::Exec()
drawText(t.glcd_start_x_position,
t.glcd_start_y_position, bitmap->Width() - 1, StartWidth, Start,
&font_start, ColorConvert3to1(t.glcd_color_fg_red, t.glcd_color_fg_green, t.glcd_color_fg_blue), GLCD::cColor::Transparent, true, 0, t.glcd_align_start);
&font_start, ColorConvert3to1(t.glcd_foreground_color_red, t.glcd_foreground_color_green, t.glcd_foreground_color_blue), GLCD::cColor::Transparent, true, 0, t.glcd_start_align);
}
if (percent_end && t.glcd_show_end)
if (percent_end && t.glcd_end)
{
Lock();
End = stagingEnd;
@@ -448,7 +448,7 @@ void cGLCD::Exec()
drawText(t.glcd_end_x_position,
t.glcd_end_y_position, bitmap->Width() - 1, EndWidth, End,
&font_end, ColorConvert3to1(t.glcd_color_fg_red, t.glcd_color_fg_green, t.glcd_color_fg_blue), GLCD::cColor::Transparent, true, 0, t.glcd_align_end);
&font_end, ColorConvert3to1(t.glcd_foreground_color_red, t.glcd_foreground_color_green, t.glcd_foreground_color_blue), GLCD::cColor::Transparent, true, 0, t.glcd_end_align);
}
if (percent_smalltext && !doStandby) {
@@ -467,93 +467,93 @@ void cGLCD::Exec()
}
if (recLocked) {
drawText(t.glcd_rec_icon_x_position, t.glcd_smalltext_y_position,
drawText(t.glcd_icon_rec_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "rec", &font_smalltext, GLCD::cColor::Red,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_rec_icon_x_position, t.glcd_smalltext_y_position,
drawText(t.glcd_icon_rec_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "rec", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
if (muteLocked) {
drawText(t.glcd_mute_icon_x_position, t.glcd_smalltext_y_position,
drawText(t.glcd_icon_mute_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "mute", &font_smalltext, GLCD::cColor::Green,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_mute_icon_x_position, t.glcd_smalltext_y_position,
drawText(t.glcd_icon_mute_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "mute", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
if (tsLocked) {
drawText(t.glcd_ts_icon_x_position, t.glcd_smalltext_y_position,
drawText(t.glcd_icon_ts_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "ts", &font_smalltext, GLCD::cColor::Red,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_ts_icon_x_position, t.glcd_smalltext_y_position,
drawText(t.glcd_icon_ts_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "ts", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
if (ecmLocked) {
drawText(t.glcd_ecm_icon_x_position, t.glcd_smalltext_y_position,
drawText(t.glcd_icon_ecm_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "ecm", &font_smalltext, GLCD::cColor::Green,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_ecm_icon_x_position, t.glcd_smalltext_y_position,
drawText(t.glcd_icon_ecm_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "ecm", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
if (timerLocked) {
drawText(t.glcd_timer_icon_x_position, t.glcd_smalltext_y_position,
drawText(t.glcd_icon_timer_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "timer", &font_smalltext, GLCD::cColor::Green,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_timer_icon_x_position, t.glcd_smalltext_y_position,
drawText(t.glcd_icon_timer_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "timer", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
if (ddLocked) {
drawText(t.glcd_dd_icon_x_position, t.glcd_smalltext_y_position,
drawText(t.glcd_icon_dd_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "dd", &font_smalltext, GLCD::cColor::Green,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_dd_icon_x_position, t.glcd_smalltext_y_position,
drawText(t.glcd_icon_dd_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "dd", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
if (ismediaplayer) {
if (subLocked) {
drawText(t.glcd_txt_icon_x_position, t.glcd_smalltext_y_position,
drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "sub", &font_smalltext, GLCD::cColor::Green,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_txt_icon_x_position, t.glcd_smalltext_y_position,
drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "sub", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
} else {
if (txtLocked) {
drawText(t.glcd_txt_icon_x_position, t.glcd_smalltext_y_position,
drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "txt", &font_smalltext, GLCD::cColor::Green,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_txt_icon_x_position, t.glcd_smalltext_y_position,
drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "txt", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
}
if (camLocked) {
drawText(t.glcd_cam_icon_x_position, t.glcd_smalltext_y_position,
drawText(t.glcd_icon_cam_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "cam", &font_smalltext, GLCD::cColor::Green,
GLCD::cColor::Transparent, true, 0, 0);
} else {
drawText(t.glcd_cam_icon_x_position, t.glcd_smalltext_y_position,
drawText(t.glcd_icon_cam_x_position, t.glcd_icons_y_position,
bitmap->Width() - 1, SmalltextWidth, "cam", &font_smalltext, GLCD::cColor::Gray,
GLCD::cColor::Transparent, true, 0, 0);
}
@@ -567,15 +567,15 @@ void cGLCD::updateFonts()
{
SNeutrinoGlcdTheme &t = g_settings.glcd_theme;
percent_logo = std::min(t.glcd_percent_logo, 100);
percent_channel = std::min(t.glcd_percent_channel, 100);
percent_epg = std::min(t.glcd_percent_epg, 100);
percent_bar = std::min(t.glcd_percent_bar, 100);
percent_time = std::min(t.glcd_percent_time, 100);
percent_duration = std::min(t.glcd_percent_duration, 100);
percent_start = std::min(t.glcd_percent_start, 100);
percent_end = std::min(t.glcd_percent_end, 100);
percent_smalltext = std::min(t.glcd_percent_smalltext, 100);
percent_logo = std::min(t.glcd_logo_percent, 100);
percent_channel = std::min(t.glcd_channel_percent, 100);
percent_epg = std::min(t.glcd_epg_percent, 100);
percent_bar = std::min(t.glcd_progressbar_percent, 100);
percent_time = std::min(t.glcd_time_percent, 100);
percent_duration = std::min(t.glcd_duration_percent, 100);
percent_start = std::min(t.glcd_start_percent, 100);
percent_end = std::min(t.glcd_end_percent, 100);
percent_smalltext = std::min(t.glcd_icons_percent, 100);
// calculate height
int fontsize_channel_new = percent_channel * cglcd->lcd->Height() / 100;
@@ -846,7 +846,7 @@ void cGLCD::Run(void)
lcd->SetBrightness(0);
if (!bitmap)
bitmap = new GLCD::cBitmap(lcd->Width(), lcd->Height(), ColorConvert3to1(t.glcd_color_bg_red, t.glcd_color_bg_green, t.glcd_color_bg_blue));
bitmap = new GLCD::cBitmap(lcd->Width(), lcd->Height(), ColorConvert3to1(t.glcd_background_color_red, t.glcd_background_color_green, t.glcd_background_color_blue));
UpdateBrightness();
Update();

6
src/driver/glcd/simpleclock.cpp
View File

@@ -58,7 +58,7 @@ void SimpleClockUpdateFonts(int mode)
}
int fontsize_time_standby = 0;
int percent_time_standby = std::min(t.glcd_size_simple_clock, 100);
int percent_time_standby = std::min(t.glcd_standby_clock_simple_size, 100);
int fontsize_time_standby_new = percent_time_standby * cglcd->lcd->Height() / 100;
if (fontsize_time_standby_new != fontsize_time_standby) {
fontsize_time_standby = fontsize_time_standby_new;
@@ -76,13 +76,13 @@ void RenderSimpleClock(std::string Time, int x, int y, int mode)
SimpleClockUpdateFonts(mode);
cglcd->bitmap->DrawText(std::max(2,(cglcd->bitmap->Width() - 4 - font_time_standby.Width(Time))/2),
y, cglcd->bitmap->Width() - 1, Time,
&font_time_standby, cglcd->ColorConvert3to1(t.glcd_color_fg_red, t.glcd_color_fg_green, t.glcd_color_fg_blue), GLCD::cColor::Transparent);
&font_time_standby, cglcd->ColorConvert3to1(t.glcd_foreground_color_red, t.glcd_foreground_color_green, t.glcd_foreground_color_blue), GLCD::cColor::Transparent);
}
void ShowSimpleClock(std::string Time, int mode)
{
cGLCD *cglcd = cGLCD::getInstance();
SNeutrinoGlcdTheme &t = g_settings.glcd_theme;
int y = g_settings.glcd_standby_weather ? t.glcd_simple_clock_y_position : (cglcd->bitmap->Height() - font_time_standby.Height(Time)) / 2;
int y = g_settings.glcd_standby_weather ? t.glcd_standby_clock_simple_y_position : (cglcd->bitmap->Height() - font_time_standby.Height(Time)) / 2;
RenderSimpleClock(Time, 255, y, mode);
}

8
src/driver/glcd/weather.cpp
View File

@@ -228,7 +228,7 @@ void RenderWeather(int cx, int cy, int nx, int ny, bool standby)
current_wtemp += "°";
WeatherUpdateFonts();
cglcd->bitmap->DrawText(170, 240, cglcd->bitmap->Width() - 1, current_wtemp,
&font_temperature, cglcd->ColorConvert3to1(t.glcd_color_fg_red, t.glcd_color_fg_green, t.glcd_color_fg_blue), GLCD::cColor::Transparent);
&font_temperature, cglcd->ColorConvert3to1(t.glcd_foreground_color_red, t.glcd_foreground_color_green, t.glcd_foreground_color_blue), GLCD::cColor::Transparent);
}
if (next_wicon != "") {
if (!standby)
@@ -240,7 +240,7 @@ void RenderWeather(int cx, int cy, int nx, int ny, bool standby)
next_wtemp += "°";
WeatherUpdateFonts();
cglcd->bitmap->DrawText(250, 240, cglcd->bitmap->Width() - 1, next_wtemp,
&font_temperature, cglcd->ColorConvert3to1(t.glcd_color_fg_red, t.glcd_color_fg_green, t.glcd_color_fg_blue), GLCD::cColor::Transparent);
&font_temperature, cglcd->ColorConvert3to1(t.glcd_foreground_color_red, t.glcd_foreground_color_green, t.glcd_foreground_color_blue), GLCD::cColor::Transparent);
}
}
}
@@ -250,9 +250,9 @@ void ShowWeather(bool standby)
SNeutrinoGlcdTheme &t = g_settings.glcd_theme;
if (!standby) {
RenderWeather(t.glcd_weather_x_position_current, t.glcd_weather_y_position, t.glcd_weather_x_position_next, t.glcd_weather_y_position, standby);
RenderWeather(t.glcd_weather_curr_x_position, t.glcd_weather_y_position, t.glcd_weather_next_x_position, t.glcd_weather_y_position, standby);
} else {
RenderWeather(t.glcd_weather_x_position_current_standby, t.glcd_weather_y_position_standby, t.glcd_weather_x_position_next_standby, t.glcd_weather_y_position_standby, standby);
RenderWeather(t.glcd_standby_weather_curr_x_position, t.glcd_standby_weather_y_position, t.glcd_standby_weather_next_x_position, t.glcd_standby_weather_y_position, standby);
}
if (ForceUpdate)

70
src/gui/glcdsetup.cpp
View File

@@ -370,15 +370,15 @@ int GLCD_Menu::GLCD_Standby_Settings()
//mc->setHint("", LOCALE_TODO);
gss->addItem(mc);
cdy = new CMenuOptionNumberChooser(LOCALE_GLCD_DIGITAL_CLOCK_Y_POSITION, &t.glcd_digital_clock_y_position, (t.glcd_position_settings && g_settings.glcd_time_in_standby == cGLCD::CLOCK_DIGITAL), 0, 500, this);
cdy = new CMenuOptionNumberChooser(LOCALE_GLCD_DIGITAL_CLOCK_Y_POSITION, &t.glcd_standby_clock_digital_y_position, (t.glcd_position_settings && g_settings.glcd_time_in_standby == cGLCD::CLOCK_DIGITAL), 0, 500, this);
//cdy->setHint("", LOCALE_TODO);
gss->addItem(cdy);
csh = new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_SIMPLE_CLOCK, &t.glcd_size_simple_clock, (t.glcd_position_settings && g_settings.glcd_time_in_standby == cGLCD::CLOCK_SIMPLE), 0, 100, this);
csh = new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_SIMPLE_CLOCK, &t.glcd_standby_clock_simple_size, (t.glcd_position_settings && g_settings.glcd_time_in_standby == cGLCD::CLOCK_SIMPLE), 0, 100, this);
//csh->setHint("", LOCALE_TODO);
gss->addItem(csh);
csy = new CMenuOptionNumberChooser(LOCALE_GLCD_SIMPLE_CLOCK_Y_POSITION, &t.glcd_simple_clock_y_position, (t.glcd_position_settings && g_settings.glcd_time_in_standby == cGLCD::CLOCK_SIMPLE), 0, 500, this);
csy = new CMenuOptionNumberChooser(LOCALE_GLCD_SIMPLE_CLOCK_Y_POSITION, &t.glcd_standby_clock_simple_y_position, (t.glcd_position_settings && g_settings.glcd_time_in_standby == cGLCD::CLOCK_SIMPLE), 0, 500, this);
//csy->setHint("", LOCALE_TODO);
gss->addItem(csy);
@@ -453,13 +453,13 @@ int GLCD_Menu::GLCD_Theme_Settings()
gts->addItem(GenericMenuSeparatorLine);
CColorChooser* fg = new CColorChooser(LOCALE_GLCD_SELECT_FG, &t.glcd_color_fg_red, &t.glcd_color_fg_green, &t.glcd_color_fg_blue, NULL, colorSetupNotifier);
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* bg = new CColorChooser(LOCALE_GLCD_SELECT_BG, &t.glcd_color_bg_red, &t.glcd_color_bg_green, &t.glcd_color_bg_blue, NULL, colorSetupNotifier);
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* bar = new CColorChooser(LOCALE_GLCD_SELECT_BAR, &t.glcd_color_bar_red, &t.glcd_color_bar_green, &t.glcd_color_bar_blue, NULL, colorSetupNotifier);
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);
gts->addItem(new CMenuDForwarder(LOCALE_GLCD_SELECT_BAR, true, NULL, bar));
//delete colorSetupNotifier;
@@ -478,30 +478,30 @@ int GLCD_Menu::GLCD_Theme_Position_Settings()
//sigc::slot0<void> slot_repaint = sigc::mem_fun(gtps, &CMenuWidget::paint); //we want to repaint after changed Option
gtps->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_CHANNEL,
&t.glcd_percent_channel, !t.glcd_show_logo, 0, 100, this));
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_ALIGN_CHANNEL, &t.glcd_align_channel,
ONOFFPRI_OPTIONS, ONOFFPRI_OPTION_COUNT, !t.glcd_show_logo, NULL));
&t.glcd_channel_percent, !t.glcd_logo, 0, 100, this));
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_ALIGN_CHANNEL, &t.glcd_channel_align,
ONOFFPRI_OPTIONS, ONOFFPRI_OPTION_COUNT, !t.glcd_logo, NULL));
gtps->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_CHANNEL_X_POSITION,
&t.glcd_channel_x_position, !t.glcd_show_logo, 0, 500, this));
&t.glcd_channel_x_position, !t.glcd_logo, 0, 500, this));
gtps->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_CHANNEL_Y_POSITION,
&t.glcd_channel_y_position, !t.glcd_show_logo, 0, 500, this));
&t.glcd_channel_y_position, !t.glcd_logo, 0, 500, this));
gtps->addItem(GenericMenuSeparatorLine);
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_LOGO, &t.glcd_show_logo,
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_LOGO, &t.glcd_logo,
OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
gtps->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_LOGO,
&t.glcd_percent_logo, t.glcd_show_logo, 0, 100, this));
&t.glcd_logo_percent, t.glcd_logo, 0, 100, this));
gtps->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_LOGO_X_POSITION,
&t.glcd_logo_x_position, t.glcd_show_logo, 0, 500, this));
&t.glcd_logo_x_position, t.glcd_logo, 0, 500, this));
gtps->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_LOGO_Y_POSITION,
&t.glcd_logo_y_position, t.glcd_show_logo, 0, 500, this));
&t.glcd_logo_y_position, t.glcd_logo, 0, 500, this));
gtps->addItem(GenericMenuSeparatorLine);
gtps->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_EPG,
&t.glcd_percent_epg, true, 0, 100, this));
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_ALIGN_EPG, &t.glcd_align_epg,
&t.glcd_epg_percent, true, 0, 100, this));
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_ALIGN_EPG, &t.glcd_epg_align,
ONOFFPRI_OPTIONS, ONOFFPRI_OPTION_COUNT, true, NULL));
gtps->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_EPG_X_POSITION,
&t.glcd_epg_x_position, true, 0, 500, this));
@@ -510,11 +510,11 @@ int GLCD_Menu::GLCD_Theme_Position_Settings()
gtps->addItem(GenericMenuSeparatorLine);
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_DURATION, &t.glcd_show_duration,
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_DURATION, &t.glcd_duration,
OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
gtps->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_DURATION,
&t.glcd_percent_duration, true, 0, 100, this));
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_ALIGN_DURATION, &t.glcd_align_duration,
&t.glcd_duration_percent, true, 0, 100, this));
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_ALIGN_DURATION, &t.glcd_duration_align,
ONOFFPRI_OPTIONS, ONOFFPRI_OPTION_COUNT, true, NULL));
gtps->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_DURATION_X_POSITION,
&t.glcd_duration_x_position, true, 0, 500, this));
@@ -523,11 +523,11 @@ int GLCD_Menu::GLCD_Theme_Position_Settings()
gtps->addItem(GenericMenuSeparatorLine);
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_START, &t.glcd_show_start,
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_START, &t.glcd_start,
OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
gtps->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_START,
&t.glcd_percent_start, true, 0, 100, this));
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_ALIGN_START, &t.glcd_align_start,
&t.glcd_start_percent, true, 0, 100, this));
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_ALIGN_START, &t.glcd_start_align,
ONOFFPRI_OPTIONS, ONOFFPRI_OPTION_COUNT, true, NULL));
gtps->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_START_X_POSITION,
&t.glcd_start_x_position, true, 0, 500, this));
@@ -536,11 +536,11 @@ int GLCD_Menu::GLCD_Theme_Position_Settings()
gtps->addItem(GenericMenuSeparatorLine);
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_END, &t.glcd_show_end,
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_END, &t.glcd_end,
OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
gtps->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_END,
&t.glcd_percent_end, true, 0, 100, this));
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_ALIGN_END, &t.glcd_align_end,
&t.glcd_end_percent, true, 0, 100, this));
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_ALIGN_END, &t.glcd_end_align,
ONOFFPRI_OPTIONS, ONOFFPRI_OPTION_COUNT, true, NULL));
gtps->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_END_X_POSITION,
&t.glcd_end_x_position, true, 0, 500, this));
@@ -549,11 +549,11 @@ int GLCD_Menu::GLCD_Theme_Position_Settings()
gtps->addItem(GenericMenuSeparatorLine);
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_TIME, &t.glcd_show_time,
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_TIME, &t.glcd_time,
OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
gtps->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_TIME,
&t.glcd_percent_time, true, 0, 100, this));
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_ALIGN_TIME, &t.glcd_align_time,
&t.glcd_time_percent, true, 0, 100, this));
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_ALIGN_TIME, &t.glcd_time_align,
ONOFFPRI_OPTIONS, ONOFFPRI_OPTION_COUNT, true, NULL));
gtps->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_TIME_X_POSITION,
&t.glcd_time_x_position, true, 0, 500, this));
@@ -563,20 +563,20 @@ int GLCD_Menu::GLCD_Theme_Position_Settings()
gtps->addItem(GenericMenuSeparatorLine);
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_PROGRESSBAR, &t.glcd_show_progressbar,
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_PROGRESSBAR, &t.glcd_progressbar,
OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
gtps->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_BAR,
&t.glcd_percent_bar, true, 0, 100, this));
&t.glcd_progressbar_percent, true, 0, 100, this));
gtps->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_BAR_WIDTH,
&t.glcd_bar_width, true, 0, 500, this));
&t.glcd_progressbar_width, true, 0, 500, this));
gtps->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_BAR_X_POSITION,
&t.glcd_bar_x_position, true, 0, 500, this));
&t.glcd_progressbar_x_position, true, 0, 500, this));
gtps->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_BAR_Y_POSITION,
&t.glcd_bar_y_position, true, 0, 500, this));
&t.glcd_progressbar_y_position, true, 0, 500, this));
gtps->addItem(GenericMenuSeparatorLine);
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_WEATHER, &t.glcd_show_weather,
gtps->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_WEATHER, &t.glcd_weather,
OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
int res = gtps->exec(NULL, "");

248
src/gui/glcdthemes.cpp
View File

@@ -284,147 +284,147 @@ void CGLCDThemes::setupDefaultColors()
void CGLCDThemes::setTheme(CConfigFile &configfile)
{
configfile.setInt32("glcd_color_fg_red", t.glcd_color_fg_red);
configfile.setInt32("glcd_color_fg_green", t.glcd_color_fg_green);
configfile.setInt32("glcd_color_fg_blue", t.glcd_color_fg_blue);
configfile.setInt32("glcd_color_bg_red", t.glcd_color_bg_red);
configfile.setInt32("glcd_color_bg_green", t.glcd_color_bg_green);
configfile.setInt32("glcd_color_bg_blue", t.glcd_color_bg_blue);
configfile.setInt32("glcd_color_bar_red", t.glcd_color_bar_red);
configfile.setInt32("glcd_color_bar_green", t.glcd_color_bar_green);
configfile.setInt32("glcd_color_bar_blue", t.glcd_color_bar_blue);
configfile.setInt32("glcd_foreground_color_red", t.glcd_foreground_color_red);
configfile.setInt32("glcd_foreground_color_green", t.glcd_foreground_color_green);
configfile.setInt32("glcd_foreground_color_blue", t.glcd_foreground_color_blue);
configfile.setInt32("glcd_background_color_red", t.glcd_background_color_red);
configfile.setInt32("glcd_background_color_green", t.glcd_background_color_green);
configfile.setInt32("glcd_background_color_blue", t.glcd_background_color_blue);
configfile.setString("glcd_background_image", t.glcd_background_image);
configfile.setString("glcd_font", t.glcd_font);
configfile.setString("glcd_background", t.glcd_background);
configfile.setBool("glcd_show_logo", t.glcd_show_logo);
configfile.setBool("glcd_show_progressbar", t.glcd_show_progressbar);
configfile.setBool("glcd_show_duration", t.glcd_show_duration);
configfile.setBool("glcd_show_start", t.glcd_show_start);
configfile.setBool("glcd_show_end", t.glcd_show_end);
configfile.setBool("glcd_show_time", t.glcd_show_time);
configfile.setBool("glcd_show_weather", t.glcd_show_weather);
configfile.setInt32("glcd_align_channel", t.glcd_align_channel);
configfile.setInt32("glcd_align_epg", t.glcd_align_epg);
configfile.setInt32("glcd_align_duration", t.glcd_align_duration);
configfile.setInt32("glcd_align_start", t.glcd_align_start);
configfile.setInt32("glcd_align_end", t.glcd_align_end);
configfile.setInt32("glcd_align_time", t.glcd_align_time);
configfile.setInt32("glcd_percent_channel", t.glcd_percent_channel);
configfile.setInt32("glcd_channel_percent", t.glcd_channel_percent);
configfile.setInt32("glcd_channel_align", t.glcd_channel_align);
configfile.setInt32("glcd_channel_x_position", t.glcd_channel_x_position);
configfile.setInt32("glcd_channel_y_position", t.glcd_channel_y_position);
configfile.setInt32("glcd_percent_epg", t.glcd_percent_epg);
configfile.setInt32("glcd_epg_x_position", t.glcd_epg_x_position);
configfile.setInt32("glcd_epg_y_position", t.glcd_epg_y_position);
configfile.setInt32("glcd_percent_duration", t.glcd_percent_duration);
configfile.setInt32("glcd_duration_x_position", t.glcd_duration_x_position);
configfile.setInt32("glcd_duration_y_position", t.glcd_duration_y_position);
configfile.setInt32("glcd_percent_start", t.glcd_percent_start);
configfile.setInt32("glcd_start_x_position", t.glcd_start_x_position);
configfile.setInt32("glcd_start_y_position", t.glcd_start_y_position);
configfile.setInt32("glcd_percent_end", t.glcd_percent_end);
configfile.setInt32("glcd_end_x_position", t.glcd_end_x_position);
configfile.setInt32("glcd_end_y_position", t.glcd_end_y_position);
configfile.setInt32("glcd_percent_time", t.glcd_percent_time);
configfile.setInt32("glcd_time_x_position", t.glcd_time_x_position);
configfile.setInt32("glcd_time_y_position", t.glcd_time_y_position);
configfile.setInt32("glcd_percent_bar", t.glcd_percent_bar);
configfile.setInt32("glcd_bar_x_position", t.glcd_bar_x_position);
configfile.setInt32("glcd_bar_y_position", t.glcd_bar_y_position);
configfile.setInt32("glcd_bar_width", t.glcd_bar_width);
configfile.setInt32("glcd_percent_logo", t.glcd_percent_logo);
configfile.setBool("glcd_logo", t.glcd_logo);
configfile.setInt32("glcd_logo_percent", t.glcd_logo_percent);
configfile.setInt32("glcd_logo_x_position", t.glcd_logo_x_position);
configfile.setInt32("glcd_logo_y_position", t.glcd_logo_y_position);
configfile.setInt32("glcd_percent_smalltext", t.glcd_percent_smalltext);
configfile.setInt32("glcd_smalltext_y_position", t.glcd_smalltext_y_position);
configfile.setInt32("glcd_rec_icon_x_position", t.glcd_rec_icon_x_position);
configfile.setInt32("glcd_mute_icon_x_position", t.glcd_mute_icon_x_position);
configfile.setInt32("glcd_ts_icon_x_position", t.glcd_ts_icon_x_position);
configfile.setInt32("glcd_timer_icon_x_position", t.glcd_timer_icon_x_position);
configfile.setInt32("glcd_ecm_icon_x_position", t.glcd_ecm_icon_x_position);
configfile.setInt32("glcd_dd_icon_x_position", t.glcd_dd_icon_x_position);
configfile.setInt32("glcd_txt_icon_x_position", t.glcd_txt_icon_x_position);
configfile.setInt32("glcd_cam_icon_x_position", t.glcd_cam_icon_x_position);
configfile.setInt32("glcd_digital_clock_y_position", t.glcd_digital_clock_y_position);
configfile.setInt32("glcd_size_simple_clock", t.glcd_size_simple_clock);
configfile.setInt32("glcd_simple_clock_y_position", t.glcd_simple_clock_y_position);
configfile.setInt32("glcd_weather_x_position_current", t.glcd_weather_x_position_current);
configfile.setInt32("glcd_weather_x_position_next", t.glcd_weather_x_position_next);
configfile.setInt32("glcd_epg_percent", t.glcd_epg_percent);
configfile.setInt32("glcd_epg_align", t.glcd_epg_align);
configfile.setInt32("glcd_epg_x_position", t.glcd_epg_x_position);
configfile.setInt32("glcd_epg_y_position", t.glcd_epg_y_position);
configfile.setBool("glcd_start", t.glcd_start);
configfile.setInt32("glcd_start_percent", t.glcd_start_percent);
configfile.setInt32("glcd_start_align", t.glcd_start_align);
configfile.setInt32("glcd_start_x_position", t.glcd_start_x_position);
configfile.setInt32("glcd_start_y_position", t.glcd_start_y_position);
configfile.setBool("glcd_end", t.glcd_end);
configfile.setInt32("glcd_end_percent", t.glcd_end_percent);
configfile.setInt32("glcd_end_align", t.glcd_end_align);
configfile.setInt32("glcd_end_x_position", t.glcd_end_x_position);
configfile.setInt32("glcd_end_y_position", t.glcd_end_y_position);
configfile.setBool("glcd_duration", t.glcd_duration);
configfile.setInt32("glcd_duration_percent", t.glcd_duration_percent);
configfile.setInt32("glcd_duration_align", t.glcd_duration_align);
configfile.setInt32("glcd_duration_x_position", t.glcd_duration_x_position);
configfile.setInt32("glcd_duration_y_position", t.glcd_duration_y_position);
configfile.setBool("glcd_progressbar", t.glcd_progressbar);
configfile.setInt32("glcd_progressbar_color_red", t.glcd_progressbar_color_red);
configfile.setInt32("glcd_progressbar_color_green", t.glcd_progressbar_color_green);
configfile.setInt32("glcd_progressbar_color_blue", t.glcd_progressbar_color_blue);
configfile.setInt32("glcd_progressbar_percent", t.glcd_progressbar_percent);
configfile.setInt32("glcd_progressbar_width", t.glcd_progressbar_width);
configfile.setInt32("glcd_progressbar_x_position", t.glcd_progressbar_x_position);
configfile.setInt32("glcd_progressbar_y_position", t.glcd_progressbar_y_position);
configfile.setBool("glcd_time", t.glcd_time);
configfile.setInt32("glcd_time_percent", t.glcd_time_percent);
configfile.setInt32("glcd_time_align", t.glcd_time_align);
configfile.setInt32("glcd_time_x_position", t.glcd_time_x_position);
configfile.setInt32("glcd_time_y_position", t.glcd_time_y_position);
configfile.setInt32("glcd_icons_percent", t.glcd_icons_percent);
configfile.setInt32("glcd_icons_y_position", t.glcd_icons_y_position);
configfile.setInt32("glcd_icon_ecm_x_position", t.glcd_icon_ecm_x_position);
configfile.setInt32("glcd_icon_cam_x_position", t.glcd_icon_cam_x_position);
configfile.setInt32("glcd_icon_txt_x_position", t.glcd_icon_txt_x_position);
configfile.setInt32("glcd_icon_dd_x_position", t.glcd_icon_dd_x_position);
configfile.setInt32("glcd_icon_mute_x_position", t.glcd_icon_mute_x_position);
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.setBool("glcd_weather", t.glcd_weather);
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_weather_x_position_current_standby", t.glcd_weather_x_position_current_standby);
configfile.setInt32("glcd_weather_x_position_next_standby", t.glcd_weather_x_position_next_standby);
configfile.setInt32("glcd_weather_y_position_standby", t.glcd_weather_y_position_standby);
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_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);
configfile.setInt32("glcd_standby_weather_y_position", t.glcd_standby_weather_y_position);
configfile.setInt32("glcd_position_settings", t.glcd_position_settings);
}
void CGLCDThemes::getTheme(CConfigFile &configfile)
{
t.glcd_color_fg_red = configfile.getInt32("glcd_color_fg_red", 0xff);
t.glcd_color_fg_green = configfile.getInt32("glcd_color_fg_green", 0xff);
t.glcd_color_fg_blue = configfile.getInt32("glcd_color_fg_blue", 0xff);
t.glcd_color_bg_red = configfile.getInt32("glcd_color_bg_red", 0x00);
t.glcd_color_bg_green = configfile.getInt32("glcd_color_bg_green", 0x00);
t.glcd_color_bg_blue = configfile.getInt32("glcd_color_bg_blue", 0x00);
t.glcd_color_bar_red = configfile.getInt32("glcd_color_bar_red", 0x62);
t.glcd_color_bar_green = configfile.getInt32("glcd_color_bar_green", 0x62);
t.glcd_color_bar_blue = configfile.getInt32("glcd_color_bar_blue", 0x62);
t.glcd_foreground_color_red = configfile.getInt32("glcd_foreground_color_red", 0xff);
t.glcd_foreground_color_green = configfile.getInt32("glcd_foreground_color_green", 0xff);
t.glcd_foreground_color_blue = configfile.getInt32("glcd_foreground_color_blue", 0xff);
t.glcd_background_color_red = configfile.getInt32("glcd_background_color_red", 0x00);
t.glcd_background_color_green = configfile.getInt32("glcd_background_color_green", 0x00);
t.glcd_background_color_blue = configfile.getInt32("glcd_background_color_blue", 0x00);
t.glcd_background_image = configfile.getString("glcd_background_image", "");
t.glcd_font = configfile.getString("glcd_font", "");
t.glcd_background = configfile.getString("glcd_background", "");
t.glcd_show_logo = configfile.getBool("glcd_show_logo", true);
t.glcd_show_progressbar = configfile.getBool("glcd_show_progressbar", false);
t.glcd_show_duration = configfile.getBool("glcd_show_duration", false);
t.glcd_show_start = configfile.getBool("glcd_show_start", false);
t.glcd_show_end = configfile.getBool("glcd_show_end", false);
t.glcd_show_time = configfile.getBool("glcd_show_time", false);
t.glcd_show_weather = configfile.getBool("glcd_show_weather", false);
t.glcd_align_channel = configfile.getInt32("glcd_align_channel", 0);
t.glcd_align_epg = configfile.getInt32("glcd_align_epg", 0);
t.glcd_align_duration = configfile.getInt32("glcd_align_duration", 0);
t.glcd_align_start = configfile.getInt32("glcd_align_start", 0);
t.glcd_align_end = configfile.getInt32("glcd_align_end", 0);
t.glcd_align_time = configfile.getInt32("glcd_align_time", 0);
t.glcd_percent_channel = configfile.getInt32("glcd_percent_channel", 0);
t.glcd_channel_percent = configfile.getInt32("glcd_channel_percent", 0);
t.glcd_channel_align = configfile.getInt32("glcd_channel_align", 0);
t.glcd_channel_x_position = configfile.getInt32("glcd_channel_x_position", 0);
t.glcd_channel_y_position = configfile.getInt32("glcd_channel_y_position", 0);
t.glcd_percent_epg = configfile.getInt32("glcd_percent_epg", 0);
t.glcd_epg_x_position = configfile.getInt32("glcd_epg_x_position", 0);
t.glcd_epg_y_position = configfile.getInt32("glcd_epg_y_position", 0);
t.glcd_percent_duration = configfile.getInt32("glcd_percent_duration", 0);
t.glcd_duration_x_position = configfile.getInt32("glcd_duration_x_position", 0);
t.glcd_duration_y_position = configfile.getInt32("glcd_duration_y_position", 0);
t.glcd_percent_start = configfile.getInt32("glcd_percent_start", 0);
t.glcd_start_x_position = configfile.getInt32("glcd_start_x_position", 0);
t.glcd_start_y_position = configfile.getInt32("glcd_start_y_position", 0);
t.glcd_percent_end = configfile.getInt32("glcd_percent_end", 0);
t.glcd_end_x_position = configfile.getInt32("glcd_end_x_position", 0);
t.glcd_end_y_position = configfile.getInt32("glcd_end_y_position", 0);
t.glcd_percent_time = configfile.getInt32("glcd_percent_time", 0);
t.glcd_time_x_position = configfile.getInt32("glcd_time_x_position", 0);
t.glcd_time_y_position = configfile.getInt32("glcd_time_y_position", 0);
t.glcd_percent_bar = configfile.getInt32("glcd_percent_bar", 0);
t.glcd_bar_x_position = configfile.getInt32("glcd_bar_x_position", 0);
t.glcd_bar_y_position = configfile.getInt32("glcd_bar_y_position", 0);
t.glcd_bar_width = configfile.getInt32("glcd_bar_width", 0);
t.glcd_percent_logo = configfile.getInt32("glcd_percent_logo", 0);
t.glcd_logo = configfile.getBool("glcd_logo", true);
t.glcd_logo_percent = configfile.getInt32("glcd_logo_percent", 0);
t.glcd_logo_x_position = configfile.getInt32("glcd_logo_x_position", 0);
t.glcd_logo_y_position = configfile.getInt32("glcd_logo_y_position", 0);
t.glcd_percent_smalltext = configfile.getInt32("glcd_percent_smalltext", 0);
t.glcd_smalltext_y_position = configfile.getInt32("glcd_smalltext_y_position", 0);
t.glcd_rec_icon_x_position = configfile.getInt32("glcd_rec_icon_x_position", 0);
t.glcd_mute_icon_x_position = configfile.getInt32("glcd_mute_icon_x_position", 0);
t.glcd_ts_icon_x_position = configfile.getInt32("glcd_ts_icon_x_position", 0);
t.glcd_timer_icon_x_position = configfile.getInt32("glcd_timer_icon_x_position", 0);
t.glcd_ecm_icon_x_position = configfile.getInt32("glcd_ecm_icon_x_position", 0);
t.glcd_dd_icon_x_position = configfile.getInt32("glcd_dd_icon_x_position", 0);
t.glcd_txt_icon_x_position = configfile.getInt32("glcd_txt_icon_x_position", 0);
t.glcd_cam_icon_x_position = configfile.getInt32("glcd_cam_icon_x_position", 0);
t.glcd_digital_clock_y_position = configfile.getInt32("glcd_digital_clock_y_position", 0);
t.glcd_size_simple_clock = configfile.getInt32("glcd_size_simple_clock", 0);
t.glcd_simple_clock_y_position = configfile.getInt32("glcd_simple_clock_y_position", 0);
t.glcd_weather_x_position_current = configfile.getInt32("glcd_weather_x_position_current", 0);
t.glcd_weather_x_position_next = configfile.getInt32("glcd_weather_x_position_next", 0);
t.glcd_epg_percent = configfile.getInt32("glcd_epg_percent", 0);
t.glcd_epg_align = configfile.getInt32("glcd_epg_align", 0);
t.glcd_epg_x_position = configfile.getInt32("glcd_epg_x_position", 0);
t.glcd_epg_y_position = configfile.getInt32("glcd_epg_y_position", 0);
t.glcd_start = configfile.getBool("glcd_start", false);
t.glcd_start_percent = configfile.getInt32("glcd_start_percent", 0);
t.glcd_start_x_position = configfile.getInt32("glcd_start_x_position", 0);
t.glcd_start_y_position = configfile.getInt32("glcd_start_y_position", 0);
t.glcd_start_align = configfile.getInt32("glcd_start_align", 0);
t.glcd_end = configfile.getBool("glcd_end", false);
t.glcd_end_percent = configfile.getInt32("glcd_end_percent", 0);
t.glcd_end_align = configfile.getInt32("glcd_end_align", 0);
t.glcd_end_x_position = configfile.getInt32("glcd_end_x_position", 0);
t.glcd_end_y_position = configfile.getInt32("glcd_end_y_position", 0);
t.glcd_duration = configfile.getBool("glcd_duration", false);
t.glcd_duration_percent = configfile.getInt32("glcd_duration_percent", 0);
t.glcd_duration_align = configfile.getInt32("glcd_duration_align", 0);
t.glcd_duration_x_position = configfile.getInt32("glcd_duration_x_position", 0);
t.glcd_duration_y_position = configfile.getInt32("glcd_duration_y_position", 0);
t.glcd_progressbar = configfile.getBool("glcd_progressbar", false);
t.glcd_progressbar_color_red = configfile.getInt32("glcd_progressbar_color_red", 0x62);
t.glcd_progressbar_color_green = configfile.getInt32("glcd_progressbar_color_green", 0x62);
t.glcd_progressbar_color_blue = configfile.getInt32("glcd_progressbar_color_blue", 0x62);
t.glcd_progressbar_percent = configfile.getInt32("glcd_progressbar_percent", 0);
t.glcd_progressbar_width = configfile.getInt32("glcd_progressbar_width", 0);
t.glcd_progressbar_x_position = configfile.getInt32("glcd_progressbar_x_position", 0);
t.glcd_progressbar_y_position = configfile.getInt32("glcd_progressbar_y_position", 0);
t.glcd_time = configfile.getBool("glcd_time", false);
t.glcd_time_percent = configfile.getInt32("glcd_time_percent", 0);
t.glcd_time_align = configfile.getInt32("glcd_time_align", 0);
t.glcd_time_x_position = configfile.getInt32("glcd_time_x_position", 0);
t.glcd_time_y_position = configfile.getInt32("glcd_time_y_position", 0);
t.glcd_icons_percent = configfile.getInt32("glcd_icons_percent", 0);
t.glcd_icons_y_position = configfile.getInt32("glcd_icons_y_position", 0);
t.glcd_icon_ecm_x_position = configfile.getInt32("glcd_icon_ecm_x_position", 0);
t.glcd_icon_cam_x_position = configfile.getInt32("glcd_icon_cam_x_position", 0);
t.glcd_icon_txt_x_position = configfile.getInt32("glcd_icon_txt_x_position", 0);
t.glcd_icon_dd_x_position = configfile.getInt32("glcd_icon_dd_x_position", 0);
t.glcd_icon_mute_x_position = configfile.getInt32("glcd_icon_mute_x_position", 0);
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_weather = configfile.getBool("glcd_weather", false);
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_weather_x_position_current_standby = configfile.getInt32("glcd_weather_x_position_current_standby", 0);
t.glcd_weather_x_position_next_standby = configfile.getInt32("glcd_weather_x_position_next_standby", 0);
t.glcd_weather_y_position_standby = configfile.getInt32("glcd_weather_y_position_standby", 0);
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_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);
t.glcd_standby_weather_y_position = configfile.getInt32("glcd_standby_weather_y_position", 0);
t.glcd_position_settings = configfile.getInt32("glcd_position_settings", 0);
if (g_settings.glcd_theme_name.empty())

140
src/system/settings.h
View File

@@ -197,91 +197,89 @@ struct timer_remotebox_item
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;
unsigned char glcd_foreground_color_red;
unsigned char glcd_foreground_color_green;
unsigned char glcd_foreground_color_blue;
unsigned char glcd_background_color_red;
unsigned char glcd_background_color_green;
unsigned char glcd_background_color_blue;
std::string glcd_background_image;
std::string glcd_font;
std::string glcd_background;
int glcd_show_logo;
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_percent;
int glcd_channel_align;
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;
int glcd_logo_percent;
int glcd_logo_x_position;
int glcd_logo_y_position;
int glcd_percent_smalltext;
int glcd_smalltext_y_position;
int glcd_epg_percent;
int glcd_epg_align;
int glcd_epg_x_position;
int glcd_epg_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_start;
int glcd_start_percent;
int glcd_start_align;
int glcd_start_x_position;
int glcd_start_y_position;
int glcd_standby_weather;
int glcd_digital_clock_y_position;
int glcd_size_simple_clock;
int glcd_simple_clock_y_position;
int glcd_end;
int glcd_end_percent;
int glcd_end_align;
int glcd_end_x_position;
int glcd_end_y_position;
int glcd_weather_x_position_current;
int glcd_weather_x_position_next;
int glcd_duration;
int glcd_duration_percent;
int glcd_duration_align;
int glcd_duration_x_position;
int glcd_duration_y_position;
int glcd_progressbar;
unsigned char glcd_progressbar_color_red;
unsigned char glcd_progressbar_color_green;
unsigned char glcd_progressbar_color_blue;
int glcd_progressbar_percent;
int glcd_progressbar_width;
int glcd_progressbar_x_position;
int glcd_progressbar_y_position;
int glcd_time;
int glcd_time_percent;
int glcd_time_align;
int glcd_time_x_position;
int glcd_time_y_position;
int glcd_icons_percent;
int glcd_icons_y_position;
int glcd_icon_ecm_x_position;
int glcd_icon_cam_x_position;
int glcd_icon_txt_x_position;
int glcd_icon_dd_x_position;
int glcd_icon_mute_x_position;
int glcd_icon_timer_x_position;
int glcd_icon_rec_x_position;
int glcd_icon_ts_x_position;
int glcd_weather;
int glcd_weather_curr_x_position;
int glcd_weather_next_x_position;
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_standby_clock_digital_y_position;
int glcd_standby_clock_simple_size;
int glcd_standby_clock_simple_y_position;
int glcd_standby_weather_curr_x_position;
int glcd_standby_weather_next_x_position;
int glcd_standby_weather_y_position;
int glcd_position_settings;
};