diff --git a/package/lcd4linux/files-skel/etc/lcd4linux.conf b/package/lcd4linux/files-skel/etc/lcd4linux.conf index 772467a3..d3286b2b 100644 --- a/package/lcd4linux/files-skel/etc/lcd4linux.conf +++ b/package/lcd4linux/files-skel/etc/lcd4linux.conf @@ -466,6 +466,7 @@ Widget ICON_WEATHER1 { reload 1 scale 300 } + Widget ICON_WEATHER2 { class 'Image' file file::exist(FWEATHER) == 0 ? ICONS . 'mode/weather_off.png' : ICONS . 'mode/weather_on.png' @@ -474,26 +475,26 @@ Widget ICON_WEATHER2 { scale 200 } -Widget S1_WIND { +Widget S_WIND { class 'Image' - file file::exist(FWEATHER) == 0 ? '' : (VAR1=file::readline(W . 'wind', 1); VAR2=substr(VAR1, strstr(VAR1, '|') + 1); W_ICON . (VAR2 < 22.5 ? 'N' : (VAR2 < 67.5 ? 'NO' : (VAR2 < 112.5 ? 'O' : (VAR2 < 157.5 ? 'SO' : (VAR2 < 202.5 ? 'S' : (VAR2 < 247.5 ? 'SW' : (VAR2 < 292.5 ? 'W' : (VAR2 > 292 ? 'NW' : 'Variable')))))))) . '.png') + file file::exist(FWEATHER) == 0 ? '' : (VAR0=file::readline(W . 'wind', 1); VAR1=substr(VAR0, strstr(VAR0, '|') + 1); VAR2=substr(VAR1, strstr(VAR1,'|') + 1); W_ICON . VAR2 . '.png') update 4000 reload 1 align 'L' - scale 20 } -Widget S_WIND { +Widget S1_WIND { class 'Image' - file file::exist(FWEATHER) == 0 ? '' : (VAR0=file::readline(W . 'wind', 1); VAR1=substr(VAR0, strstr(VAR0, '|') + 1); VAR2=substr(VAR1, strstr(VAR1,'|') + 1); W_ICON . VAR2 . '.png') + file file::exist(FWEATHER) == 0 ? '' : (VAR1=file::readline(W . 'wind', 1); VAR2=substr(VAR1, strstr(VAR1, '|') + 1); W_ICON . (VAR2 < 22.5 ? 'N' : (VAR2 < 67.5 ? 'NO' : (VAR2 < 112.5 ? 'O' : (VAR2 < 157.5 ? 'SO' : (VAR2 < 202.5 ? 'S' : (VAR2 < 247.5 ? 'SW' : (VAR2 < 292.5 ? 'W' : (VAR2 > 292 ? 'NW' : 'Variable')))))))) . '.png') update 4000 reload 1 align 'L' + scale 20 } Widget SS_WIND { class 'Truetype' - font file::readline('/tmp/lcd/font', 1) + font file::readline('/tmp/lcd/font', 2) fcolor 'EEEEEE' width 90 height 35 @@ -505,7 +506,7 @@ Widget SS_WIND { Widget WEATHER_CITY1 { class 'Truetype' - font file::readline('/tmp/lcd/font', 1) + font file::readline('/tmp/lcd/font', 2) fcolor 'EEEEEE' width 300 height 50 @@ -533,7 +534,7 @@ Widget WEATHERICON_LATER { Widget TEMPERATURE_CURRENT { class 'Text' - expression file::exist(FWEATHER) == 0 ? '' : file::readline('/tmp/lcd/weather_temp', 1) + expression file::exist(FWEATHER) == 0 ? '' : file::readline('/tmp/lcd/weather_temp', 1) . '°' align 'L' width 3 update 10000 @@ -542,19 +543,19 @@ Widget TEMPERATURE_CURRENT { Widget TEMPERATURE_CURRENT1 { class 'Truetype' - font file::readline('/tmp/lcd/font', 1) + font file::readline('/tmp/lcd/font', 2) fcolor 'EEEEEE' width 64 height 35 align 'C' - expression file::exist(FWEATHER) == 0 ? '' : file::readline('/tmp/lcd/weather_temp', 1) + expression file::exist(FWEATHER) == 0 ? '' : file::readline('/tmp/lcd/weather_temp', 1) . '°' update 10000 reload 1 } Widget TEMPERATURE_LATER { class 'Text' - expression file::exist(FWEATHER) == 0 ? '' : (TEMP=file::readline('/tmp/lcd/weather_temp', strftime('%H', time()) < 16 ? 2 : 3); substr(TEMP, (strstr(TEMP, '|') + 1))) + expression file::exist(FWEATHER) == 0 ? '' : (TEMP=file::readline('/tmp/lcd/weather_temp', strftime('%H', time()) < 16 ? 2 : 3); substr(TEMP, (strstr(TEMP, '|') + 1))) . '°' align 'R' width 3 update 10000 @@ -563,12 +564,12 @@ Widget TEMPERATURE_LATER { Widget TEMPERATURE_LATER1 { class 'Truetype' - font file::readline('/tmp/lcd/font', 1) + font file::readline('/tmp/lcd/font', 2) fcolor 'EEEEEE' width 64 height 35 align 'C' - expression file::exist(FWEATHER) == 0 ? '' : (TEMP=file::readline('/tmp/lcd/weather_temp', strftime('%H', time()) < 16 ? 2 : 3); substr(TEMP, (strstr(TEMP, '|') + 1))) + expression file::exist(FWEATHER) == 0 ? '' : (TEMP=file::readline('/tmp/lcd/weather_temp', strftime('%H', time()) < 16 ? 2 : 3); substr(TEMP, (strstr(TEMP, '|') + 1))) . '°' update 10000 reload 1 } @@ -1273,14 +1274,13 @@ Widget S_TIMER { Widget S_VFORMAT { class 'Image' - file file::readline('/tmp/lcd/resolution', 1) eq '1920x1080' ? SYSICONS . 'res_hd.png' : ( file::readline('/tmp/lcd/resolution', 1) eq '1280x720' ? SYSICONS . 'res_hd.png' : ( file::readline('/tmp/lcd/resolution', 1) eq '3840x2160' ? SYSICONS . 'res_uhd.png' : SYSICONS . 'res_sd.png' ) ) + file file::readline('/tmp/lcd/resolution', 1) eq '1920x1080' ? SYSICONS . 'res_hd.png' : ( file::readline('/tmp/lcd/resolution', 1) eq '1280x720' ? SYSICONS . 'res_hd.png' : ( file::readline('/tmp/lcd/resolution', 1) eq '1440x1080' ? SYSICONS . 'res_hd.png' : ( file::readline('/tmp/lcd/resolution', 1) eq '3840x2160' ? SYSICONS . 'res_uhd.png' : SYSICONS . 'res_sd.png' ) ) update 4000 reload 1 align 'R' scale 150 } - Widget S_ASPECTRATIO { class 'Image' file file::readline('/tmp/lcd/aspectratio', 1) eq '16:9' ? SYSICONS . '16_9.png' : SYSICONS . '16_9_gray.png' @@ -1311,7 +1311,7 @@ Widget S_TXT { Widget S_TUNERTXT { class 'Truetype' expression 'Tuner:' - font file::readline('/tmp/lcd/font', 1) + font file::readline('/tmp/lcd/font', 2) fcolor '58585800' #update 3000 reload 1 @@ -1420,7 +1420,7 @@ Widget S_LOGO1 { Widget S_TTF-CHANNEL { class 'Truetype' expression file::readline('/tmp/lcd/mode_logo', 1) == 1 ? '' : file::readline('/tmp/lcd/service', 1) - font file::readline('/tmp/lcd/font', 1) + font file::readline('/tmp/lcd/font', 2) fcolor '58585800' update 3000 reload 1 @@ -1432,7 +1432,7 @@ Widget S_TTF-CHANNEL { Widget S_TTF-CHANNEL1 { class 'Truetype' expression file::readline('/tmp/lcd/mode_logo', 1) == 1 ? '' : file::readline('/tmp/lcd/service', 1) - font file::readline('/tmp/lcd/font', 1) + font file::readline('/tmp/lcd/font', 2) fcolor '58585800' update 3000 reload 1 @@ -1443,12 +1443,12 @@ Widget S_TTF-CHANNEL1 { Widget S_START { class 'Truetype' - font file::readline('/tmp/lcd/font', 1) + font file::readline('/tmp/lcd/font', 2) fcolor 'fd6d1300' size 0 - width 140 + width 200 height 50 - align 'L' + align 'C' expression file::exist('/tmp/lcd/menu') == 1 | file::readline('/tmp/lcd/event', 1) le '' ? '' : file::readline('/tmp/lcd/start', 1) update 3000 reload 1 @@ -1456,12 +1456,12 @@ Widget S_START { Widget S_END { class 'Truetype' - font file::readline('/tmp/lcd/font', 1) + font file::readline('/tmp/lcd/font', 2) fcolor '58585800' size 0 + width 200 height 50 - width 140 - align 'L' + align 'C' expression file::exist('/tmp/lcd/menu') == 1 | file::readline('/tmp/lcd/event', 2) le '' ? '' : file::readline('/tmp/lcd/end', 1) update 3000 reload 1 @@ -1469,60 +1469,61 @@ Widget S_END { Widget S_TTF-EPG-NOW { class 'Truetype' - expression file::exist('/tmp/lcd/menu') == 1 ? file::readline('/tmp/lcd/menu', 1) : file::readline('/tmp/lcd/event', 1) - font file::readline('/tmp/lcd/font', 1) + expression file::exist('/tmp/lcd/menu') == 1 ? file::readline('/tmp/lcd/menu', 1) : (file::readline('/tmp/lcd/event', 1) le '' ? '' : substr(file::readline('/tmp/lcd/event', 1), 0, 30) + font file::readline('/tmp/lcd/font', 2) fcolor 'fd6d1300' update 3000 reload 1 inverted 0 size 0 - width 640 + width 595 height 50 align 'L' } Widget S_TTF-EPG-NOW1 { class 'Truetype' - expression file::exist('/tmp/lcd/menu') == 1 ? file::readline('/tmp/lcd/menu', 1) : file::readline('/tmp/lcd/event', 1) - font file::readline('/tmp/lcd/font', 1) - fcolor '58585800' + + expression file::exist('/tmp/lcd/menu') == 1 ? file::readline('/tmp/lcd/menu', 1) : (file::readline('/tmp/lcd/event', 1) le '' ? '' : substr(file::readline('/tmp/lcd/event', 1), 0, 35) + font file::readline('/tmp/lcd/font', 2) + fcolor 'fd6d1300' update 3000 reload 1 - width 790 + width 824 height 50 - align 'M' + align 'L' } Widget S_TTF-EPG-NEXT { class 'Truetype' - expression file::exist('/tmp/lcd/menu') == 1 ? '' : file::readline('/tmp/lcd/event', 2) - font file::readline('/tmp/lcd/font', 1) + expression file::exist('/tmp/lcd/menu') == 1 ? file::readline('/tmp/lcd/menu', 1) : (file::readline('/tmp/lcd/event', 2) le '' ? '' : substr(file::readline('/tmp/lcd/event', 2), 0, 30) + font file::readline('/tmp/lcd/font', 2) fcolor '58585800' update 3000 reload 1 inverted 0 size 0 - width 640 + width 595 height 50 align 'L' } Widget S_TTF-EPG-NEXT1 { class 'Truetype' - expression file::exist('/tmp/lcd/menu') == 1 ? '' : file::readline('/tmp/lcd/event', 2) - font file::readline('/tmp/lcd/font', 1) + expression file::exist('/tmp/lcd/menu') == 1 ? file::readline('/tmp/lcd/menu', 1) : (file::readline('/tmp/lcd/event', 2) le '' ? '' : substr(file::readline('/tmp/lcd/event', 2), 0, 35) + font file::readline('/tmp/lcd/font', 2) fcolor '58585800' update 3000 reload 1 - width 790 + width 824 height 50 - align 'M' + align 'L' } Widget S_DURATION { class 'Truetype' expression file::exist('/tmp/lcd/menu') == 1 ? '' : file::readline('/tmp/lcd/duration', 1) - font file::readline('/tmp/lcd/font', 1) + font file::readline('/tmp/lcd/font', 2) fcolor 'fd6d1300' update 3000 reload 1 @@ -1536,13 +1537,113 @@ Widget S_DURATION { Widget S_DURATION1 { class 'Truetype' expression file::exist('/tmp/lcd/menu') == 1 ? '' : file::readline('/tmp/lcd/duration', 1) - font file::readline('/tmp/lcd/font', 1) + font file::readline('/tmp/lcd/font', 2) fcolor 'fd6d1300' update 3000 reload 1 width 160 height 40 - align 'R' + align 'C' +} + +Widget S_DURATION_BJ { + class 'Truetype' + expression file::exist('/tmp/lcd/menu') == 1 ? '' : file::readline('/tmp/lcd/duration', 2) + font file::readline('/tmp/lcd/font', 2) + fcolor 'fd6d1300' + update 3000 + reload 1 + width 60 + height 30 + align 'C' +} + +Widget S_DURATION_BE { + class 'Truetype' + expression file::exist('/tmp/lcd/menu') == 1 ? '' : file::readline('/tmp/lcd/duration', 3) + font file::readline('/tmp/lcd/font', 2) + fcolor 'fd6d1300' + update 3000 + reload 1 + width 60 + height 30 + align 'C' +} + +Widget S_DURATION_KPL { + class 'Truetype' + expression file::exist('/tmp/lcd/menu') == 1 ? '' : file::readline('/tmp/lcd/duration', 4) + font file::readline('/tmp/lcd/font', 2) + fcolor 'fd6d1300' + update 3000 + reload 1 + width 60 + height 30 + align 'C' +} + +Widget S_LEFT1 { + class 'Image' + file file::exist('/tmp/lcd/menu') == 1 ? '' : ICONS . 'left1.png' + update 4000 + reload 1 +} + +Widget S_RIGHT1 { + class 'Image' + file file::exist('/tmp/lcd/menu') == 1 ? '' : ICONS . 'right1.png' + update 4000 + reload 1 +} + +Widget S_LEFT2 { + class 'Image' + file file::exist('/tmp/lcd/menu') == 1 ? '' : ICONS . 'left2.png' + update 4000 + reload 1 +} + +Widget S_RIGHT2 { + class 'Image' + file file::exist('/tmp/lcd/menu') == 1 ? '' : ICONS . 'right2.png' + update 4000 + reload 1 +} + +Widget S_DURATION_BJ1 { + class 'Truetype' + expression file::exist('/tmp/lcd/menu') == 1 ? '' : file::readline('/tmp/lcd/duration', 2) + font file::readline('/tmp/lcd/font', 2) + fcolor 'fd6d1300' + update 3000 + reload 1 + width 90 + height 40 + align 'C' +} + +Widget S_DURATION_BE1 { + class 'Truetype' + expression file::exist('/tmp/lcd/menu') == 1 ? '' : file::readline('/tmp/lcd/duration', 3) + font file::readline('/tmp/lcd/font', 2) + fcolor 'fd6d1300' + update 3000 + reload 1 + width 90 + height 40 + align 'C' +} + +Widget S_DURATION_KPL1 { + class 'Truetype' + expression file::exist('/tmp/lcd/menu') == 1 ? '' : file::readline('/tmp/lcd/duration', 4) + font file::readline('/tmp/lcd/font', 2) + fcolor 'fd6d1300' + update 3000 + reload 1 + width 90 + height 40 + align 'C' } Widget S_EPGBAR { @@ -1569,7 +1670,7 @@ Widget S_EPGBAR2 { Widget HST { class 'Truetype' - font file::readline('/tmp/lcd/font', 1) + font file::readline('/tmp/lcd/font', 2) fcolor '585858' width 30 height 20 @@ -1581,7 +1682,7 @@ Widget HST { Widget HST_STB { class 'Truetype' - font file::readline('/tmp/lcd/font', 1) + font file::readline('/tmp/lcd/font', 2) fcolor '585858' width 30 height 20 @@ -1593,7 +1694,7 @@ Widget HST_STB { Widget RES320x240 { class 'Truetype' - font file::readline('/tmp/lcd/font', 1) + font file::readline('/tmp/lcd/font', 2) fcolor '585858' width 120 height 20 @@ -1604,7 +1705,7 @@ Widget RES320x240 { Widget RES800x480 { class 'Truetype' - font file::readline('/tmp/lcd/font', 1) + font file::readline('/tmp/lcd/font', 2) fcolor '585858' width 90 height 20 @@ -1615,7 +1716,7 @@ Widget RES800x480 { Widget RES800x600 { class 'Truetype' - font file::readline('/tmp/lcd/font', 1) + font file::readline('/tmp/lcd/font', 2) fcolor '585858' width 90 height 20 @@ -1626,7 +1727,7 @@ Widget RES800x600 { Widget RES1024x600 { class 'Truetype' - font file::readline('/tmp/lcd/font', 1) + font file::readline('/tmp/lcd/font', 2) fcolor '585858' width 100 height 20 @@ -1720,7 +1821,7 @@ Widget S_STANDBY_MIN_1 { Widget TAGDATUM-TTF { class 'truetype' expression (strftime('%u', time()) == 1 ? 'Montag' : (strftime('%u', time()) == 2 ? 'Dienstag' : (strftime('%u', time()) == 3 ? 'Mittwoch' : (strftime('%u', time()) == 4 ? 'Donnerstag' : (strftime('%u', time()) == 5 ? 'Freitag' : (strftime('%u', time()) == 6 ? 'Samstag' : 'Sonntag')))))) . ', ' . strftime('%d.%m.%Y', time()) - font file::readline('/tmp/lcd/font', 1) + font file::readline('/tmp/lcd/font', 2) fcolor 'EEEEEE00' align 'C' width 800 @@ -1733,7 +1834,7 @@ Widget TAGDATUM-TTF { Widget TAGDATUM-TTF1 { class 'truetype' expression (strftime('%u', time()) == 1 ? 'Montag' : (strftime('%u', time()) == 2 ? 'Dienstag' : (strftime('%u', time()) == 3 ? 'Mittwoch' : (strftime('%u', time()) == 4 ? 'Donnerstag' : (strftime('%u', time()) == 5 ? 'Freitag' : (strftime('%u', time()) == 6 ? 'Samstag' : 'Sonntag')))))) . ', ' . strftime('%d.%m.%Y', time()) - font file::readline('/tmp/lcd/font', 1) + font file::readline('/tmp/lcd/font', 2) fcolor 'EEEEEE00' align 'C' width 1000 @@ -1763,23 +1864,27 @@ Layout Samsung800x600_standard { X222.Y600 'S_TXT' X222.Y650 'S_TUNERTXT' X222.Y755 'S_TUNER' - X260.Y20 'S_START' - X260.Y165 'S_TTF-EPG-NOW' - X320.Y165 'S_TTF-EPG-NEXT' - X320.Y20 'S_END' + X260.Y5 'S_START' + X260.Y205 'S_TTF-EPG-NOW' + X320.Y205 'S_TTF-EPG-NEXT' + X320.Y5 'S_END' X480.Y310 'ICON_WEATHER1' - X490.Y250 'WEATHERICON_CURRENT' - X560.Y250 'TEMPERATURE_CURRENT1' - X505.Y325 'S_WIND' - X530.Y415 'SS_WIND' - X490.Y530 'WEATHERICON_LATER' - X560.Y530 'TEMPERATURE_LATER1' - X500.Y15 'S_HOUR1_' - X500.Y65 'S_HOUR_1' - X500.Y115 'S_DP' - X500.Y130 'S_MIN1_' - X500.Y180 'S_MIN_1' - X510.Y615 'S_DURATION' + X480.Y240 'WEATHERICON_CURRENT' + X550.Y240 'TEMPERATURE_CURRENT1' + X505.Y320 'S_WIND' + X532.Y410 'SS_WIND' + X480.Y500 'WEATHERICON_LATER' + X550.Y500 'TEMPERATURE_LATER1' + X510.Y10 'S_HOUR1_' + X510.Y60 'S_HOUR_1' + X510.Y110 'S_DP' + X510.Y125 'S_MIN1_' + X510.Y175 'S_MIN_1' + X530.Y580 'S_DURATION_BJ' + X530.Y640 'S_LEFT2' + X530.Y655 'S_DURATION_KPL' + X530.Y715 'S_RIGHT2' + X530.Y730 'S_DURATION_BE' X580.Y5 'HST' X580.Y700 'RES800x600' } @@ -1804,22 +1909,22 @@ Layout Samsung800x480_standard { X10.Y560 'S_CAMD' X10.Y710 'S_ECM' X40.Y10 'S_LOGO' - X205.Y20 'S_START' - X205.Y165 'S_TTF-EPG-NOW' - X260.Y165 'S_TTF-EPG-NEXT' - X260.Y20 'S_END' + X205.Y5 'S_START' + X205.Y205 'S_TTF-EPG-NOW' + X260.Y205 'S_TTF-EPG-NEXT' + X260.Y5 'S_END' X380.Y340 'ICON_WEATHER2' - X380.Y240 'WEATHERICON_CURRENT' - X445.Y240 'TEMPERATURE_CURRENT1' - X398.Y355 'S_WIND' - X425.Y445 'SS_WIND' - X380.Y560 'WEATHERICON_LATER' - X445.Y560 'TEMPERATURE_LATER1' - X400.Y15 'S_HOUR1_' - X400.Y65 'S_HOUR_1' - X400.Y115 'S_DP' - X400.Y130 'S_MIN1_' - X400.Y180 'S_MIN_1' + X380.Y250 'WEATHERICON_CURRENT' + X445.Y250 'TEMPERATURE_CURRENT1' + X398.Y345 'S_WIND' + X425.Y435 'SS_WIND' + X380.Y550 'WEATHERICON_LATER' + X445.Y550 'TEMPERATURE_LATER1' + X400.Y5 'S_HOUR1_' + X400.Y55 'S_HOUR_1' + X400.Y105 'S_DP' + X400.Y120 'S_MIN1_' + X400.Y170 'S_MIN_1' X410.Y630 'S_DURATION' X460.Y5 'HST' X460.Y700 'RES800x480' @@ -1851,23 +1956,27 @@ Layout Samsung1024x600_standard { X222.Y810 'S_TXT' X222.Y860 'S_TUNERTXT' X222.Y965 'S_TUNER' - X260.Y20 'S_START' - X260.Y190 'S_TTF-EPG-NOW1' - X320.Y190 'S_TTF-EPG-NEXT1' - X320.Y20 'S_END' + X260.Y5 'S_START' + X260.Y205 'S_TTF-EPG-NOW1' + X320.Y205 'S_TTF-EPG-NEXT1' + X320.Y5 'S_END' X480.Y425 'ICON_WEATHER1' - X490.Y310 'WEATHERICON_CURRENT' - X560.Y310 'TEMPERATURE_CURRENT1' + X480.Y320 'WEATHERICON_CURRENT' + X550.Y320 'TEMPERATURE_CURRENT1' X505.Y425 'S_WIND' - X530.Y515 'SS_WIND' - X490.Y650 'WEATHERICON_LATER' - X560.Y650 'TEMPERATURE_LATER1' + X532.Y515 'SS_WIND' + X480.Y640 'WEATHERICON_LATER' + X550.Y640 'TEMPERATURE_LATER1' X510.Y25 'S_HOUR1_' X510.Y75 'S_HOUR_1' X510.Y125 'S_DP' X510.Y140 'S_MIN1_' X510.Y190 'S_MIN_1' - X510.Y850 'S_DURATION' + X520.Y710 'S_DURATION_BJ1' + X520.Y800 'S_LEFT1' + X520.Y820 'S_DURATION_KPL1' + X520.Y910 'S_RIGHT1' + X520.Y930 'S_DURATION_BE1' X580.Y5 'HST' X580.Y924 'RES1024x600' } @@ -1898,23 +2007,27 @@ Layout Samsung800x600_radio { X222.Y600 'S_TXT' X222.Y650 'S_TUNERTXT' X222.Y755 'S_TUNER' - X260.Y20 'S_START' - X260.Y165 'S_TTF-EPG-NOW' - X320.Y165 'S_TTF-EPG-NEXT' - X320.Y20 'S_END' + X260.Y5 'S_START' + X260.Y205 'S_TTF-EPG-NOW' + X320.Y205 'S_TTF-EPG-NEXT' + X320.Y5 'S_END' X480.Y310 'ICON_WEATHER1' - X490.Y250 'WEATHERICON_CURRENT' - X560.Y250 'TEMPERATURE_CURRENT1' - X505.Y325 'S_WIND' - X530.Y415 'SS_WIND' - X490.Y530 'WEATHERICON_LATER' - X560.Y530 'TEMPERATURE_LATER1' - X500.Y15 'S_HOUR1_' - X500.Y65 'S_HOUR_1' - X500.Y115 'S_DP' - X500.Y130 'S_MIN1_' - X500.Y180 'S_MIN_1' - X520.Y610 'S_DURATION' + X480.Y240 'WEATHERICON_CURRENT' + X550.Y240 'TEMPERATURE_CURRENT1' + X505.Y320 'S_WIND' + X532.Y410 'SS_WIND' + X480.Y500 'WEATHERICON_LATER' + X550.Y500 'TEMPERATURE_LATER1' + X510.Y10 'S_HOUR1_' + X510.Y60 'S_HOUR_1' + X510.Y110 'S_DP' + X510.Y125 'S_MIN1_' + X510.Y175 'S_MIN_1' + X530.Y580 'S_DURATION_BJ' + X530.Y640 'S_LEFT2' + X530.Y655 'S_DURATION_KPL' + X530.Y715 'S_RIGHT2' + X530.Y730 'S_DURATION_BE' X580.Y5 'HST' X580.Y700 'RES800x600' } @@ -1939,15 +2052,22 @@ Layout Samsung800x480_radio { X17.Y560 'S_CAMD' X17.Y710 'S_ECM' X40.Y10 'S_LOGO' - X205.Y20 'S_START' - X205.Y165 'S_TTF-EPG-NOW' - X260.Y165 'S_TTF-EPG-NEXT' - X260.Y20 'S_END' - X380.Y125 'S_HOUR1_' - X380.Y190 'S_HOUR_1' - X380.Y255 'S_DP' - X380.Y288 'S_MIN1_' - X380.Y353 'S_MIN_1' + X205.Y5 'S_START' + X260.Y5 'S_END' + X205.Y205 'S_TTF-EPG-NOW' + X260.Y205 'S_TTF-EPG-NEXT' + X380.Y340 'ICON_WEATHER2' + X380.Y250 'WEATHERICON_CURRENT' + X445.Y250 'TEMPERATURE_CURRENT1' + X398.Y345 'S_WIND' + X425.Y435 'SS_WIND' + X380.Y550 'WEATHERICON_LATER' + X445.Y550 'TEMPERATURE_LATER1' + X380.Y5 'S_HOUR1_' + X380.Y55 'S_HOUR_1' + X380.Y105 'S_DP' + X380.Y120 'S_MIN1_' + X380.Y170 'S_MIN_1' X410.Y630 'S_DURATION' X460.Y5 'HST' X460.Y700 'RES800x480' @@ -1979,15 +2099,15 @@ Layout Samsung1024x600_radio { X222.Y810 'S_TXT' X222.Y860 'S_TUNERTXT' X222.Y965 'S_TUNER' - X260.Y20 'S_START' - X260.Y190 'S_TTF-EPG-NOW1' - X320.Y190 'S_TTF-EPG-NEXT1' - X320.Y20 'S_END' + X260.Y5 'S_START' + X260.Y205 'S_TTF-EPG-NOW1' + X320.Y205 'S_TTF-EPG-NEXT1' + X320.Y5 'S_END' X480.Y425 'ICON_WEATHER1' X490.Y310 'WEATHERICON_CURRENT' X560.Y310 'TEMPERATURE_CURRENT1' X505.Y425 'S_WIND' - X530.Y515 'SS_WIND' + X532.Y515 'SS_WIND' X490.Y650 'WEATHERICON_LATER' X560.Y650 'TEMPERATURE_LATER1' X510.Y25 'S_HOUR1_' @@ -1995,7 +2115,11 @@ Layout Samsung1024x600_radio { X510.Y125 'S_DP' X510.Y140 'S_MIN1_' X510.Y190 'S_MIN_1' - X510.Y850 'S_DURATION' + X520.Y710 'S_DURATION_BJ1' + X520.Y800 'S_LEFT1' + X520.Y820 'S_DURATION_KPL1' + X520.Y910 'S_RIGHT1' + X520.Y930 'S_DURATION_BE1' X580.Y5 'HST' X580.Y924 'RES1024x600' }