diff --git a/package/lcd4linux/files-skel/etc/lcd4linux.conf b/package/lcd4linux/files-skel/etc/lcd4linux.conf index c33c0202..77408aa0 100644 --- a/package/lcd4linux/files-skel/etc/lcd4linux.conf +++ b/package/lcd4linux/files-skel/etc/lcd4linux.conf @@ -271,9 +271,9 @@ Widget 320x240_LOGO { update 3300 visible file::exist('/tmp/lcd/menu') == 1 ? 1 : file::readline('/tmp/lcd/mode_logo', 1) reload 1 - center 60 width 320 height 60 + center 60 scale -1 } @@ -283,9 +283,9 @@ Widget 320x240_LOGO_large { update 3300 visible file::exist('/tmp/lcd/menu') == 1 ? 1 : file::readline('/tmp/lcd/mode_logo', 1) reload 1 - center 70 width 320 height 70 + center 70 scale -1 } @@ -295,9 +295,9 @@ Widget 320x240_LOGO_small { update 3300 visible file::exist('/tmp/lcd/menu') == 1 ? 1 : file::readline('/tmp/lcd/mode_logo', 1) reload 1 - center 50 width 320 height 50 + center 50 scale -1 } @@ -307,9 +307,9 @@ Widget 320x240_LOGO_d-box2 { update 3300 visible file::exist('/tmp/lcd/menu') == 1 ? 1 : file::readline('/tmp/lcd/mode_logo', 1) reload 1 - center 60 width 320 height 60 + center 60 scale -1 } @@ -319,9 +319,9 @@ Widget 800x480_LOGO { update 3300 visible file::exist('/tmp/lcd/menu') == 1 ? 1 : file::readline('/tmp/lcd/mode_logo', 1) reload 1 - center 100 width 740 height 100 + center 100 scale -1 } @@ -331,9 +331,9 @@ Widget 800x600_LOGO { update 3300 visible file::exist('/tmp/lcd/menu') == 1 ? 1 : file::readline('/tmp/lcd/mode_logo', 1) reload 1 - center 120 width 740 height 120 + center 120 scale -1 } @@ -343,9 +343,9 @@ Widget 1024x600_LOGO { update 3300 visible file::exist('/tmp/lcd/menu') == 1 ? 1 : file::readline('/tmp/lcd/mode_logo', 1) reload 1 - center 120 width 964 height 120 + center 120 scale -1 } @@ -567,7 +567,7 @@ Widget 1024x600_EVENT_START { align 'L' width 200 height 60 - size 50 + size 45 mheight 'N' update 1000 reload 1 @@ -582,7 +582,7 @@ Widget 1024x600_EVENT_END { align 'R' width 200 height 60 - size 50 + size 45 mheight 'N' update 1000 reload 1 @@ -715,9 +715,9 @@ Widget 320x240_DURATION { font file::readline('/tmp/lcd/font', 2) fcolor COL_GREY align 'R' - width 180 - height 28 - size 28 + width 190 + height 40 + size 25 mheight 'N' update 1000 reload 1 @@ -730,9 +730,9 @@ Widget 320x240_TIME { font file::readline('/tmp/lcd/font', 2) fcolor COL_GREY align 'L' - width 100 - height 28 - size 28 + width 110 + height 40 + size 25 mheight 'N' update 1000 reload 1 @@ -745,7 +745,7 @@ Widget 320x240_TIME_small { font file::readline('/tmp/lcd/font', 2) fcolor COL_GREY align 'R' - width 70 + width 90 height 18 size 18 mheight 'N' @@ -762,7 +762,7 @@ Widget 320x240_TIME_d-box2 { align 'R' width 100 height 28 - size 28 + size 24 mheight 'N' update 5000 reload 1 @@ -777,7 +777,7 @@ Widget 800x600_TIME { align 'C' width 240 height 128 - size 65 + size 55 mheight 'N' update 1000 reload 1 @@ -792,7 +792,7 @@ Widget 1024x600_TIME { align 'C' width 400 height 128 - size 100 + size 85 mheight 'N' update 1000 reload 1 @@ -807,8 +807,8 @@ Widget 320x240_TIME_STANDBY { fcolor COL_GREY align 'C' width 300 - height 150 - size 80 + height 148 + size 70 mheight 'N' update 1000 reload 1 @@ -824,7 +824,7 @@ Widget 800x480_TIME_STANDBY { align 'C' width 770 height 300 - size 200 + size 180 mheight 'N' update 1000 reload 1 @@ -840,7 +840,7 @@ Widget 800x600_TIME_STANDBY { align 'C' width 770 height 360 - size 200 + size 180 mheight 'N' update 1000 reload 1 @@ -856,7 +856,7 @@ Widget 1024x600_TIME_STANDBY { align 'C' width 994 height 360 - size 240 + size 220 mheight 'N' update 1000 reload 1 @@ -1530,18 +1530,20 @@ Layout Pearl_standard { row11.col02 '320x240_PROGRESS' - x200 { - y135 '320x240_DURATION' + x195 { + y125 '320x240_DURATION' y010 '320x240_TIME' } } layer 2 { - x008.y012 'ICON_CAMD' - x008.y067 'ICON_ECM' - x008.y098 'ICON_CAM' - x008.y221 'ICON_TIMER' - x008.y262 'ICON_REC' - x008.y293 'ICON_TS' + x008 { + y012 'ICON_CAMD' + y067 'ICON_ECM' + y098 'ICON_CAM' + y221 'ICON_TIMER' + y262 'ICON_REC' + y293 'ICON_TS' + } x030.y001 '320x240_LOGO' } @@ -1570,12 +1572,14 @@ Layout Pearl_radio { } } layer 2 { - x008.y012 'ICON_CAMD' - x008.y067 'ICON_ECM' - x008.y098 'ICON_CAM' - x008.y221 'ICON_TIMER' - x008.y262 'ICON_REC' - x008.y293 'ICON_TS' + x008 { + y012 'ICON_CAMD' + y067 'ICON_ECM' + y098 'ICON_CAM' + y221 'ICON_TIMER' + y262 'ICON_REC' + y293 'ICON_TS' + } x008.y144 'ICON_RADIO' @@ -1601,12 +1605,14 @@ Layout Pearl_large { row14.col02 '320x240_PROGRESS_large' } layer 2 { - x008.y012 'ICON_CAMD' - x008.y067 'ICON_ECM' - x008.y098 'ICON_CAM' - x008.y221 'ICON_TIMER' - x008.y262 'ICON_REC' - x008.y293 'ICON_TS' + x008 { + y012 'ICON_CAMD' + y067 'ICON_ECM' + y098 'ICON_CAM' + y221 'ICON_TIMER' + y262 'ICON_REC' + y293 'ICON_TS' + } x035.y001 '320x240_LOGO_large' } @@ -1635,15 +1641,17 @@ Layout Pearl_small { row13.col02 '320x240_RAM' row14.col02 '320x240_MTD' - x208.y245 '320x240_TIME_small' + x208.y225 '320x240_TIME_small' } layer 2 { - x008.y012 'ICON_CAMD' - x008.y067 'ICON_ECM' - x008.y098 'ICON_CAM' - x008.y221 'ICON_TIMER' - x008.y262 'ICON_REC' - x008.y293 'ICON_TS' + x008 { + y012 'ICON_CAMD' + y067 'ICON_ECM' + y098 'ICON_CAM' + y221 'ICON_TIMER' + y262 'ICON_REC' + y293 'ICON_TS' + } x030.y001 '320x240_LOGO_small' } @@ -1668,15 +1676,17 @@ Layout Pearl_d-box2 { row14.col05 '320x240_VOLUME_d-box2' - x204.y212 '320x240_TIME_d-box2' + x203.y212 '320x240_TIME_d-box2' } layer 2 { - x008.y012 'ICON_CAMD' - x008.y067 'ICON_ECM' - x008.y098 'ICON_CAM' - x008.y221 'ICON_TIMER' - x008.y262 'ICON_REC' - x008.y293 'ICON_TS' + x008 { + y012 'ICON_CAMD' + y067 'ICON_ECM' + y098 'ICON_CAM' + y221 'ICON_TIMER' + y262 'ICON_REC' + y293 'ICON_TS' + } x070.y001 '320x240_LOGO_d-box2' } @@ -1742,20 +1752,24 @@ Layout Pearl_standby { x020.y085 'IMAGE_CLOCK_ANALOG_MINUTE' } layer 2 { - x008.y012 'ICON_CAMD' - x008.y067 'ICON_ECM' - x008.y098 'ICON_CAM' - x008.y221 'ICON_TIMER' - x008.y262 'ICON_REC' - x008.y293 'ICON_TS' + x008 { + y012 'ICON_CAMD' + y067 'ICON_ECM' + y098 'ICON_CAM' + y221 'ICON_TIMER' + y262 'ICON_REC' + y293 'ICON_TS' + } x020.y085 'IMAGE_CLOCK_ANALOG_HOUR' - X168.Y010 'ICON_WEATHER_CURRENT' - X168.Y245 'ICON_WEATHER_LATER' + x168 { + y010 'ICON_WEATHER_CURRENT' + y085 'TEMPERATURE_CURRENT' - x168.y085 'TEMPERATURE_CURRENT' - x168.y160 'TEMPERATURE_LATER' + y160 'TEMPERATURE_LATER' + y245 'ICON_WEATHER_LATER' + } } layer 3 { x020.y001 'IMAGE_CLOCK_ANALOG_FACE' @@ -1785,25 +1799,29 @@ Layout Samsung800x480_standard { x260.y585 '1024x600_EVENT_END' } layer 2 { - x015.y015 'ICON_CAMD_SCALE300' - x015.y177 'ICON_ECM_SCALE300' - x015.y267 'ICON_CAM_SCALE300' - x015.y524 'ICON_TIMER_SCALE300' - x015.y644 'ICON_REC_SCALE300' - x015.y734 'ICON_TS_SCALE300' + x015 { + y015 'ICON_CAMD_SCALE300' + y177 'ICON_ECM_SCALE300' + y267 'ICON_CAM_SCALE300' + y524 'ICON_TIMER_SCALE300' + y644 'ICON_REC_SCALE300' + y734 'ICON_TS_SCALE300' + } x060.y001 '800x480_LOGO' x050.y001 'LINE' x330.y001 'LINE' - X345.Y280 '800x600_TIME' + x345 { + y015 'ICON_WEATHER_CURRENT_SCALE200' + y158 'TEMPERATURE_CURRENT_SCALE200' - X345.Y015 'ICON_WEATHER_CURRENT_SCALE200' - X345.Y657 'ICON_WEATHER_LATER_SCALE200' + y280 '800x600_TIME' - X345.Y158 'TEMPERATURE_CURRENT_SCALE200' - X345.Y522 'TEMPERATURE_LATER_SCALE200' + y522 'TEMPERATURE_LATER_SCALE200' + y657 'ICON_WEATHER_LATER_SCALE200' + } } layer 3 { } @@ -1829,25 +1847,29 @@ Layout Samsung800x600_standard { x360.y015 '800x600_EVENT_NEXT' } layer 2 { - x015.y015 'ICON_CAMD_SCALE300' - x015.y177 'ICON_ECM_SCALE300' - x015.y267 'ICON_CAM_SCALE300' - x015.y524 'ICON_TIMER_SCALE300' - x015.y644 'ICON_REC_SCALE300' - x015.y734 'ICON_TS_SCALE300' + x015 { + y015 'ICON_CAMD_SCALE300' + y177 'ICON_ECM_SCALE300' + y267 'ICON_CAM_SCALE300' + y524 'ICON_TIMER_SCALE300' + y644 'ICON_REC_SCALE300' + y734 'ICON_TS_SCALE300' + } x060.y001 '800x600_LOGO' x050.y001 'LINE' x450.y001 'LINE' - X465.Y280 '800x600_TIME' + x465 { + y015 'ICON_WEATHER_CURRENT_SCALE200' + y158 'TEMPERATURE_CURRENT_SCALE200' - X465.Y015 'ICON_WEATHER_CURRENT_SCALE200' - X465.Y657 'ICON_WEATHER_LATER_SCALE200' + y280 '800x600_TIME' - X465.Y158 'TEMPERATURE_CURRENT_SCALE200' - X465.Y522 'TEMPERATURE_LATER_SCALE200' + y522 'TEMPERATURE_LATER_SCALE200' + y657 'ICON_WEATHER_LATER_SCALE200' + } } layer 3 { } @@ -1873,25 +1895,29 @@ Layout Samsung1024x600_standard { x360.y015 '1024x600_EVENT_NEXT' } layer 2 { - x015.y015 'ICON_CAMD_SCALE300' - x015.y177 'ICON_ECM_SCALE300' - x015.y267 'ICON_CAM_SCALE300' - x015.y748 'ICON_TIMER_SCALE300' - x015.y868 'ICON_REC_SCALE300' - x015.y958 'ICON_TS_SCALE300' + x015 { + y015 'ICON_CAMD_SCALE300' + y177 'ICON_ECM_SCALE300' + y267 'ICON_CAM_SCALE300' + y748 'ICON_TIMER_SCALE300' + y868 'ICON_REC_SCALE300' + y958 'ICON_TS_SCALE300' + } x060.y001 '1024x600_LOGO' x050.y001 'LINE' x450.y001 'LINE' - X465.Y312 '1024x600_TIME' + x465 { + y015 'ICON_WEATHER_CURRENT_SCALE200' + y158 'TEMPERATURE_CURRENT_SCALE200' - X465.Y015 'ICON_WEATHER_CURRENT_SCALE200' - X465.Y881 'ICON_WEATHER_LATER_SCALE200' + y312 '1024x600_TIME' - X465.Y158 'TEMPERATURE_CURRENT_SCALE200' - X465.Y746 'TEMPERATURE_LATER_SCALE200' + y746 'TEMPERATURE_LATER_SCALE200' + y881 'ICON_WEATHER_LATER_SCALE200' + } } layer 3 { } @@ -1916,12 +1942,14 @@ Layout Samsung800x480_radio { x260.y585 '1024x600_EVENT_END' } layer 2 { - x015.y015 'ICON_CAMD_SCALE300' - x015.y177 'ICON_ECM_SCALE300' - x015.y267 'ICON_CAM_SCALE300' - x015.y524 'ICON_TIMER_SCALE300' - x015.y644 'ICON_REC_SCALE300' - x015.y734 'ICON_TS_SCALE300' + x015 { + y015 'ICON_CAMD_SCALE300' + y177 'ICON_ECM_SCALE300' + y267 'ICON_CAM_SCALE300' + y524 'ICON_TIMER_SCALE300' + y644 'ICON_REC_SCALE300' + y734 'ICON_TS_SCALE300' + } x015.y348 'ICON_RADIO_SCALE300' @@ -1930,13 +1958,15 @@ Layout Samsung800x480_radio { x050.y001 'LINE' x330.y001 'LINE' - X345.Y280 '800x600_TIME' + x345 { + y015 'ICON_WEATHER_CURRENT_SCALE200' + y158 'TEMPERATURE_CURRENT_SCALE200' - X345.Y015 'ICON_WEATHER_CURRENT_SCALE200' - X345.Y657 'ICON_WEATHER_LATER_SCALE200' + y280 '800x600_TIME' - X345.Y158 'TEMPERATURE_CURRENT_SCALE200' - X345.Y522 'TEMPERATURE_LATER_SCALE200' + y522 'TEMPERATURE_LATER_SCALE200' + y657 'ICON_WEATHER_LATER_SCALE200' + } } layer 3 { } @@ -1962,12 +1992,14 @@ Layout Samsung800x600_radio { x360.y015 '800x600_EVENT_NEXT' } layer 2 { - x015.y015 'ICON_CAMD_SCALE300' - x015.y177 'ICON_ECM_SCALE300' - x015.y267 'ICON_CAM_SCALE300' - x015.y524 'ICON_TIMER_SCALE300' - x015.y644 'ICON_REC_SCALE300' - x015.y734 'ICON_TS_SCALE300' + x015 { + y015 'ICON_CAMD_SCALE300' + y177 'ICON_ECM_SCALE300' + y267 'ICON_CAM_SCALE300' + y524 'ICON_TIMER_SCALE300' + y644 'ICON_REC_SCALE300' + y734 'ICON_TS_SCALE300' + } x015.y348 'ICON_RADIO_SCALE300' @@ -1976,13 +2008,15 @@ Layout Samsung800x600_radio { x050.y001 'LINE' x450.y001 'LINE' - X465.Y280 '800x600_TIME' + x465 { + y015 'ICON_WEATHER_CURRENT_SCALE200' + y158 'TEMPERATURE_CURRENT_SCALE200' - X465.Y015 'ICON_WEATHER_CURRENT_SCALE200' - X465.Y657 'ICON_WEATHER_LATER_SCALE200' + y280 '800x600_TIME' - X465.Y158 'TEMPERATURE_CURRENT_SCALE200' - X465.Y522 'TEMPERATURE_LATER_SCALE200' + y522 'TEMPERATURE_LATER_SCALE200' + y657 'ICON_WEATHER_LATER_SCALE200' + } } layer 3 { } @@ -2008,12 +2042,14 @@ Layout Samsung1024x600_radio { x360.y015 '1024x600_EVENT_NEXT' } layer 2 { - x015.y015 'ICON_CAMD_SCALE300' - x015.y177 'ICON_ECM_SCALE300' - x015.y267 'ICON_CAM_SCALE300' - x015.y748 'ICON_TIMER_SCALE300' - x015.y868 'ICON_REC_SCALE300' - x015.y958 'ICON_TS_SCALE300' + x015 { + y015 'ICON_CAMD_SCALE300' + y177 'ICON_ECM_SCALE300' + y267 'ICON_CAM_SCALE300' + y748 'ICON_TIMER_SCALE300' + y868 'ICON_REC_SCALE300' + y958 'ICON_TS_SCALE300' + } x015.y460 'ICON_RADIO_SCALE300' @@ -2022,13 +2058,15 @@ Layout Samsung1024x600_radio { x050.y001 'LINE' x450.y001 'LINE' - X465.Y312 '1024x600_TIME' + x465 { + y015 'ICON_WEATHER_CURRENT_SCALE200' + y158 'TEMPERATURE_CURRENT_SCALE200' - X465.Y015 'ICON_WEATHER_CURRENT_SCALE200' - X465.Y881 'ICON_WEATHER_LATER_SCALE200' + y312 '1024x600_TIME' - X465.Y158 'TEMPERATURE_CURRENT_SCALE200' - X465.Y746 'TEMPERATURE_LATER_SCALE200' + y746 'TEMPERATURE_LATER_SCALE200' + y881 'ICON_WEATHER_LATER_SCALE200' + } } layer 3 { } @@ -2185,20 +2223,24 @@ Layout Samsung800x480_standby { x040.y250 'IMAGE_CLOCK_ANALOG_MINUTE_SCALE50' } layer 2 { - x015.y015 'ICON_CAMD_SCALE300' - x015.y177 'ICON_ECM_SCALE300' - x015.y267 'ICON_CAM_SCALE300' - x015.y524 'ICON_TIMER_SCALE300' - x015.y644 'ICON_REC_SCALE300' - x015.y734 'ICON_TS_SCALE300' + x015 { + y015 'ICON_CAMD_SCALE300' + y177 'ICON_ECM_SCALE300' + y267 'ICON_CAM_SCALE300' + y524 'ICON_TIMER_SCALE300' + y644 'ICON_REC_SCALE300' + y734 'ICON_TS_SCALE300' + } x040.y250 'IMAGE_CLOCK_ANALOG_HOUR_SCALE50' - X345.Y015 'ICON_WEATHER_CURRENT_SCALE200' - X345.Y657 'ICON_WEATHER_LATER_SCALE200' + x345 { + y015 'ICON_WEATHER_CURRENT_SCALE200' + y158 'TEMPERATURE_CURRENT_SCALE200' - X345.Y158 'TEMPERATURE_CURRENT_SCALE200' - X345.Y522 'TEMPERATURE_LATER_SCALE200' + y522 'TEMPERATURE_LATER_SCALE200' + y657 'ICON_WEATHER_LATER_SCALE200' + } } layer 3 { x040.y250 'IMAGE_CLOCK_ANALOG_FACE_SCALE50' @@ -2219,20 +2261,24 @@ Layout Samsung800x600_standby { x040.y220 'IMAGE_CLOCK_ANALOG_MINUTE_SCALE60' } layer 2 { - x015.y015 'ICON_CAMD_SCALE300' - x015.y177 'ICON_ECM_SCALE300' - x015.y267 'ICON_CAM_SCALE300' - x015.y524 'ICON_TIMER_SCALE300' - x015.y644 'ICON_REC_SCALE300' - x015.y734 'ICON_TS_SCALE300' + x015 { + y015 'ICON_CAMD_SCALE300' + y177 'ICON_ECM_SCALE300' + y267 'ICON_CAM_SCALE300' + y524 'ICON_TIMER_SCALE300' + y644 'ICON_REC_SCALE300' + y734 'ICON_TS_SCALE300' + } x040.y220 'IMAGE_CLOCK_ANALOG_HOUR_SCALE60' - X465.Y015 'ICON_WEATHER_CURRENT_SCALE200' - X465.Y657 'ICON_WEATHER_LATER_SCALE200' + x465 { + y015 'ICON_WEATHER_CURRENT_SCALE200' + y158 'TEMPERATURE_CURRENT_SCALE200' - X465.Y158 'TEMPERATURE_CURRENT_SCALE200' - X465.Y522 'TEMPERATURE_LATER_SCALE200' + y522 'TEMPERATURE_LATER_SCALE200' + y657 'ICON_WEATHER_LATER_SCALE200' + } } layer 3 { x040.y220 'IMAGE_CLOCK_ANALOG_FACE_SCALE60' @@ -2255,20 +2301,24 @@ Layout Samsung1024x600_standby { x040.y332 'IMAGE_CLOCK_ANALOG_MINUTE_SCALE60' } layer 2 { - x015.y015 'ICON_CAMD_SCALE300' - x015.y177 'ICON_ECM_SCALE300' - x015.y267 'ICON_CAM_SCALE300' - x015.y748 'ICON_TIMER_SCALE300' - x015.y868 'ICON_REC_SCALE300' - x015.y958 'ICON_TS_SCALE300' + x015 { + y015 'ICON_CAMD_SCALE300' + y177 'ICON_ECM_SCALE300' + y267 'ICON_CAM_SCALE300' + y748 'ICON_TIMER_SCALE300' + y868 'ICON_REC_SCALE300' + y958 'ICON_TS_SCALE300' + } x040.y332 'IMAGE_CLOCK_ANALOG_HOUR_SCALE60' - X465.Y015 'ICON_WEATHER_CURRENT_SCALE200' - X465.Y881 'ICON_WEATHER_LATER_SCALE200' + x465 { + y015 'ICON_WEATHER_CURRENT_SCALE200' + y158 'TEMPERATURE_CURRENT_SCALE200' - X465.Y158 'TEMPERATURE_CURRENT_SCALE200' - X465.Y746 'TEMPERATURE_LATER_SCALE200' + y746 'TEMPERATURE_LATER_SCALE200' + y881 'ICON_WEATHER_LATER_SCALE200' + } } layer 3 { x040.y332 'IMAGE_CLOCK_ANALOG_FACE_SCALE60'