update glcd

Origin commit data
------------------
Branch: ni/coolstream
Commit: 0c2dcc9eb1
Author: redblue-pkt <redblue-pkt@orange.pl>
Date: 2020-06-19 (Fri, 19 Jun 2020)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

data/Makefile.am

@@ -17,6 +17,12 @@ SUBDIRS = \
 	y-web \
 	zapit
 
-if BOXTYPE_TRIPLE
-SUBDIRS += lcd
+if ENABLE_GRAPHLCD
+SUBDIRS += \
+	othemes
+endif
+
+if BOXTYPE_TRIPLE
+SUBDIRS += \
+	lcd
 endif

data/fonts/Makefile.am

@@ -18,6 +18,12 @@ install_DATA += \
 	ubuntumono-b-webfont.ttf \
 	ubuntumono-r-webfont.ttf
 
+if ENABLE_GRAPHLCD
+install_DATA += \
+	led.ttf \
+	lcd.ttf
+endif
+
 install-data-hook:
 	cd $(DESTDIR)$(FONTDIR); \
 		mv $(neutrino_ttf) neutrino.ttf; \

data/icons/Makefile.am

@@ -11,5 +11,10 @@ SUBDIRS = \
 	various \
 	weather
 
+if ENABLE_GRAPHLCD
+SUBDIRS += \
+	oled
+endif
+
 install-data-hook:
 	$(INSTALL) -d $(DESTDIR)/$(ICONSDIR)/logo

data/icons/oled/Makefile.am

@@ -0,0 +1,14 @@
+SUBDIRS = \
+	clock \
+	weather
+
+installdir = $(ICONSDIR)/oled
+
+install_DATA = \
+        advanced.png \
+        blank.png \
+        easy.png \
+        medium.png \
+        simple.png \
+	standby.png \
+        weather.png

data/icons/oled/clock/Makefile.am

@@ -0,0 +1,17 @@
+installdir = $(ICONSDIR)/oled/clock
+
+install_DATA = \
+	analog_clock.png \
+	analog_hour.png \
+	analog_min.png \
+	time_dots.png \
+	time_eight.png \
+	time_five.png \
+	time_four.png \
+	time_nine.png \
+	time_one.png \
+	time_seven.png \
+	time_six.png \
+	time_three.png \
+	time_two.png \
+	time_zero.png

data/icons/oled/weather/Makefile.am

@@ -0,0 +1,15 @@
+installdir = $(ICONSDIR)/oled/weather
+
+install_DATA = \
+	clear-day.png \
+	clear-night.png \
+	cloudy.png \
+	fog.png \
+	hail.png \
+	partly-cloudy-day.png \
+	partly-cloudy-night.png \
+	rain.png \
+	sleet.png \
+	snow.png \
+	thunderstorm.png \
+	wind.png

data/locale/deutsch.locale

@@ -886,10 +886,24 @@ fsk.from_7 ab 7
 fsk.to_12 bis 12
 fsk.to_16 bis 16
 fsk.to_7 bis 7
+glcd.align_center zentriert
+glcd.align_channel Sender ausrichten
+glcd.align_duration Sendungsdauer ausrichten
+glcd.align_end Sendungsende ausrichten
+glcd.align_epg EPG ausrichten
+glcd.align_left links
+glcd.align_none keine
+glcd.align_right rechts
+glcd.align_start Sendungsstart ausrichten
+glcd.align_time Zeit ausrichten
+glcd.bar_width Fortschrittsbalken-Weite
+glcd.bar_x_position Fortschrittsbalken x-Position
+glcd.bar_y_position Fortschrittsbalken y-Position
 glcd.brightness Helligkeit
-glcd.brightness_standby Helligkeit in Standby
-glcd.clock.analog analog
-glcd.clock.digital_hm digital
+glcd.brightness_standby Helligkeit im Standby
+glcd.brightness_dim Dimmen
+glcd.brightness_dim_time Dimmen nach
+glcd.brightness_settings Helligkeits-Einstellungen
 glcd.color.amber Amber
 glcd.color.black Schwarz
 glcd.color.blue Blau
@@ -911,25 +925,62 @@ glcd.color.red Rot
 glcd.color.teal Teal
 glcd.color.white Weiß
 glcd.color.yellow Gelb
+glcd.channel_x_position Sender x-Position
+glcd.channel_y_position Sender y-Position
+glcd.digital_clock_y_position Digitaluhr y-Position
 glcd.display Display-Typ
+glcd.duration_x_position Sendungsdauer x-Position
+glcd.duration_y_position Sendungsdauer y-Position
 glcd.enable GraphLCD aktiv
+glcd.end_x_position Sendungsende x-Position
+glcd.end_y_position Sendungsende y-Position
+glcd.epg_x_position EPG x-Position
+glcd.epg_y_position EPG x-Position
 glcd.font Schrift
+glcd.font_autoresize Automatische SChriftgröße
 glcd.head GraphLCD-Unterstützung
+glcd.logo_x_position Senderlogo x-Position
+glcd.logo_y_position Senderlogo y-Position
 glcd.mirror_osd OSD-Menü auf GraphLCD anzeigen
 glcd.mirror_video Videobild auf GraphLCD anzeigen
+glcd.position_settings Positions-Einstellungen
 glcd.restart Neu erkennen
 glcd.scroll_speed Scroll-Geschwindigkeit
 glcd.select.bar Fortschrittsbalken-Farbe
 glcd.select.bg Hintergrund-Farbe
 glcd.select.fg Vordergrund-Farbe
-glcd.show_logo Sender-Logo anzeigen
+glcd.show_duration Sendungsdauer zeigen
+glcd.show_end Sendungsende zeigen
+glcd.show_logo Senderlogo anzeigen
+glcd.show_progressbar Fortschrittsbalken
+glcd.show_start Sendungsstart zeigen
+glcd.show_time Uhrzeit anzeigen
+glcd.show_weather Wetter anzeigen
+glcd.simple_clock_y_position Einfache Uhr y-Position
 glcd.size_bar Fortschrittsbalken-Größe
 glcd.size_channel Sender-Größe
+glcd.size_duration Sendungsdauer-Größe
+glcd.size_end Sendungsende-Größe
 glcd.size_epg EPG-Größe
-glcd.size_logo Logo-Größe
+glcd.size_logo Senderlogo-Größe
+glcd.size_simple_clock Einfache Uhr-Größe
+glcd.size_start Sendungsstart-Größe
 glcd.size_time Uhrzeit-Größe
-glcd.size_time_standby Uhrzeit-Größe in Standby
-glcd.time_in_standby Zeitanzeige in Standby
+glcd.size_time_standby Uhrzeit-Größe im Standby
+glcd.theme Thema
+glcd.theme_position_settings Positions-Einstellungen
+glcd.theme_settings Thema-Einstellungen
+glcd.standby_analog_clock Analoge Uhr
+glcd.standby_digital_clock Digitale Uhr
+glcd.standby_lcd_clock LCD-Uhr
+glcd.standby_led_clock LED-Uhr
+glcd.standby_settings Standby-Einstellungen
+glcd.standby_weather Wetter im Standby
+glcd.start_x_position Sendungsstart x-Position
+glcd.start_y_position Sendungsstart y-Position
+glcd.time_in_standby Zeitanzeige im Standby
+glcd.time_x_position Uhrzeit x-Position
+glcd.time_y_position Uhrzeit y-Position
 glcd.volume Lautstärke
 hdd_10min 10 min.
 hdd_1min 1 min.
@@ -1817,6 +1868,7 @@ menu.hint_volume_digits Zifferndarstellung der Lautstärkeanzeige ein- oder auss
 menu.hint_volume_pos Wählen Sie die Position der Lautstärkeanzeige aus
 menu.hint_volume_size Wählen Sie die Höhe der Lautstärkeanzeige
 menu.hint_weather_api_key Geben Sie den Dark Sky API Schlüssel ein. Eine leere Eingabe schaltet die Wetter-Unterstützung aus
+menu.hint_weather_country
 menu.hint_weather_enabled Schaltet die Wetter-Unterstützung (darksky.net) ein bzw. aus
 menu.hint_weather_location Wählen Sie eine Stadt in ihrer Nähe zur Anzeige der Wetterdaten aus
 menu.hint_webradio_setup Hier konfigurierte WebRadio-Kanäle finden Sie in der Kanalverwaltung.
@@ -2931,6 +2983,9 @@ videomenu.zappingmode Umschaltverhalten
 videomenu.zappingmode_mute Schwarzes Bild
 videomenu.zappingmode_hold Standbild
 weather.api_key Wetter API Schlüssel (Dark Sky)
+weather.country Länderwahl
+weather.country_deutschland Deutschland
+weather.country_norway Norwegen
 weather.enabled Wetter-Unterstützung
 weather.location Wetter-Standort
 webradio.head WebRadio

data/locale/english.locale

@@ -888,8 +888,6 @@ fsk.to_16 to 16
 fsk.to_7 to 7
 glcd.brightness Brightness
 glcd.brightness_standby Brightness in standby
-glcd.clock.analog analog
-glcd.clock.digital_hm digital
 glcd.color.amber Amber
 glcd.color.black Black
 glcd.color.blue Blue

data/othemes/Makefile.am

@@ -0,0 +1,9 @@
+installdir = $(THEMESDIR)
+
+install_DATA = \
+	advanced.otheme \
+	default.otheme \
+	easy.otheme \
+	medium.otheme \
+	simple.otheme \
+	weather.otheme

data/othemes/advanced.otheme

@@ -0,0 +1,72 @@
+# 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=0
+glcd_color_bar_green=0
+glcd_color_bar_blue=100
+glcd_font=/usr/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_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_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_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_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_position_settings=true

data/othemes/default.otheme

@@ -0,0 +1,72 @@
+# 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=0    
+glcd_color_bar_green=0
+glcd_color_bar_blue=100
+glcd_font=/usr/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_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_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=485
+glcd_percent_logo=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_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_position_settings=true

data/othemes/easy.otheme

@@ -0,0 +1,72 @@
+# 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=0    
+glcd_color_bar_green=0
+glcd_color_bar_blue=100
+glcd_font=/usr/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_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_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_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_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_position_settings=true

data/othemes/medium.otheme

@@ -0,0 +1,72 @@
+# 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=0    
+glcd_color_bar_green=0
+glcd_color_bar_blue=100
+glcd_font=/usr/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_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_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_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_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_position_settings=true

data/othemes/simple.otheme

@@ -0,0 +1,72 @@
+# 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=0    
+glcd_color_bar_green=0
+glcd_color_bar_blue=100
+glcd_font=/usr/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_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_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_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_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_position_settings=true

data/othemes/weather.otheme

@@ -0,0 +1,72 @@
+# 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=0    
+glcd_color_bar_green=0
+glcd_color_bar_blue=100
+glcd_font=/usr/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_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_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_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_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_position_settings=true

data/y-web/Makefile.am

@@ -55,6 +55,7 @@ install_DATA =	channels.js \
 		Y_Settings_automount.yhtm \
 		Y_Settings_Backup.yhtm \
 		Y_Settings_buttons.yhtm \
+		Y_Settings_glcd.yhtm \
 		Y_Settings_lcd.yhtm \
 		Y_Settings_Live.yhtm \
 		Y_Settings_Menue.yhtm \
@@ -79,6 +80,7 @@ install_DATA =	channels.js \
 		Y_Tools_Cmd.yhtm \
 		Y_Tools_Flash_Menue.yhtm \
 		Y_Tools_Flash_Upload.yhtm \
+		Y_Tools_Glcd_Screenshot.yhtm \
 		Y_Tools_Info_Menue.yhtm \
 		Y_Tools_Installer.yhtm \
 		Y_Tools_lcshot.yhtm \

data/y-web/Y_Baselib.js

@@ -505,3 +505,8 @@ function saveTextAsFile(content, filename, filetype)
 	}
 	downloadLink.click();
 }
+
+function glcdscreenshot(_filename)
+{
+	return loadSyncURL("/control/glcdscreenshot?name="+_filename);
+}

data/y-web/Y_Boxcontrol_Menue.yhtm

@@ -148,6 +148,19 @@ function get_data(){
 				<li>
 					<a target="work" title="{=L:bc.menue.remote_desc=}" href="Y_Tools_Rcsim.yhtm">{=L:bc.menue.remote=}</a>
 				</li>
+				{=if-not-equal:{=var-get:boxtype=}~VU+ SOLO4K~
+				{=if-not-equal:{=var-get:boxtype=}~VU+ DUO4K~
+				{=if-not-equal:{=var-get:boxtype=}~VU+ ULTIMO4K~
+				{=if-not-equal:{=var-get:boxtype=}~VU+ UNO4K~
+				{=if-not-equal:{=var-get:boxtype=}~VU+ UNO4KSE~
+				<li>
+					<a target="work" title="{=L:bc.menue.glcd_screenshot_desc=}" href="Y_Tools_Glcd_Screenshot.yhtm">{=L:bc.menue.glcd_screenshot=}</a>
+				</li>
+				~=}
+				~=}
+				~=}
+				~=}
+				~=}
 				{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
 				<li>
 					{=if-empty:{=var-get:lcshot=}~

data/y-web/Y_Settings_Menue.yhtm

@@ -84,6 +84,21 @@ function init(){
 					{=var-set:m_link_text={=L:set.menue.pictureviewer=}=}
 					{=include-block:Y_Blocks.txt;management_link=}
 				</li>
+				{=if-not-equal:{=var-get:boxtype=}~VU+ SOLO4K~
+				{=if-not-equal:{=var-get:boxtype=}~VU+ DUO4K~
+				{=if-not-equal:{=var-get:boxtype=}~VU+ ULTIMO4K~
+				{=if-not-equal:{=var-get:boxtype=}~VU+ UNO4K~
+				{=if-not-equal:{=var-get:boxtype=}~VU+ UNO4KSE~
+                                <li>
+                                        {=var-set:m_link_href=Y_Settings_glcd.yhtm=}
+                                        {=var-set:m_link_text={=L:set.menue.glcd_display=}=}
+                                        {=include-block:Y_Blocks.txt;management_link=}
+                                </li>
+				~=}
+				~=}
+				~=}
+				~=}
+				~=}
 				{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
 				<li>
 					{=var-set:m_link_href=Y_Settings_video_audio.yhtm=}

data/y-web/Y_Settings_glcd.yhtm

@@ -0,0 +1,128 @@
+{=include-block:Y_Blocks.txt;management_check_top=}
+{=include-block:Y_Blocks.txt;head=}
+<style type="text/css">
+/*<![CDATA[*/
+	.alink {
+	text-decoration: underline;
+	}
+/*]]>*/
+</style>
+<script type="text/javascript" src="/Y_Baselib.js"></script>
+<script type="text/javascript">
+/*<![CDATA[*/
+function do_init()
+{
+	var val = "";
+	obj_set_radio_value('glcd_enable', "{=ini-get:/etc/neutrino/config/neutrino.conf;glcd_enable;1~open=}");
+	obj_set_radio_value('glcd_inverse', "{=ini-get:/etc/neutrino/config/neutrino.conf;glcd_inverse;0~cache=}");
+
+	val = "{=ini-get:/etc/neutrino/config/neutrino.conf;glcd_brightness_dim;5~cache=}";
+		document.f.glcd_brightness_dim.value = val;
+	val = "{=ini-get:/etc/neutrino/config/neutrino.conf;glcd_brightness_dim_time;15~cache=}";
+		document.f.glcd_.brightness_dim_time.value = val;
+	val = "{=ini-get:/etc/neutrino/config/neutrino.conf;glcd_brightness;7~cache=}";
+		document.f.glcd_brightness.value = val;
+	val = "{=ini-get:/etc/neutrino/config/neutrino.conf;glcd_brightness_standby;1~cache=}";
+		document.f.glcd_brightness_standby.value = val;
+}
+
+function setDefault()
+{
+	document.f.glcd_brightness_dim.value = 5;
+	document.f.glcd_brightness_dim_time.value = 15
+	document.f.glcd_brightness.value = 7;
+	document.f.glcd_brightness_standby.value = 1;
+}
+
+function do_submit()
+{
+		show_waitbox(true);
+		if (document.f.glcd_brightness_dim.value > 10)
+			document.f.glcd_brightness_dim.value = 10;
+		else if (document.f.glcd_brightness_dim.value < 0)
+			document.f.glcd_brightness_dim.value = 0;
+		if (document.f.glcd_brightness_dim_time.value > 60)
+			document.f.glcd_brightness_dim_time.value = 60;
+		else if (document.f.glcd_brightness_dim_time.value < 0)
+			document.f.glcd_brightness_dim_time.value = 0;
+		if (document.f.glcd_brightness.value > 10)
+			document.f.glcd_brightness.value = 10;
+		else if (document.f.glcd_brightness.value < 0)
+			document.f.glcd_brightness.value = 0;
+		if (document.f.glcd_brightness_standby.value > 10)
+			document.f.glcd_brightness_standby.value = 10;
+		else if (document.f.glcd_brightness_standby.value < 0)
+			document.f.glcd_brightness_standby.value = 0;
+		document.f.submit();
+}
+/*]]>*/
+</script>
+</head>
+<body onload="do_init()">
+{=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
+<div class="work_box">
+	<div class="work_box_head"><div class="work_box_head_h2">
+	{=var-set:help_url=Help-Settings-LCD=}{=var-set:menu=GLCD Einstellungen=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	<div class="work_box_body">
+	<form name="f" class="y_form" action="">
+		<table cellspacing="0" border="0" cellpadding="2" width="100%">
+			<tr>
+				<td colspan="2" class="y_form_header">GLCD</td>
+			</tr>
+			<tr>
+				<td title="glcd: off/on" width="35%">Power</td>
+				<td>
+					<input type="radio" name="glcd_enable" value="0" />AUS&nbsp;
+					<input type="radio" name="glcd_enable" value="1" />EIN
+				</td>
+			</tr>
+			<tr>
+				<td title="inverse glcd: off/on">Invertieren</td>
+				<td>
+					<input type="radio" name="glcd_inverse" value="0" />AUS&nbsp;
+					<input type="radio" name="glcd_inverse" value="1" />EIN
+				</td>
+			</tr>
+			<tr>
+				<td title="brightness after dimm-timeout">Helligkeit nach dimm-Timeout</td>
+				<td>
+					<input type="text" name="glcd_brightness_dim" size="3" maxlength="3" />
+				</td>
+			</tr>
+			<tr>
+				<td  title="dimm-timeout">Dimm-Timeout</td>
+				<td>
+					<input type="text" name="glcd_brightness_dim_time" size="3" maxlength="3" />
+				</td>
+			</tr>
+			<tr>
+				<td title="lcd brightness normal 0-255">normale Helligkeit</td>
+				<td>
+					<input type="text" name="glcd_brightness" size="3" maxlength="3" />
+				</td>
+			</tr>
+			<tr> 
+				<td title="lcd brightness standby 0-255">Standby Helligkeit</td>
+				<td>
+					<input type="text" name="glcd_brightness_standby" size="3" maxlength="3" />
+				</td>
+			</tr>
+			<tr> 
+				<td>&nbsp;</td>
+				<td><a href="javascript:setDefault()" class="alink">Voreinstellung benutzen</a></td>
+			</tr>
+			<tr>
+				<td colspan="2" class="y_form_header">Anzeige-Modi</td>
+			</tr>
+		</table>
+		<br />
+		<input type="hidden" name="execute" value="include-block:Y_Blocks.txt;glcd_save_settings;nix" />
+		<button type="button" ytype="save" title="submit and save values" onclick="do_submit()">Speichern</button>&nbsp;
+		<button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">reload Neutrino</button>&nbsp;
+		<a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">Hilfe</a>
+	</form>
+	</div>
+</div>
+</body>
+</html>
+{=include-block:Y_Blocks.txt;management_check_bottom=}

data/y-web/Y_Tools_Glcd_Screenshot.yhtm

@@ -0,0 +1,98 @@
+
+{=include-block:Y_Blocks.txt;head=}
+<script type="text/javascript" src="/Y_Baselib.js"></script>
+<script type="text/javascript" src="/prototype.js"></script>
+<script type="text/javascript">
+//<![CDATA[
+var interval;
+
+function do_snapshot() {
+
+	$('shot').hide();
+	$('shot').src = "";
+	$('buttons').hide();
+	$('status').show();
+
+	var filename = "glcdscreenshot";
+	if (id("filename").value != "") {
+		filename = id("filename").value;
+	}
+
+	loadSyncURL("/control/glcdscreenshot?name"+filename);
+
+	do_showshot(filename);	
+}
+function do_showshot(_filename) {
+	if (_filename == "")
+		_filename = "glcdscreenshot";
+
+	$('status').hide();
+	$('buttons').show();
+	$('shot').src = "/tmp/"+_filename+".png?"+Math.random();
+	$('shot').show();
+}
+function do_clearshot(){
+	$('shot').hide();
+	$('shot').src = "";
+
+	loadSyncURL("/control/exec?Y_Tools&screenshot_clear");
+}
+
+function do_reload(){
+	if (document.getElementById("checkReload").checked)
+		interval = setInterval(do_snapshot, document.getElementById("inputReload").value + "000");
+	else
+		clearInterval(interval);
+}
+//]]>
+</script>
+</head>
+<body onload="do_snapshot();">
+<div class="work_box" id="work_box">
+	<div class="work_box_head"><div class="work_box_head_h2">
+	{=var-set:help_url==}{=var-set:menu={=L:bc.menue.screenshot=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	<div class="work_box_body">
+		<div id="screenshot_header">
+		<div id="buttons" style="display: block">
+			<div class="left">
+				<button name="snapshot" ytype="snapshot" onclick="do_snapshot()">{=L:bc.screenshot.create=}</button>&nbsp;
+				<button name="clearshot" ytype="clearshot" onclick="do_clearshot()">{=L:bc.screenshot.delete=}</button>&nbsp;
+			</div>
+			<div class="right">
+				<form onsubmit="do_snapshot(); return false">
+				{=L:filename=}: <input type="text" value="glcdscreenshot" id="filename" size="10" />
+				</form>
+			</div>
+			<div class="clear"></div>
+			<div class="right">
+				Reload: <input type="number" value="15" id="inputReload" min="1" max="180" title="{=L:bc.screenshot.reload_desc=}" disabled /> <input id="checkReload" name="checkReload" type="checkbox" />
+			</div>
+			<div class="clear"></div>
+		</div>
+		<div id="status" style="display: none">
+				<img src="/images/wait.gif" alt="{=L:bc.screenshot.wait_text=}"/>
+				{=L:bc.screenshot.wait_text=}
+		</div>
+		</div>
+		<table cellpadding="0" class="screenshot">
+		<tr>
+			<td class="shot">
+				<img id="shot" src="" style="display: none" />
+			</td>
+		</tr>
+		</table>
+	</div>
+</div>
+<script>
+document.getElementById('checkReload').onclick = function() {
+	if (this.checked ) {
+		interval = setInterval(do_snapshot, document.getElementById("inputReload").value + "000");
+		document.getElementById("inputReload").disabled = false;
+	} else {
+		clearInterval(interval);
+		document.getElementById("inputReload").disabled = true;
+	}
+};
+</script>
+</body>
+</html>